Merge branch 'release/1.0.1'

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 1.0.1 (3 Jan 2018)
+
+Add a More/Less button for uncollapsing/collapsing long lists that
+have been cut using a horizontal rule.
+
 # Version 1.0.0 (2 Jan 2018)
 
 First version!

Cargo.lock

@@ -809,7 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wishlists"
-version = "0.1.0"
+version = "1.0.1"
 dependencies = [
  "Inflector 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "comrak 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wishlists"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Paul van Tilburg <paul@luon.net>"]
 description = """
 A web application for maintaining a board of wishlists for a family or

static/css/wishlists.css

@@ -6462,8 +6462,20 @@ a.text-dark:focus, a.text-dark:hover {
   .table-bordered th,
   .table-bordered td {
     border: 1px solid #ddd !important; } }
+html {
+  position: relative;
+  min-height: 100%; }
+
 body {
-  padding-top: 80px; }
+  padding-top: 80px;
+  margin-bottom: 24px; }
+
+footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 24px;
+  line-height: 24px; }
 
 .list-html ul,
 .list-html ol {

static/js/wishlists.js

@@ -97,6 +97,26 @@ function updateListHTML(listElem) {
     $("ul > li", listHtmlElem).has('input[type="checkbox"]')
                               .parent()
                               .addClass("tasklist");
+    if (listHtmlElem.find('hr').length) {
+      listHtmlElem.find('hr')
+                  .nextAll()
+                  .wrapAll('<div class="collapse list-more"/>')
+      listHtmlElem.append('<div class="row justify-content-center">' +
+        '<button class="btn btn-sm btn-light text-dark list-more-toggle" '+
+                 'data-toggle="collapse" ' +
+                 'data-target=".list[data-list-id=\'' + listId + '\'] .list-more">' +
+          'Meer…</button>' +
+        '</div>');
+
+      var listMoreButton = listHtmlElem.find(".list-more-toggle");
+      console.debug(listMoreButton);
+      listHtmlElem.find('.list-more')
+        .on('shown.bs.collapse', function() {
+        listMoreButton.text('Minder…');
+      }).on('hidden.bs.collapse', function() {
+        listMoreButton.text('Meer…');
+      });
+    }
   }).fail(function(html, textMsg, error) {
     listHtmlElem.html("<h3><i>Kan lijst niet tonen!</i></h3>" +
       "<p class='pt-2'><small><i>(Technische foutmelding: " + error +

static/scss/wishlists.scss

@@ -1,9 +1,24 @@
 // Include all of Bootstrap
 @import "bootstrap/bootstrap";
 
+//
+html {
+  position: relative;
+  min-height: 100%;
+}
+
 // Add some padding for the fixed-top navbar
 body {
   padding-top: 80px;
+  margin-bottom: 24px;
+}
+
+footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 24px;
+  line-height: 24px;
 }
 
 // Reduce the large padding for lists