Changeset 23523 for main/branches/64_bit_Greenstone/greenstone2/macros/talkback.dm

Timestamp:

2011-01-05T09:18:04+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest trunk changes into this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• macros/talkback.dm (modified) (3 diffs)

main/branches/64_bit_Greenstone/greenstone2/macros/talkback.dm

@@ +1 @@
+package Global
+
+# Currently nothing in talkbackscript
+_talkbackscript_ {
+}
+
+
 package talkback
 
-# The following values are typically set in <gsdlhome>/macro/extra.dm
-_talkfromcgi_ {}
-_talktocgi_   {}
+# The following values are typically set in <gsdlhome>/macro/zextra.dm
+# They are left commented out here so the error log does not get swamped
+# with 'redefined' warning
+#_talkfromcgi_ {}
+#_talktocgi_   {}
 
 _talktoCollect_   {}
@@ -14 +23 @@
 _talktoLibrary_ {_talktocgi_/library.cgi}
 _talktoUpload_  {_talktocgi_/talkback-progressbar.pl}
+
 
 
@@ -31 +41 @@
     </form>
 
+    <div id="talktoProgressBar" style="display: block;">
+      <iframe style="float: top;" width="600" height="100" frameborder="0" 
+         src="_talktoUpload_">
+      </iframe>
+    </div>
+
+
    <script type="text/javascript">
+
+
+     function talktoProgressBarHide(oid)
+     \{
+
+         var ttpb = document.getElementById("talktoProgressBar");
+     ttpb.style.display = "none";
+     \}
+
      
      function talkbackUploadSubmit(oid)
      \{
+         var ttpb = document.getElementById("talktoProgressBar");
+     ttpb.style.display = "block";
+
+     //if (window.addEventListener) \{
+     //    window.addEventListener('beforeunload',talktoProgressBarHide,true);
+         //\}
+     //else \{
+     //    window.attachEvent('onbeforeunload',talktoProgressBarHide);
+     //\}
+
+     //alert("away to submit");
+
          var uploadForm = document.uploadForm;
          uploadForm.oid.value = oid;