Changeset 23067


Ignore:
Timestamp:
10/09/10 17:55:49 (10 years ago)
Author:
davidb
Message:

Moved talkback upload monitor to be embedded within main content page

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/macros/talkback.dm

    r23059 r23067  
    1010_talkfromLibrary_        {_talkfromcgi_/library.cgi}
    1111_talkfromUploadSimulate_ {_talkfromcgi_/upload-sim.pl}
     12_talkfromUploadProgress_ {_talkfromcgi_/upload-pb.pl}
    1213
    1314_talktoLibrary_ {_talktocgi_/library.cgi}
     
    3334     \{
    3435         var uploadForm = document.uploadForm;
    35      // uploadForm.oid.value = oid;
     36        uploadForm.oid.value = oid;
    3637         uploadForm.submit();
    3738     \}
     
    4041
    4142_monitorUpload_ {
     43
     44<center>
     45  <div style="width: 800px;">
    4246    <iframe frameborder="0" width="600" height="80"
    43       src="_talktoUpload_?rand\_string=_randString_">
     47      src="_talkfromUploadProgress_?rand\_string=_randString_">
     48    </iframe>
     49  </div>
     50</center>
    4451
    45     </iframe>
     52
    4653}
    4754
     
    5764
    5865<div style="min-height: 500px;">
    59   <div style="width: 47%; height: 100%; float: left; margin-left: 1px">
     66  <div style="width: 49%; height: 100%; float: left; margin-left: 1px">
    6067
    6168    <iframe width="100%" height="500" frameborder="0"
     
    6673  </div>
    6774
    68   <div style="float: right; width: 51%; height: 100%; margin-right: 1px;">
     75  <div style="float: right; width: 49%; height: 100%; margin-right: 1px;">
    6976    <iframe width="100%" height="500" frameborder="0"
    7077    src="_talktoLibrary_?a=p&p=about&c=5-showcase/talkback&talkback=1">
     
    7784
    7885
    79 <center>
    80   <div style="width: 800px;">
    81     _monitorUpload_
    82   </div>
    83 </center>
    84 
    8586}
    8687
     88#    _monitorUpload_
Note: See TracChangeset for help on using the changeset viewer.