Changeset 23067

Timestamp:

2010-10-09T17:55:49+13:00 (14 years ago)

Author:

davidb

Message:

Moved talkback upload monitor to be embedded within main content page

File:

• main/trunk/greenstone2/macros/talkback.dm (modified) (6 diffs)

main/trunk/greenstone2/macros/talkback.dm

@@ -10 +10 @@
 _talkfromLibrary_        {_talkfromcgi_/library.cgi}
 _talkfromUploadSimulate_ {_talkfromcgi_/upload-sim.pl}
+_talkfromUploadProgress_ {_talkfromcgi_/upload-pb.pl}
 
 _talktoLibrary_ {_talktocgi_/library.cgi}
@@ -33 +34 @@
      \{
          var uploadForm = document.uploadForm;
-     // uploadForm.oid.value = oid;
+         uploadForm.oid.value = oid;
          uploadForm.submit();
      \}
@@ -40 +41 @@
 
 _monitorUpload_ {
+
+<center>
+  <div style="width: 800px;">
     <iframe frameborder="0" width="600" height="80"
-      src="_talktoUpload_?rand\_string=_randString_">
+      src="_talkfromUploadProgress_?rand\_string=_randString_">
+    </iframe>
+  </div>
+</center>
 
-    </iframe>
+
 }
 
@@ -57 +64 @@
 
 <div style="min-height: 500px;">
-  <div style="width: 47%; height: 100%; float: left; margin-left: 1px">
+  <div style="width: 49%; height: 100%; float: left; margin-left: 1px">
 
     <iframe width="100%" height="500" frameborder="0"
@@ -66 +73 @@
   </div>
 
-  <div style="float: right; width: 51%; height: 100%; margin-right: 1px;">
+  <div style="float: right; width: 49%; height: 100%; margin-right: 1px;">
     <iframe width="100%" height="500" frameborder="0"
     src="_talktoLibrary_?a=p&p=about&c=5-showcase/talkback&talkback=1">
@@ -77 +84 @@
 
 
-<center>
-  <div style="width: 800px;">
-    _monitorUpload_
-  </div>
-</center>
-
 }
 
+#    _monitorUpload_