Changeset 28279 for main/trunk/greenstone3

Timestamp:

2013-09-13T11:15:19+12:00 (11 years ago)

Author:

sjm84

Message:

Added some status information when extracting a document

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (1 diff)
• transform/layouts/toc.xsl (modified) (1 diff)

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

@@ -483 +483 @@
     sectionString += "]";
     
-    var url = "cgi-bin/document-extract.pl?a=extract-archives-doc&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&json-sections=" + sectionString;// + "&json-metadata=[{"metaname":"dc.Title","metavalue":"All Black Rugy Success","metamode":"accumulate"]"
+    var url = "cgi-bin/document-extract.pl?a=extract-archives-doc&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&json-sections=" + sectionString + "&site=" + gs.xsltParams.site_name;// + "&json-metadata=[{"metaname":"dc.Title","metavalue":"All Black Rugy Success","metamode":"accumulate"]"
+    $("#extractDocButton").attr("disabled", "disabled").html("Exracting document...");
     $.ajax(url)
     .success(function(response)
     {
-        console.log(response);
+        $("#extractDocButton").html("Building collection...");
         gs.functions.buildCollections([gs.cgiParams.c], function()
         {
-            console.log("DONE BUILDING!");
+            $("#extractDocButton").removeAttr("disabled").html("Extract these pages to document");
         });
+    })
+    .error(function()
+    {
+        $("#extractDocButton").removeAttr("disabled").html("Extract these pages to document");
     });
 }

main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl

@@ -91 +91 @@
                                 </tr>
                                 <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'">
-                                    <tr><td><a href="javascript:extractFilteredPagesToOwnDocument();"><button>Extract these pages to document</button></a></td></tr>
+                                    <tr><td><a href="javascript:extractFilteredPagesToOwnDocument();"><button id="extractDocButton">Extract these pages to document</button></a></td></tr>
                                 </xsl:if>
                                 </tbody></table>