Merge branch 'master' into Develop

cps/static/css/caliBlur.css

@@ -3293,6 +3293,10 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     left: 0 !important;
     overflow-y: auto;
 }
+#add-to-shelves {
+  max-height: calc(100% - 120px);
+  overflow-y: auto;
+}
 
 .dropdown-menu > li > a {
     color: hsla(0, 0%, 100%, .7);

cps/static/js/main.js

@@ -704,7 +704,7 @@ $(function() {
             method:"post",
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../../ajax/view",
+            url: window.location.pathname + "/../ajax/view",
             data: "{\"series\": {\"series_view\": \""+ view +"\"}}",
             success: function success() {
                 location.reload();

cps/static/js/table.js

@@ -74,7 +74,12 @@ $(function() {
         });
     });
 
-    $("#merge_books").click(function() {
+    $("#merge_books").click(function(event) {
+        if ($(this).hasClass("disabled")) {
+            event.stopPropagation()
+        } else {
+            $('#mergeModal').modal("show");
+        }
         $.ajax({
             method:"post",
             contentType: "application/json; charset=utf-8",