Changeset 29226

Timestamp:

2014-08-21T14:41:48+12:00 (10 years ago)

Author:

kjdon

Message:

working on the save stuff, and changing the buttons to be disabled. not quite working properly yet :-(

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• document_scripts.js (modified) (5 diffs)
• documentmaker_scripts_util.js (modified) (12 diffs)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -10 +10 @@
 /* Here you can choose which save buttons you like. Choose from 'save', 'rebuild', 'saveandrebuild' */
 var save_and_rebuild_buttons = ["saveandrebuild"];
+
+var save_button_text = "Save changes";
+var rebuild_button_text = "Rebuild";
+var save_and_rebuild_button_text = "Save and Rebuild";
 
 /* What kind of metadata element selection do we provide?
@@ -1149 +1153 @@
     
     var visibility = (visible ? "" : "none");
-    $("#saveButton, #metadataListLabel, #metadataSetList").css("display", visibility);
+    $("#metadataListLabel, #metadataSetList").css("display", visibility);
     
     $(".editMetadataButton").each(function()
@@ -1212 +1216 @@
       if (button_type == "save") {
         var saveButton = $("<button>", {"id": "saveButton", "class": "ui-state-default ui-corner-all"});
-        saveButton.click(saveMetadataChanges);
-        saveButton.html("Save changes");
+        saveButton.click(save);
+        saveButton.html(save_button_text);
         editBar.append(saveButton);
       } else if(button_type == "rebuild") {
         var rebuildButton = $("<button>", {"id": "rebuildButton", "class": "ui-state-default ui-corner-all"});
-        rebuildButton.click(rebuildCollection);
-        rebuildButton.html("Rebuild");
+        rebuildButton.click(rebuildCurrentCollection);
+        rebuildButton.html(rebuild_button_text);
         editBar.append(rebuildButton);
       } else if (button_type == "saveandrebuild") {
         var saveAndRebuildButton = $("<button>", {"id": "saveAndRebuildButton", "class": "ui-state-default ui-corner-all"});
-        saveAndRebuildButton.click(save);
-        saveAndRebuildButton.html("Save and Rebuild");
+        saveAndRebuildButton.click(saveAndRebuild);
+        saveAndRebuildButton.html(save_and_rebuild_button_text);
         editBar.append(saveAndRebuildButton);
 
@@ -1242 +1246 @@
 }
 
-
-/* this is a cut down version of save() from documentmaker_scripts_util.js */
-function saveMetadataChanges() {
+// override the one in documentmaker_scripts_util
+// currently not used if other one is present. need to get the js include order right
+function enableSaveButtons(enabled) {
+  if (enabled) {
+    $("#saveButton, #rebuildButton, #saveAndRebuildButton").removeAttr("disabled");
+  } else {
+    $("#saveButton, #rebuildButton, #saveAndRebuildButton").attr("disabled", "disabled");
+  }
+}
+
+/* this is a cut down version of save() from documentmaker_scripts_util.js 
+ going back to using save, will delete this once everything working*/
+function saveMetadataChangesOld() {
 
   console.log("Saving metadata changes");
@@ -1337 +1351 @@
 
 
-function rebuildCollection() {
-
-  console.log("rebuilding collection");
-  var collection = gs.cgiParams.c;
-
-  var collectionsArray = new Array();
-  collectionsArray.push(collection);
-  buildCollections(collectionsArray);
-}
 
 /***************

main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

@@ -165 +165 @@
 }
 
+function enableSaveButtons(enabled) {
+  if (enabled) {
+    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+
+  } else {
+    $("#saveButton, #quickSaveButton").html(gs.text.dse.saving + "...");
+    $("#saveButton, #quickSaveButton").attr("disabled", "disabled");
+   
+  }
+}
 function addCollectionToBuild(collection)
 {
@@ -177 +188 @@
 }
 
-function save() 
+function save() {
+  saveAndRebuild(false);
+}
+
+function rebuildCurrentCollection() {
+
+  console.log("rebuilding collection");
+  enableSaveButtons(false);
+  var collection = gs.cgiParams.c;
+
+  var collectionsArray = new Array();
+  collectionsArray.push(collection);
+  buildCollections(collectionsArray);
+}
+
+function saveAndRebuild(rebuild) 
 {
 //This works in most cases but will not work when taking a doc from one collection to another, will need to be fixed at some point
@@ -218 +244 @@
                     alert(gs.text.dse.error_saving);
                 
-                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                    enableSaveButtons(true);
                     
                     if(_statusBar)
@@ -232 +257 @@
                     _statusBar.removeStatus(statusID);
                 }
-                buildCollections(_collectionsToBuild);
+                if (rebuild) {
+                  buildCollections(_collectionsToBuild);
+                } else {
+                  // reset the save button here
+                  enableSaveButtons(true);
+                }
             }
         }
@@ -238 +268 @@
         if(_collectionsToBuild.length > 0)
         {
-            $("#saveButton, #quickSaveButton").html(gs.text.dse.saving + "...");
-            $("#saveButton, #quickSaveButton").attr("disabled", "disabled");
+          enableSaveButtons(false);
 
             if(_statusBar)
@@ -369 +398 @@
     {
         console.log(gs.text.dse.empty_collection_list);
-        $("#saveButton, #quickSaveButton").html(gs.text.save_changes);
-        $("#saveButton, #quickSaveButton").removeAttr("disabled");
+        enableSaveButtons(true);
         return;
     }
@@ -415 +443 @@
                         _statusBar.removeStatus(statusID);
                     }
-                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                    enableSaveButtons(true);
                     
                     return;
@@ -444 +471 @@
                                     _statusBar.removeStatus(statusID);
                                 }
-                                $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                                $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                                enableSaveButtons(true);
                                 
                                 return;
@@ -477 +503 @@
                                         _statusBar.removeStatus(statusID);
                                     }
-                                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                                    enableSaveButtons(true);
                                 /*
                                 });
@@ -523 +548 @@
                         _statusBar.removeStatus(statusID);
                     }
-                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                    enableSaveButtons(true);
                     
                     return;
@@ -544 +568 @@
                         _statusBar.removeStatus(statusID);
                     }
-                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
-                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+                    enableSaveButtons(true);
                 }
                 else
@@ -873 +896 @@
     var saveButton = document.createElement("BUTTON");
     saveButton.innerHTML = gs.text.dse.save_changes;
-    saveButton.setAttribute("onclick", "save();");
+    saveButton.setAttribute("onclick", "saveAndRebuild();");
     saveButton.setAttribute("id", "saveButton");
     saveCell.appendChild(saveButton);