Merge branch 'master' into cover_thumbnail

# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html

cps/static/js/details.js

@@ -28,14 +28,24 @@ $("#have_read_cb").on("change", function() {
         data: $(this).closest("form").serialize(),
         error: function(response) {
             var data = [{type:"danger", message:response.responseText}]
-            $("#flash_success").remove();
+            // $("#flash_success").parent().remove();
             $("#flash_danger").remove();
+            $(".row-fluid.text-center").remove();
             if (!jQuery.isEmptyObject(data)) {
-                data.forEach(function (item) {
-                    $(".navbar").after('<div class="row-fluid text-center" >' +
-                        '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
-                        '</div>');
-                });
+                $("#have_read_cb").prop("checked", !$("#have_read_cb").prop("checked"));
+                if($("#bookDetailsModal").is(":visible")) {
+                    data.forEach(function (item) {
+                        $(".modal-header").after('<div id="flash_' + item.type +
+                            '" class="text-center alert alert-' + item.type + '">' + item.message + '</div>');
+                    });
+                } else
+                {
+                    data.forEach(function (item) {
+                        $(".navbar").after('<div class="row-fluid text-center" >' +
+                            '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
+                            '</div>');
+                    });
+                }
             }
         }
     });

cps/static/js/main.js

@@ -515,6 +515,7 @@ $(function() {
 
     $("#bookDetailsModal")
         .on("show.bs.modal", function(e) {
+            $("#flash_danger").remove();
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times

cps/static/js/table.js

@@ -125,8 +125,9 @@ $(function() {
             url: window.location.pathname + "/../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success(booTitles) {
+                $('#merge_from').empty();
                 $.each(booTitles.from, function(i, item) {
-                    $("<span>- " + item + "</span>").appendTo("#merge_from");
+                    $("<span>- " + item + "</span><p></p>").appendTo("#merge_from");
                 });
                 $("#merge_to").text("- " + booTitles.to);
 
@@ -843,11 +844,13 @@ function checkboxChange(checkbox, userId, field, field_index) {
 
 function BookCheckboxChange(checkbox, userId, field) {
     var value = checkbox.checked ? "True" : "False";
+    var element = checkbox;
     $.ajax({
         method: "post",
         url: getPath() + "/ajax/editbooks/" + field,
         data: {"pk": userId, "value": value},
         error: function(data) {
+            element.checked = !element.checked;
             handleListServerResponse([{type:"danger", message:data.responseText}])
         },
         success: handleListServerResponse