From a1d76cfa38318161b1d683b16aef3aaecf3ba385 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Mon, 21 Nov 2016 15:44:42 -0500
Subject: [PATCH 01/11] #343 made the indentation consistent

---
 data/people/profile.xml | 47 +++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/data/people/profile.xml b/data/people/profile.xml
index acc1775bf..f68851e22 100644
--- a/data/people/profile.xml
+++ b/data/people/profile.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ml:page disable-comments="yes" status="Published" xmlns:ml="http://developer.marklogic.com/site/internal" xmlns="http://www.w3.org/1999/xhtml">
 
-    <script xml:space="preserve">
-        if (! "<ml:user-name/>") { window.location.href = '/'; }
-    </script>
-    <h1><ml:first-name/>'s Profile </h1>
+  <script xml:space="preserve">
+      if (! "<ml:user-name/>") { window.location.href = '/'; }
+  </script>
+  <h1><ml:first-name/>'s Profile </h1>
 
-    <form method="post" action="#" id="profile-form" enctype="application/x-www-form-urlencoded">
+  <form method="post" action="#" id="profile-form" enctype="application/x-www-form-urlencoded">
     <ml:profile/>
     <fieldset>
-        <div class="signup-form-row">
-            <input class="button" id="profile-save" value="Save" type="submit"/> 
-            <a href="/reset"><span id="change-passwd">Change password</span></a>    <span id="changes-saved">Changes saved</span>
-        </div>
-        <div class="signup-form-row">
-        </div>
+      <div class="signup-form-row">
+        <input class="button" id="profile-save" value="Save" type="submit"/>
+        <a href="/reset"><span id="change-passwd">Change password</span></a>    
+        <span id="changes-saved">Changes saved</span>
+      </div>
+      <div class="signup-form-row">
+      </div>
     </fieldset>
   </form>
 
-    <script xml:space="preserve">
-        $(document).ready(function() {
-            jQuery.validator.addMethod("twitter", function(value, element) {
-                return this.optional(element) || /^@.+/.test(value); 
-            }, "Please specify a valid twitter handle");
+  <script xml:space="preserve">
+    $(document).ready(function() {
+      jQuery.validator.addMethod("twitter", function(value, element) {
+        return this.optional(element) || /^@.+/.test(value);
+      }, "Please specify a valid twitter handle");
 
-            $('#profile-form').validate({
-                "errorClass": "signup-form-error"
-            });
-        });
+      $('#profile-form').validate({
+        "errorClass": "signup-form-error"
+      });
+    });
 
-        $('#profile-form').dirtyForms();
-    </script>
+    $('#profile-form').dirtyForms();
+  </script>
 
-</ml:page>
\ No newline at end of file
+</ml:page>

From 4cb4e197fa6f8627b0ec635f8c467dcc25177d19 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Mon, 21 Nov 2016 17:15:11 -0500
Subject: [PATCH 02/11] #343 display list of Document Sections on profile

---
 data/people/profile.xml   | 31 +++++++-----
 src/css/screen.css        |  4 +-
 src/model/data-access.xqy |  5 ++
 src/view/tag-library.xsl  | 99 ++++++++++++++++++++++-----------------
 4 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/data/people/profile.xml b/data/people/profile.xml
index f68851e22..aace67c72 100644
--- a/data/people/profile.xml
+++ b/data/people/profile.xml
@@ -4,20 +4,25 @@
   <script xml:space="preserve">
       if (! "<ml:user-name/>") { window.location.href = '/'; }
   </script>
-  <h1><ml:first-name/>'s Profile </h1>
+  <h1><ml:first-name/>'s Profile</h1>
 
-  <form method="post" action="#" id="profile-form" enctype="application/x-www-form-urlencoded">
-    <ml:profile/>
-    <fieldset>
-      <div class="signup-form-row">
-        <input class="button" id="profile-save" value="Save" type="submit"/>
-        <a href="/reset"><span id="change-passwd">Change password</span></a>    
-        <span id="changes-saved">Changes saved</span>
-      </div>
-      <div class="signup-form-row">
-      </div>
-    </fieldset>
-  </form>
+  <div class="row">
+    <form method="post" action="#" id="profile-form" enctype="application/x-www-form-urlencoded" class="col-md-6">
+      <ml:profile/>
+      <fieldset>
+        <div class="signup-form-row">
+          <input class="button" id="profile-save" value="Save" type="submit"/>
+          <a href="/reset"><span id="change-passwd">Change password</span></a>    
+          <span id="changes-saved">Changes saved</span>
+        </div>
+        <div class="signup-form-row">
+        </div>
+      </fieldset>
+    </form>
+    <div class="col-md-6">
+      <ml:preferences/>
+    </div>
+  </div>
 
   <script xml:space="preserve">
     $(document).ready(function() {
diff --git a/src/css/screen.css b/src/css/screen.css
index a4ff8655d..62f257880 100755
--- a/src/css/screen.css
+++ b/src/css/screen.css
@@ -2919,9 +2919,7 @@ span.highlightWidget {
 }
 
 #signup-form,
-#signup-form input,
-#profile-form,
-#profile-form input {
+#signup-form input {
     font-size: 16px;
 }
 
diff --git a/src/model/data-access.xqy b/src/model/data-access.xqy
index 94699cea7..4a051c78b 100755
--- a/src/model/data-access.xqy
+++ b/src/model/data-access.xqy
@@ -1014,4 +1014,9 @@ declare function ml:get-author-info($author-name as xs:string)
   /ml:Author[ml:name = $author-name]
 };
 
+declare function ml:list-doc-sections()
+{
+  fn:doc(api:toc-uri())//node()[@class="toc_select_option"]/fn:string()
+};
+
 (: model/data-access.xqy :)
diff --git a/src/view/tag-library.xsl b/src/view/tag-library.xsl
index 8d5fd51ce..87bef244a 100644
--- a/src/view/tag-library.xsl
+++ b/src/view/tag-library.xsl
@@ -1051,72 +1051,72 @@
     <xsl:variable name="user" select="users:getCurrentUser()"/>
     <div>
     <fieldset>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Email </div>
-        <input disabled="disabled" readonly="readonly" required="required" class="email" id="email" name="email" value="{$user/*:email/string()}" type="text"/>
+      <div class="form-group">
+        <label>Email</label>
+        <input disabled="disabled" readonly="readonly" required="required" class="email form-control" id="email" name="email" value="{$user/*:email/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Full Name </div>
-        <input autofocus="autofocus" class="required" required="required" id="name" name="name" value="{$user/*:name/string()}" type="text"/>
+      <div class="form-group">
+        <label>Full Name</label>
+        <input autofocus="autofocus" class="required form-control" required="required" id="name" name="name" value="{$user/*:name/string()}" type="text"/>
       </div>
       <!--
-      <div class="profile-form-row">
-        <div class="profile-form-label">Avatar</div>
+      <div class="form-group">
+        <label>Avatar</label>
         <input class="url" id="picture" name="picture" value="{$user/*:picture/string()}" type="text"/>
         <img src="{$user/*:picture/string()}" alt="picture"/>
       </div>
       -->
-      <div class="profile-form-row">
-        <div class="profile-form-label">Website/Blog</div>
-        <input class="url" id="url" name="url" value="{$user/*:url/string()}" type="text"/>
+      <div class="form-group">
+        <label>Website/Blog</label>
+        <input class="url form-control" id="url" name="url" value="{$user/*:url/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Twitter</div>
-        <input class="twitter" id="twitter" name="twitter" value="{$user/*:twitter/string()}" type="text"/>
+      <div class="form-group">
+        <label>Twitter</label>
+        <input class="twitter form-control" id="twitter" name="twitter" value="{$user/*:twitter/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Phone</div>
-        <input class="phone" id="phone" name="phone" required="required" value="{$user/*:phone/string()}" type="text"/>
+      <div class="form-group">
+        <label>Phone</label>
+        <input class="phone form-control" id="phone" name="phone" required="required" value="{$user/*:phone/string()}" type="text"/>
       </div>
       <!--
-      <div class="profile-form-row">
-        <div class="profile-form-label">Password</div>
+      <div class="form-group">
+        <label>Password</label>
         <input class="password required" id="password" name="password" value="" type="password"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Confirm password</div>
+      <div class="form-group">
+        <label>Confirm password</label>
         <input id="password_confirm" name="password_confirm" value="" type="password"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Street </div>
+      <div class="form-group">
+        <label>Street</label>
         <input class="required" id="street" name="street" required="required" value="{$user/*:street/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">City </div>
+      <div class="form-group">
+        <label>City</label>
         <input class="required" id="city" name="city" required="required" value="{$user/*:city/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">State </div>
+      <div class="form-group">
+        <label>State</label>
         <input class="required" id="state" name="state" required="required" value="{$user/*:state/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Zip/Postal Code </div>
+      <div class="form-group">
+        <label>Zip/Postal Code</label>
         <input class="required" id="zip" name="zip" required="required" value="{$user/*:zip/string()}" type="text"/>
       </div>
       -->
-      <div class="profile-form-row">
-        <div class="profile-form-label">Country </div>
-        <select class="required countrypicker country" id="country" required="required" name="country" data-initvalue="{$user/*:country/string()}" autocorrect="off" autocomplete="off">
+      <div class="form-group">
+        <label>Country</label>
+        <select class="required countrypicker country form-control" id="country" required="required" name="country" data-initvalue="{$user/*:country/string()}" autocorrect="off" autocomplete="off">
           <xsl:copy-of select="doc('/private/countries.xml')/*:select/*:option"/>
         </select>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Company/Organization </div>
-        <input class="required" id="organization" name="organization" required="required" value="{$user/*:organization/string()}" type="text"/>
+      <div class="form-group">
+        <label>Company/Organization</label>
+        <input class="required form-control" id="organization" name="organization" required="required" value="{$user/*:organization/string()}" type="text"/>
       </div>
-      <div class="profile-form-row">
-        <div class="profile-form-label">Industry </div>
-        <select class="required" id="industry" name="industry" required="required" data-initvalue="{$user/*:industry/string()}">
+      <div class="form-group">
+        <label>Industry</label>
+        <select class="required form-control" id="industry" name="industry" required="required" data-initvalue="{$user/*:industry/string()}">
           <option value="Aviation/Aerospace">Aviation/Aerospace</option>
           <option value="Commodity Trading">Commodity Trading</option>
           <option value="Consulting">Consulting</option>
@@ -1149,12 +1149,12 @@
     <!--
     <h3>Educational background</h3>
     <fieldset>
-        <div class="profile-form-row">
-          <div class="profile-form-label">School </div>
+        <div class="form-group">
+          <label>School</label>
           <input class="" id="school" name="school" value="{$user/*:school/string()}" type="text"/>
         </div>
-        <div class="profile-form-row">
-          <div class="profile-form-label">Year of graduation </div>
+        <div class="form-group">
+          <label>Year of graduation</label>
           <select class="yearpicker" id="yog" name="yog" data-value="{$user/*:yog/string()}"></select>
         </div>
     </fieldset>
@@ -1162,6 +1162,21 @@
     </div>
   </xsl:template>
 
+  <xsl:template match="preferences">
+    <xsl:variable name="user" select="users:getCurrentUser()"/>
+    <form class="">
+      <div class="form-group">
+        <label for="doc-section" class="control-label">Documentation Section Preference</label>
+        <select class="form-control" id="doc-section" name="doc-section" data-initvalue="{$user/*:industry/string()}">
+
+          <xsl:for-each select="ml:list-doc-sections()">
+            <option><xsl:value-of select="."/></option>
+          </xsl:for-each>
+        </select>
+      </div>
+    </form>
+  </xsl:template>
+
   <xsl:template match="reset-hidden-fields">
     <input id="token" name="token" value="$params[@name eq 'token']" type="hidden">
       <xsl:attribute name="value">

From 09f701474e53f6686e4b49bf73b9c420755069af Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Mon, 21 Nov 2016 17:45:26 -0500
Subject: [PATCH 03/11] #343 moved JS code into JS file; first pass at
 preference update

---
 data/people/profile.xml | 14 +-------------
 src/js/profile.js       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 src/js/profile.js

diff --git a/data/people/profile.xml b/data/people/profile.xml
index aace67c72..fbebffb08 100644
--- a/data/people/profile.xml
+++ b/data/people/profile.xml
@@ -24,18 +24,6 @@
     </div>
   </div>
 
-  <script xml:space="preserve">
-    $(document).ready(function() {
-      jQuery.validator.addMethod("twitter", function(value, element) {
-        return this.optional(element) || /^@.+/.test(value);
-      }, "Please specify a valid twitter handle");
-
-      $('#profile-form').validate({
-        "errorClass": "signup-form-error"
-      });
-    });
-
-    $('#profile-form').dirtyForms();
-  </script>
+  <script src="/js/profile.js"></script>
 
 </ml:page>
diff --git a/src/js/profile.js b/src/js/profile.js
new file mode 100644
index 000000000..a1f678f6c
--- /dev/null
+++ b/src/js/profile.js
@@ -0,0 +1,30 @@
+$(document).ready(function() {
+  jQuery.validator.addMethod("twitter", function(value, element) {
+    return this.optional(element) || /^@.+/.test(value);
+  }, "Please specify a valid twitter handle");
+
+  $('#profile-form').validate({
+    "errorClass": "signup-form-error"
+  });
+
+  $('#doc-section').change(function(event){
+    var selections = {
+      setting: event.currentTarget.getAttribute('name'),
+      value: event.currentTarget.value
+    };
+    $.ajax({
+      url: '/people/preferences',
+      method: 'POST',
+      data: selections,
+      success: function() {
+        console.log('success');
+      },
+      error: function(error) {
+        console.log('nope');
+      }
+    });
+  });
+});
+
+$('#profile-form').dirtyForms();
+

From 9a153810e6b7794f43dc2632267805ac0e0e0d32 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 22 Nov 2016 15:13:56 -0500
Subject: [PATCH 04/11] #343 create endpoint for updating preference

---
 src/controller/preferences.xqy |  18 ++++
 src/controller/rewrite.xqm     |   5 +-
 src/lib/users.xqy              |  26 +++++
 src/test/users.xqy             | 171 +++++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 src/controller/preferences.xqy
 create mode 100644 src/test/users.xqy

diff --git a/src/controller/preferences.xqy b/src/controller/preferences.xqy
new file mode 100644
index 000000000..71ff9933f
--- /dev/null
+++ b/src/controller/preferences.xqy
@@ -0,0 +1,18 @@
+xquery version "1.0-ml";
+
+import module namespace users="users" at "/lib/users.xqy";
+
+let $setting := xdmp:get-request-field("setting")
+let $value := xdmp:get-request-field("value")
+return
+  try {
+    users:set-preference(users:getCurrentUser(), $setting, $value),
+    "success"
+  } catch ($e) {
+    if ($e/error:name = "NO-USER") then
+      xdmp:set-response-code(401, $e/error:code/fn:string())
+    else if ($e/error:name = "INVALID-PREFERENCE") then
+      xdmp:set-response-code(400, $e/error:code/fn:string())
+    else
+      xdmp:rethrow()
+  }
diff --git a/src/controller/rewrite.xqm b/src/controller/rewrite.xqm
index 1410846a7..dd922b4cf 100755
--- a/src/controller/rewrite.xqm
+++ b/src/controller/rewrite.xqm
@@ -69,7 +69,7 @@ as xs:string
     else if ($path = ("/pubs/4.0", "/pubs/4.0/")) then $srv:api-server
     else if ($path = ("/pubs/3.2", "/pubs/3.2/")) then $srv:api-server
     else if ($path eq "/tools") then "/code"
-    else if (matches($path, "^/[0-9]\.[0-9]$")) 
+    else if (matches($path, "^/[0-9]\.[0-9]$"))
          then concat($srv:api-server, $path)
 
     else if (matches($path, "/pubs/[\d]\.[\d]/apidocs/")) then
@@ -204,7 +204,7 @@ as xs:string
     else if ($path = ("/adventure")) then
         "/"
     else if (starts-with($path, "/people")) then (: All people urls are gone for now :)
-        if ($path = ("/people/signup", "/people/reset", "/people/recovery", "/people/profile")) then (: except for these :)
+        if ($path = ("/people/signup", "/people/reset", "/people/recovery", "/people/profile", "/people/preferences")) then (: except for these :)
             $path
         else
             "/people/supernodes"
@@ -422,6 +422,7 @@ as xs:string
     else if ($path eq "/reset") then concat(
       "/controller/reset.xqy?", $query-string)
     else if ($path eq "/save-profile") then "/controller/save-profile.xqy"
+    else if ($path eq "/people/preferences") then "/controller/preferences.xqy"
     else if ($path eq "/recent") then "/controller/recent.xqy"
     else if ($path eq '/service/suggest') then concat(
       '/controller/suggest.xqy?', $query-string)
diff --git a/src/lib/users.xqy b/src/lib/users.xqy
index ab7c1a071..c5cb3165c 100755
--- a/src/lib/users.xqy
+++ b/src/lib/users.xqy
@@ -588,3 +588,29 @@ declare function users:denied() as xs:boolean
     else
         false()
 };
+
+declare function users:valid-preference($preference)
+{
+  $preference eq ("doc-section")
+};
+
+declare function users:set-preference(
+  $user as element(person)?,
+  $preference as xs:string,
+  $value as xs:string)
+{
+  if (fn:not(users:valid-preference($preference))) then
+    fn:error(xs:QName("INVALID-PREFERENCE"), $preference || " is not a valid preference setting")
+  else (),
+  let $curr-preference := $user/preferences/element()[fn:node-name(.) = xs:QName($preference)]
+  let $new-preference := element { $preference } { $value }
+  return
+    if (fn:not($user)) then
+      fn:error(xs:QName("NO-USER"), "No user is logged in")
+    else if (fn:exists($curr-preference)) then
+      xdmp:node-replace($curr-preference, $new-preference)
+    else if (fn:exists($user/preferences)) then
+      xdmp:node-insert-child($user/preferences, $new-preference)
+    else
+      xdmp:node-insert-child($user, element preferences { $new-preference })
+};
diff --git a/src/test/users.xqy b/src/test/users.xqy
new file mode 100644
index 000000000..9a3c68483
--- /dev/null
+++ b/src/test/users.xqy
@@ -0,0 +1,171 @@
+xquery version "1.0-ml";
+
+(: Test module for lib/users.xqy :)
+
+module namespace t="http://github.com/robwhitby/xray/test";
+
+import module namespace users="users" at "/lib/users.xqy";
+import module namespace assert="http://github.com/robwhitby/xray/assertions" at "/xray/src/assertions.xqy";
+
+declare variable $user1-id := "12345678901234567890";
+declare variable $user2-id := "23456789012345678901";
+declare variable $user3-id := "34567890123456789012";
+
+declare %t:setup function t:setup()
+{
+  xdmp:document-insert(
+    "/private/people/" || $user1-id || ".xml",
+    <person>
+      <id>12345678901234567890</id>
+      <email>test-1@fake-email.com</email>
+      <name>Fake User1</name>
+      <password>4O.SIJgwgtafmmvXuJryy1</password>
+      <created>2016-11-21T15:39:38.925926-05:00</created>
+      <organization>MarkLogic</organization>
+      <industry>Technology - Software</industry>
+      <phone>484-555-1212</phone>
+      <country>United States of America</country>
+      <state>PA</state>
+      <list>off</list>
+      <contact-me>off</contact-me>
+    </person>
+  ),
+  xdmp:document-insert(
+    "/private/people/" || $user2-id || ".xml",
+    <person>
+      <id>23456789012345678901</id>
+      <email>test-2@fake-email.com</email>
+      <name>Fake User2</name>
+      <password>4O.SIJgwgtafmmvXuJryy1</password>
+      <created>2016-11-21T15:39:38.925926-05:00</created>
+      <organization>MarkLogic</organization>
+      <industry>Technology - Software</industry>
+      <phone>484-555-1212</phone>
+      <country>United States of America</country>
+      <state>PA</state>
+      <list>off</list>
+      <contact-me>off</contact-me>
+      <preferences/>
+    </person>
+  ),
+  xdmp:document-insert(
+    "/private/people/" || $user3-id || ".xml",
+    <person>
+      <id>34567890123456789012</id>
+      <email>test-3@fake-email.com</email>
+      <name>Fake User3</name>
+      <password>4O.SIJgwgtafmmvXuJryy1</password>
+      <created>2016-11-21T15:39:38.925926-05:00</created>
+      <organization>MarkLogic</organization>
+      <industry>Technology - Software</industry>
+      <phone>484-555-1212</phone>
+      <country>United States of America</country>
+      <state>PA</state>
+      <list>off</list>
+      <contact-me>off</contact-me>
+      <preferences>
+        <doc-section>original value</doc-section>
+      </preferences>
+    </person>
+  )
+};
+
+declare %t:teardown function t:teardown()
+{
+  ( $user1-id, $user2-id, $user3-id) !
+    xdmp:document-delete("/private/people/" || . || ".xml")
+};
+
+declare %t:case function t:invalid-preference()
+{
+  assert:false(
+    users:valid-preference("invalid")
+  )
+};
+
+declare %t:case function t:set-pref-no-user()
+{
+  let $actual :=
+    try {
+      users:set-preference((), "doc-section", "value")
+    } catch ($ex) {
+      <wtf/>,
+      $ex
+    }
+  return (
+    assert:equal($actual/error:name/fn:string(), "NO-USER")
+  )
+};
+
+(:
+ : The user already has this preference and we're changing it.
+ : Since we're making actual database updates, we need to do the write and read
+ : in separate transactions.
+ :)
+declare %t:case function t:set-pref-override-pref()
+{
+  xdmp:eval(
+    'import module namespace users="users" at "/lib/users.xqy";
+     declare variable $user-id external;
+     declare variable $user := users:getUserByID($user-id);
+     users:set-preference($user, "doc-section", "new-value")',
+    map:new((map:entry("user-id", $user1-id)))
+  ),
+  let $actual :=
+    xdmp:eval(
+      'import module namespace users="users" at "/lib/users.xqy";
+       declare variable $user-id external;
+       users:getUserByID($user-id)',
+      map:new((map:entry("user-id", $user1-id)))
+    )
+  return assert:equal($actual/preferences/doc-section/fn:string(), "new-value")
+};
+
+(:
+ : The user does not have this preference setting yet, but does have a
+ : <preferences/> element.
+ : Since we're making actual database updates, we need to do the write and read
+ : in separate transactions.
+ :)
+declare %t:case function t:set-pref-create-pref()
+{
+  xdmp:eval(
+    'import module namespace users="users" at "/lib/users.xqy";
+     declare variable $user-id external;
+     declare variable $user := users:getUserByID($user-id);
+     users:set-preference($user, "doc-section", "new-value")',
+    map:new((map:entry("user-id", $user2-id)))
+  ),
+  let $actual :=
+    xdmp:eval(
+      'import module namespace users="users" at "/lib/users.xqy";
+       declare variable $user-id external;
+       users:getUserByID($user-id)',
+      map:new((map:entry("user-id", $user2-id)))
+    )
+  return assert:equal($actual/preferences/doc-section/fn:string(), "new-value")
+};
+
+(:
+ : The user does not have even have a <preferences/> element.
+ : Since we're making actual database updates, we need to do the write and read
+ : in separate transactions.
+ :)
+declare %t:case function t:set-pref-create-first-pref()
+{
+  xdmp:eval(
+    'import module namespace users="users" at "/lib/users.xqy";
+     declare variable $user-id external;
+     declare variable $user := users:getUserByID($user-id);
+     users:set-preference($user, "doc-section", "new-value")',
+    map:new((map:entry("user-id", $user3-id)))
+  ),
+  let $actual :=
+    xdmp:eval(
+      'import module namespace users="users" at "/lib/users.xqy";
+       declare variable $user-id external;
+       users:getUserByID($user-id)',
+      map:new((map:entry("user-id", $user3-id)))
+    )
+  return assert:equal($actual/preferences/doc-section/fn:string(), "new-value")
+};

From 0e4505b8ca04f2739c2c9a2d53fe123d4d6e5f24 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 22 Nov 2016 15:19:32 -0500
Subject: [PATCH 05/11] #343 add a message area to report on success/failure

---
 src/js/profile.js        | 32 ++++++++++++++++++++++++++++++--
 src/view/tag-library.xsl |  1 +
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/js/profile.js b/src/js/profile.js
index a1f678f6c..a70f93fdd 100644
--- a/src/js/profile.js
+++ b/src/js/profile.js
@@ -7,6 +7,34 @@ $(document).ready(function() {
     "errorClass": "signup-form-error"
   });
 
+  function reportMsg(type, msg) {
+    var errorDiv = document.getElementById('textarea-msg');
+    errorDiv.innerHTML = '';
+
+    var alertDiv = document.createElement('div');
+    alertDiv.setAttribute('class', 'alert alert-dismissible alert-' + type);
+    alertDiv.setAttribute('role', 'alert');
+
+    var dismissBtn = document.createElement('button');
+    dismissBtn.setAttribute('type', 'button');
+    dismissBtn.setAttribute('class', 'close');
+    dismissBtn.setAttribute('data-dismiss', 'alert');
+    dismissBtn.setAttribute('aria-label', 'Close');
+
+    var span = document.createElement('span');
+    span.setAttribute('aria-hidden', 'true');
+    span.innerHTML = 'x';
+
+    dismissBtn.appendChild(span);
+    alertDiv.appendChild(dismissBtn);
+
+    var msgElement = document.createElement('p');
+    msgElement.innerHTML = msg;
+
+    alertDiv.appendChild(msgElement);
+    errorDiv.appendChild(alertDiv);
+  }
+
   $('#doc-section').change(function(event){
     var selections = {
       setting: event.currentTarget.getAttribute('name'),
@@ -17,10 +45,10 @@ $(document).ready(function() {
       method: 'POST',
       data: selections,
       success: function() {
-        console.log('success');
+        reportMsg('success', 'Your preference has been updated.');
       },
       error: function(error) {
-        console.log('nope');
+        reportMsg('danger', 'Error while updating: ' + error);
       }
     });
   });
diff --git a/src/view/tag-library.xsl b/src/view/tag-library.xsl
index 87bef244a..20ae07f60 100644
--- a/src/view/tag-library.xsl
+++ b/src/view/tag-library.xsl
@@ -1164,6 +1164,7 @@
 
   <xsl:template match="preferences">
     <xsl:variable name="user" select="users:getCurrentUser()"/>
+    <div id="textarea-msg"/>
     <form class="">
       <div class="form-group">
         <label for="doc-section" class="control-label">Documentation Section Preference</label>

From abb1d917dcdb77f1ff02fddb7abf72fb279b37f8 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 22 Nov 2016 16:03:23 -0500
Subject: [PATCH 06/11] #343 get preference to display for the profile page

---
 src/lib/users.xqy         | 13 +++++++++++++
 src/model/data-access.xqy | 14 ++++++++++++--
 src/test/users.xqy        | 17 +++++++++++++++++
 src/view/tag-library.xsl  |  8 ++------
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/lib/users.xqy b/src/lib/users.xqy
index c5cb3165c..6b52e3f2c 100755
--- a/src/lib/users.xqy
+++ b/src/lib/users.xqy
@@ -27,6 +27,9 @@ declare namespace em="URN:ietf:params:email-xml:";
 (: If the end user selects this country, require them to select a state. :)
 declare variable $COUNTRY-REQUIRES-STATE := ("United States of America", "Canada");
 
+(: String key for user preference settings :)
+declare variable $PREF-DOC-SECTION := "doc-section";
+
 declare function users:emailInUse($email as xs:string) as xs:boolean
 {
     exists(users:getUserByEmail($email))
@@ -614,3 +617,13 @@ declare function users:set-preference(
     else
       xdmp:node-insert-child($user, element preferences { $new-preference })
 };
+
+declare function users:get-user-preference(
+  $user as element(person)?,
+  $preference as xs:string)
+as xs:string?
+{
+  let $qn-pref := xs:QName($preference)
+  return
+    $user/preferences/element()[fn:node-name(.) = $qn-pref]
+};
diff --git a/src/model/data-access.xqy b/src/model/data-access.xqy
index 4a051c78b..d9dc3cbbf 100755
--- a/src/model/data-access.xqy
+++ b/src/model/data-access.xqy
@@ -9,6 +9,7 @@ import module namespace draft="http://developer.marklogic.com/site/internal/filt
   at "filter-drafts.xqy";
 import module namespace u="http://marklogic.com/rundmc/util"
   at "/lib/util-2.xqy";
+import module namespace users="users" at "/lib/users.xqy";
 
 declare default element namespace "http://developer.marklogic.com/site/internal";
 
@@ -1014,9 +1015,18 @@ declare function ml:get-author-info($author-name as xs:string)
   /ml:Author[ml:name = $author-name]
 };
 
-declare function ml:list-doc-sections()
+declare function ml:build-doc-sections-options()
 {
-  fn:doc(api:toc-uri())//node()[@class="toc_select_option"]/fn:string()
+  let $options := fn:doc(api:toc-uri())//node()[@class="toc_select_option"]/fn:string()
+  let $preference := users:get-user-preference(users:getCurrentUser(), $users:PREF-DOC-SECTION)
+  for $option in $options
+  return
+    element option {
+      if ($option = $preference) then
+        attribute selected { "true" }
+      else (),
+      $option
+    }
 };
 
 (: model/data-access.xqy :)
diff --git a/src/test/users.xqy b/src/test/users.xqy
index 9a3c68483..d28b17b13 100644
--- a/src/test/users.xqy
+++ b/src/test/users.xqy
@@ -169,3 +169,20 @@ declare %t:case function t:set-pref-create-first-pref()
     )
   return assert:equal($actual/preferences/doc-section/fn:string(), "new-value")
 };
+
+declare %t:case function t:get-unset-pref()
+{
+  assert:empty(
+    users:get-user-preference(users:getUserByID($user3-id), "no-such-preference")
+  )
+};
+
+declare %t:case function t:get-set-pref()
+{
+  assert:equal(
+    users:get-user-preference(
+      users:getUserByID($user3-id),
+      $users:PREF-DOC-SECTION),
+    "original value"
+  )
+};
diff --git a/src/view/tag-library.xsl b/src/view/tag-library.xsl
index 20ae07f60..a83ff36a5 100644
--- a/src/view/tag-library.xsl
+++ b/src/view/tag-library.xsl
@@ -1163,16 +1163,12 @@
   </xsl:template>
 
   <xsl:template match="preferences">
-    <xsl:variable name="user" select="users:getCurrentUser()"/>
     <div id="textarea-msg"/>
     <form class="">
       <div class="form-group">
         <label for="doc-section" class="control-label">Documentation Section Preference</label>
-        <select class="form-control" id="doc-section" name="doc-section" data-initvalue="{$user/*:industry/string()}">
-
-          <xsl:for-each select="ml:list-doc-sections()">
-            <option><xsl:value-of select="."/></option>
-          </xsl:for-each>
+        <select class="form-control" id="doc-section" name="doc-section">
+          <xsl:copy-of select="ml:build-doc-sections-options()"/>
         </select>
       </div>
     </form>

From efff7252ac72a4f237155b63bdfe08d356a13761 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 22 Nov 2016 17:35:52 -0500
Subject: [PATCH 07/11] #343 use the current user's preference to display the
 guide

---
 src/apidoc/controller/rewrite.xqm |  3 +++
 src/apidoc/js/toc_filter.js       | 31 ++++++++++++++++++++++++--
 src/controller/preferences.xqy    | 37 +++++++++++++++++++------------
 src/lib/users.xqy                 | 14 ++++++++++++
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/apidoc/controller/rewrite.xqm b/src/apidoc/controller/rewrite.xqm
index cff7439b6..b72424fc3 100644
--- a/src/apidoc/controller/rewrite.xqm
+++ b/src/apidoc/controller/rewrite.xqm
@@ -412,6 +412,9 @@ declare function m:rewrite()
 
   else if (starts-with($PATH, '/xray')) then m:xray()
 
+  (: Support retrieving user preferences :)
+  else if ($PATH eq "/people/preferences") then "/controller/preferences.xqy"
+
   (: Root request: "/" means "index.xml" inside the default version directory :)
   else if ($PATH eq '/') then m:transform($ROOT-DOC-URL)
 
diff --git a/src/apidoc/js/toc_filter.js b/src/apidoc/js/toc_filter.js
index f3c7fc9f3..a06c733ec 100755
--- a/src/apidoc/js/toc_filter.js
+++ b/src/apidoc/js/toc_filter.js
@@ -139,8 +139,7 @@ function tocInit() {
       prerendered: true,
       url: tocPartsDir }); });
 
-  // Set up the select widget
-  tocSelect.change(function(e) {
+  function changeSelection() {
     LOG.debug('TOC select option changed');
     // Hide the old TOC tree.
     $(".apidoc_tree:visible").hide();
@@ -159,6 +158,34 @@ function tocInit() {
     tree.show();
 
     tocFilterUpdate();
+  }
+
+  // Set up the select widget
+  tocSelect.change(changeSelection);
+
+  $.ajax({
+    url: '/people/preferences',
+    method: 'GET',
+    dataType: 'json',
+    success: function(data) {
+      var preferredSection = data['doc-section'];
+      var select = document.querySelector('#toc_select');
+      var options = document.querySelectorAll('#toc_select option');
+      var initiallySelected = select.selectedIndex;
+      for (var i in options) {
+        if (options.hasOwnProperty(i)) {
+          if (options[i].text === preferredSection) {
+            select.selectedIndex = i;
+          }
+        }
+      }
+      if (initiallySelected !== select.selectedIndex) {
+        changeSelection();
+      }
+    },
+    error: function(error) {
+      console.log('error trying to get preferences: ' + JSON.stringify(error));
+    }
   });
 
   // Set up the filter
diff --git a/src/controller/preferences.xqy b/src/controller/preferences.xqy
index 71ff9933f..6b9fa7cfa 100644
--- a/src/controller/preferences.xqy
+++ b/src/controller/preferences.xqy
@@ -2,17 +2,26 @@ xquery version "1.0-ml";
 
 import module namespace users="users" at "/lib/users.xqy";
 
-let $setting := xdmp:get-request-field("setting")
-let $value := xdmp:get-request-field("value")
-return
-  try {
-    users:set-preference(users:getCurrentUser(), $setting, $value),
-    "success"
-  } catch ($e) {
-    if ($e/error:name = "NO-USER") then
-      xdmp:set-response-code(401, $e/error:code/fn:string())
-    else if ($e/error:name = "INVALID-PREFERENCE") then
-      xdmp:set-response-code(400, $e/error:code/fn:string())
-    else
-      xdmp:rethrow()
-  }
+
+declare variable $REQUEST := xdmp:get-request-method();
+
+if ($REQUEST = "GET") then
+  users:get-prefs-as-json(users:getCurrentUser())
+
+else if ($REQUEST = "POST") then
+  let $setting := xdmp:get-request-field("setting")
+  let $value := xdmp:get-request-field("value")
+  return
+    try {
+      users:set-preference(users:getCurrentUser(), $setting, $value),
+      "success"
+    } catch ($e) {
+      if ($e/error:name = "NO-USER") then
+        xdmp:set-response-code(401, $e/error:code/fn:string())
+      else if ($e/error:name = "INVALID-PREFERENCE") then
+        xdmp:set-response-code(400, $e/error:code/fn:string())
+      else
+        xdmp:rethrow()
+    }
+else
+  xdmp:set-response-code(405, "Method Not Allowed")
diff --git a/src/lib/users.xqy b/src/lib/users.xqy
index 6b52e3f2c..cc9f6a965 100755
--- a/src/lib/users.xqy
+++ b/src/lib/users.xqy
@@ -627,3 +627,17 @@ as xs:string?
   return
     $user/preferences/element()[fn:node-name(.) = $qn-pref]
 };
+
+declare function users:get-prefs-as-json($user as element(person)?)
+as xs:string?
+{
+  if ($user) then
+    "{" ||
+    fn:string-join(
+      for $pref in users:getCurrentUser()/preferences/element()
+      return ('"' || fn:node-name($pref) || '": "' || $pref/fn:string() || '"'),
+      ","
+    )
+    ||"}"
+  else ()
+};

From 146dbcd30001b55b021f8fc1fff999c863d122bf Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Wed, 23 Nov 2016 12:28:12 -0500
Subject: [PATCH 08/11] #343 enable/disable section pref btn based on login
 Also, improve display on mobile

---
 src/apidoc/js/toc_filter.js    | 32 +++++++++++++++++++++-----------
 src/apidoc/setup/toc.xqm       | 22 ++++++++++++++--------
 src/controller/preferences.xqy |  2 +-
 src/css/apidoc.css             | 17 ++++++-----------
 src/js/functions.js            | 10 ++++++++++
 src/lib/users.xqy              |  7 ++++---
 6 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/apidoc/js/toc_filter.js b/src/apidoc/js/toc_filter.js
index a06c733ec..5759f4fa2 100755
--- a/src/apidoc/js/toc_filter.js
+++ b/src/apidoc/js/toc_filter.js
@@ -168,19 +168,29 @@ function tocInit() {
     method: 'GET',
     dataType: 'json',
     success: function(data) {
-      var preferredSection = data['doc-section'];
-      var select = document.querySelector('#toc_select');
-      var options = document.querySelectorAll('#toc_select option');
-      var initiallySelected = select.selectedIndex;
-      for (var i in options) {
-        if (options.hasOwnProperty(i)) {
-          if (options[i].text === preferredSection) {
-            select.selectedIndex = i;
+      if (data.currentUserId) {
+        // The user is logged in. Change to the preferred section of the docs.
+        var preferredSection = data['doc-section'];
+        var select = document.querySelector('#toc_select');
+        var options = document.querySelectorAll('#toc_select option');
+        var initiallySelected = select.selectedIndex;
+        for (var i in options) {
+          if (options.hasOwnProperty(i)) {
+            if (options[i].text === preferredSection) {
+              select.selectedIndex = i;
+            }
           }
         }
-      }
-      if (initiallySelected !== select.selectedIndex) {
-        changeSelection();
+        if (initiallySelected !== select.selectedIndex) {
+          changeSelection();
+        }
+      } else {
+        // The user is not logged in.
+        var saveBtn = document.getElementById('save-section-pref');
+        if (saveBtn) {
+          saveBtn.setAttribute('disabled', true);
+          saveBtn.setAttribute('title', 'Log in to save preferred section');
+        }
       }
     },
     error: function(error) {
diff --git a/src/apidoc/setup/toc.xqm b/src/apidoc/setup/toc.xqm
index e459838fe..8bd976de8 100755
--- a/src/apidoc/setup/toc.xqm
+++ b/src/apidoc/setup/toc.xqm
@@ -855,16 +855,22 @@ as element()
     'toc:render-content',
     ($uri, $prefix-for-hrefs, xdmp:describe($toc))),
   <div id="tocs_all" class="toc_section" xmlns="http://www.w3.org/1999/xhtml">
-    <div class="toc_select">
-      Section: <select id="toc_select">
-  {
-    (: To preserve node order, use SMO rather than XPath. :)
-    $toc/toc:node
-    ! toc:render-select-option(., . is $selected)
-  }
+    <div class="toc_select row">
+      <span class="col-sm-12 col-md-2">Section:</span>
+      <select id="toc_select" class="col-sm-10 col-md-9">
+        {
+          (: To preserve node order, use SMO rather than XPath. :)
+          $toc/toc:node
+          ! toc:render-select-option(., . is $selected)
+        }
       </select>
+      <button type="button" class="btn btn-default btn-xs col-sm-2 col-md-1"
+        id="save-section-pref"
+        title="Save section preference">
+        <span class="glyphicon glyphicon-save"></span>
+      </button>
     </div>
-    <div class="scrollable_section">
+    <div class="scrollable_section row">
       <input id="config-filter" name="config-filter" class="config-filter"/>
       <img src="/apidoc/images/removeFilter.png" id="config-filter-close-button"
   class="config-filter-close-button"/>
diff --git a/src/controller/preferences.xqy b/src/controller/preferences.xqy
index 6b9fa7cfa..8ebbdeeeb 100644
--- a/src/controller/preferences.xqy
+++ b/src/controller/preferences.xqy
@@ -2,12 +2,12 @@ xquery version "1.0-ml";
 
 import module namespace users="users" at "/lib/users.xqy";
 
+declare option xdmp:mapping "false";
 
 declare variable $REQUEST := xdmp:get-request-method();
 
 if ($REQUEST = "GET") then
   users:get-prefs-as-json(users:getCurrentUser())
-
 else if ($REQUEST = "POST") then
   let $setting := xdmp:get-request-field("setting")
   let $value := xdmp:get-request-field("value")
diff --git a/src/css/apidoc.css b/src/css/apidoc.css
index 5c09b54b1..dd0f10325 100755
--- a/src/css/apidoc.css
+++ b/src/css/apidoc.css
@@ -267,16 +267,14 @@ ol ol {
 
 .toc_select {
     position: inherit;
-    margin-left: 16px;
+    margin-left: 0;
 }
 
 select#toc_select {
-    width: 98%;
-    /* For browsers that support calc. */
-    width: calc(100% - 96px);
 }
 
 .scrollable_section {
+    margin-left: 0;
     position: inherit;
 }
 
@@ -315,7 +313,7 @@ h1 a,
 
 .treecontrol.top_control {
     float: right;
-    margin: 8px 24px 0 0;
+    margin: 8px 0 0 0;
     cursor: pointer;
     font-size: .9em;
 }
@@ -352,12 +350,8 @@ h1 a,
 
 /* override treeview CSS */
 .treeview {
-    position: absolute;
-    top: 78px;
-    bottom: 0;
-    width: 98%;
+    width: 100%;
     /* For browsers that support calc. */
-    width: calc(100% - 12px);
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
     /* android may need this so touch-scrolling works. */
@@ -483,10 +477,11 @@ a.sectionLink:hover {
 
 .toc,
 #api_sub {
-    line-height: 100%;
 }
 
 .toc_section {
+    /* width is 100% - width of splitter - width of Bootstrap margin negative offset */
+    width: calc(100% - 42px);
 }
 
 .api_caption {
diff --git a/src/js/functions.js b/src/js/functions.js
index 31e112d89..88946cef0 100755
--- a/src/js/functions.js
+++ b/src/js/functions.js
@@ -556,10 +556,20 @@ if(typeof jQuery != 'undefined') {
               $('#login-trigger').hide();
               $('#session-trigger').text(data.name);
               $('#session-trigger').show();
+              // If we're on the docs page, enable the save-section-preference button
+              var saveBtn = document.getElementById('save-section-pref');
+              if (saveBtn) {
+                saveBtn.removeAttribute('disabled');
+                saveBtn.setAttribute('title', 'Save section preference');
+              }
+
             } else {
               $('#login-error').text(data.status);
             }
           },
+          error: function(error) {
+            console.log('problem during login');
+          },
           dataType: 'json'
         });
       });
diff --git a/src/lib/users.xqy b/src/lib/users.xqy
index cc9f6a965..6c97af232 100755
--- a/src/lib/users.xqy
+++ b/src/lib/users.xqy
@@ -633,11 +633,12 @@ as xs:string?
 {
   if ($user) then
     "{" ||
-    fn:string-join(
+    fn:string-join((
+      '"currentUserId":' || '"' || $user/id/fn:string() || '"',
       for $pref in users:getCurrentUser()/preferences/element()
-      return ('"' || fn:node-name($pref) || '": "' || $pref/fn:string() || '"'),
+      return ('"' || fn:node-name($pref) || '": "' || $pref/fn:string() || '"')),
       ","
     )
     ||"}"
-  else ()
+  else "{}"
 };

From 5fe8a5fe02f9df1996ba3686e0cd0180f0834821 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Wed, 23 Nov 2016 14:14:23 -0500
Subject: [PATCH 09/11] #343 if we're looking at a specific page, show that in
 TOC instead of user preference

---
 src/apidoc/js/toc_filter.js | 85 ++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/apidoc/js/toc_filter.js b/src/apidoc/js/toc_filter.js
index 5759f4fa2..b7f3985bc 100755
--- a/src/apidoc/js/toc_filter.js
+++ b/src/apidoc/js/toc_filter.js
@@ -104,6 +104,27 @@ function tocInitGlobals() {
     "[tocInitGlobals] No tocSectionLinkSelector!");
 }
 
+function saveSectionPref(event) {
+  var select = document.getElementById('toc_select');
+  var preferredSection = select.options[select.selectedIndex].text;
+  var selections = {
+    setting: 'doc-section',
+    value: preferredSection
+  };
+  $.ajax({
+    url: '/people/preferences',
+    method: 'POST',
+    data: selections,
+    success: function() {
+      console.log('preference saved');
+    },
+    error: function(error) {
+      console.log('error: ' + error);
+    }
+  });
+
+}
+
 function tocInit() {
   LOG.debug("tocInit");
 
@@ -163,40 +184,44 @@ function tocInit() {
   // Set up the select widget
   tocSelect.change(changeSelection);
 
-  $.ajax({
-    url: '/people/preferences',
-    method: 'GET',
-    dataType: 'json',
-    success: function(data) {
-      if (data.currentUserId) {
-        // The user is logged in. Change to the preferred section of the docs.
-        var preferredSection = data['doc-section'];
-        var select = document.querySelector('#toc_select');
-        var options = document.querySelectorAll('#toc_select option');
-        var initiallySelected = select.selectedIndex;
-        for (var i in options) {
-          if (options.hasOwnProperty(i)) {
-            if (options[i].text === preferredSection) {
-              select.selectedIndex = i;
+  if (!tocSectionLinkSelector) {
+    $.ajax({
+      url: '/people/preferences',
+      method: 'GET',
+      dataType: 'json',
+      success: function(data) {
+        if (data.currentUserId) {
+          // The user is logged in. Change to the preferred section of the docs.
+          var preferredSection = data['doc-section'];
+          var select = document.querySelector('#toc_select');
+          var options = document.querySelectorAll('#toc_select option');
+          var initiallySelected = select.selectedIndex;
+          for (var i in options) {
+            if (options.hasOwnProperty(i)) {
+              if (options[i].text === preferredSection) {
+                select.selectedIndex = i;
+              }
             }
           }
+          if (initiallySelected !== select.selectedIndex) {
+            changeSelection();
+          }
+        } else {
+          // The user is not logged in.
+          var saveBtn = document.getElementById('save-section-pref');
+          if (saveBtn) {
+            saveBtn.setAttribute('disabled', true);
+            saveBtn.setAttribute('title', 'Log in to save preferred section');
+          }
         }
-        if (initiallySelected !== select.selectedIndex) {
-          changeSelection();
-        }
-      } else {
-        // The user is not logged in.
-        var saveBtn = document.getElementById('save-section-pref');
-        if (saveBtn) {
-          saveBtn.setAttribute('disabled', true);
-          saveBtn.setAttribute('title', 'Log in to save preferred section');
-        }
+      },
+      error: function(error) {
+        console.log('error trying to get preferences: ' + JSON.stringify(error));
       }
-    },
-    error: function(error) {
-      console.log('error trying to get preferences: ' + JSON.stringify(error));
-    }
-  });
+    });
+  }
+
+  $('#save-section-pref').click(saveSectionPref);
 
   // Set up the filter
   tocInitFilter($("#config-filter"),

From 56db71a12226696dea61bfd4655af69a0808aff6 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Thu, 1 Dec 2016 12:52:38 -0500
Subject: [PATCH 10/11] #343 #632 fixed spacing problem

---
 src/apidoc/setup/toc.xqm |  6 +++---
 src/css/apidoc.css       | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/apidoc/setup/toc.xqm b/src/apidoc/setup/toc.xqm
index 8bd976de8..7f5012777 100755
--- a/src/apidoc/setup/toc.xqm
+++ b/src/apidoc/setup/toc.xqm
@@ -856,15 +856,15 @@ as element()
     ($uri, $prefix-for-hrefs, xdmp:describe($toc))),
   <div id="tocs_all" class="toc_section" xmlns="http://www.w3.org/1999/xhtml">
     <div class="toc_select row">
-      <span class="col-sm-12 col-md-2">Section:</span>
-      <select id="toc_select" class="col-sm-10 col-md-9">
+      <label class="">Section:</label>
+      <select id="toc_select" class="">
         {
           (: To preserve node order, use SMO rather than XPath. :)
           $toc/toc:node
           ! toc:render-select-option(., . is $selected)
         }
       </select>
-      <button type="button" class="btn btn-default btn-xs col-sm-2 col-md-1"
+      <button type="button" class="btn btn-default btn-xs"
         id="save-section-pref"
         title="Save section preference">
         <span class="glyphicon glyphicon-save"></span>
diff --git a/src/css/apidoc.css b/src/css/apidoc.css
index dd0f10325..5c38641a4 100755
--- a/src/css/apidoc.css
+++ b/src/css/apidoc.css
@@ -270,7 +270,18 @@ ol ol {
     margin-left: 0;
 }
 
-select#toc_select {
+.toc_select label {
+  float: left;
+  margin-left: 16px;
+}
+
+.toc_select select#toc_select {
+  float: left;
+  margin-left: 5px;
+}
+
+.toc_select button {
+  float: right;
 }
 
 .scrollable_section {

From fc3a038d5e7974903a89ee98748c233aca6c279a Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Fri, 2 Dec 2016 13:10:49 -0500
Subject: [PATCH 11/11] #343 get the scrollbars to show up again

---
 src/apidoc/setup/toc.xqm | 18 ++++++++++--------
 src/css/apidoc.css       | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/apidoc/setup/toc.xqm b/src/apidoc/setup/toc.xqm
index 7f5012777..1fb4ccb47 100755
--- a/src/apidoc/setup/toc.xqm
+++ b/src/apidoc/setup/toc.xqm
@@ -871,14 +871,16 @@ as element()
       </button>
     </div>
     <div class="scrollable_section row">
-      <input id="config-filter" name="config-filter" class="config-filter"/>
-      <img src="/apidoc/images/removeFilter.png" id="config-filter-close-button"
-  class="config-filter-close-button"/>
-      <div id="treeglobal" class="treecontrol top_control global_control">
-        <span class="expand" title="Expand the entire tree below">
-          <img id="treeglobalimage" src="/css/apidoc/images/plus.gif"></img>
-          <span id="treeglobaltext">expand</span>
-        </span>
+      <div class="filter">
+        <input id="config-filter" name="config-filter" class="config-filter"/>
+        <img src="/apidoc/images/removeFilter.png" id="config-filter-close-button"
+    class="config-filter-close-button"/>
+        <div id="treeglobal" class="treecontrol top_control global_control">
+          <span class="expand" title="Expand the entire tree below">
+            <img id="treeglobalimage" src="/css/apidoc/images/plus.gif"></img>
+            <span id="treeglobaltext">expand</span>
+          </span>
+        </div>
       </div>
       <div id="apidoc_tree_container" class="pjax_enabled">
   {
diff --git a/src/css/apidoc.css b/src/css/apidoc.css
index 5c38641a4..6be8f5eca 100755
--- a/src/css/apidoc.css
+++ b/src/css/apidoc.css
@@ -225,12 +225,14 @@ ol ol {
 #apidoc_toc,
 #all_tocs,
 .toc {
+    height: 100%;
     margin: 0;
     padding: 0;
 }
 #toc_content {
     width: 100%;
     background: #fff;
+    height: 100%;
     padding: 16px 0 16px 0;
 }
 
@@ -267,6 +269,7 @@ ol ol {
 
 .toc_select {
     position: inherit;
+    margin-right: 5px;
     margin-left: 0;
 }
 
@@ -285,11 +288,17 @@ ol ol {
 }
 
 .scrollable_section {
+    height: 100%;
+    margin-right: 5px;
     margin-left: 0;
     position: inherit;
 }
 
-.scrollable_section > input {
+#apidoc_tree_container {
+    height: calc(100% - 44px);
+}
+
+.scrollable_section .filter input {
     border: 1px solid #ccc;
     font-size: 11px;
     margin: 8px 0 0 16px;
@@ -368,6 +377,7 @@ h1 a,
     /* android may need this so touch-scrolling works. */
     z-index: 0;
     border-top: 1px solid #ccc;
+    height: 100%;
 }
 .treeview a.toc_root {
     font-weight: bold;
@@ -488,11 +498,13 @@ a.sectionLink:hover {
 
 .toc,
 #api_sub {
+    line-height: 100%;
 }
 
 .toc_section {
+    height: 100%;
     /* width is 100% - width of splitter - width of Bootstrap margin negative offset */
-    width: calc(100% - 42px);
+    width: calc(100% - 12px);
 }
 
 .api_caption {
@@ -738,7 +750,7 @@ span.highlightWidget {
     .toc_select {
         margin-left: 4px;
     }
-    .scrollable_section > input {
+    .scrollable_section .filter input {
         margin-left: 4px;
     }
     #api_sub {