Changeset 1449


Ignore:
Timestamp:
2000-08-25T16:09:25+12:00 (24 years ago)
Author:
sjboddie
Message:

* empty log message *

Location:
trunk/gsdl
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/macros/base.dm

    r1444 r1449  
    194194_httppagex_ {_gwcgi_?e=_compressedoptions_&a=p&p=_1_}
    195195_httppagestatus_ {_gwcgi_?e=_compressedoptions_&a=status}
     196_httppagecollector_ {_gwcgi_?a=collector}
    196197_httppageabout_ {_httppagex_(about)}
    197198#_httppagehome_ {_httppagex_(home)}

  • trunk/gsdl/macros/collect.dm

    r1438 r1449  
    11package collector
    22
    3 _imagethispage_ {_iconhcolect_}
     3_imagethispage_ {<a href="_httppagecollector_">_iconhcolect_</a>}
    44
    55# _pagescriptextra_ will be set to the appropriate _***scriptextra_
    … …  
    1111_gsjimage_ {<a href="javascript:check\_submit('_4_');" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);"><img
    1212name="_4_" src="_2_" onLoad="gbutton(this,'_3_');" border=0 alt="_5_"></a>}
    13 
    14 _gsjimage_ [v=1] {<a href="#" onClick="check\_submit(_4_);">_5_</a><br>}
     13_gsjimage_ [v=1] {<a href="javascript:check\_submit('_4_');">_5_</a><br>}
     14
     15# _gstimage_ is also similar to _gsimage_ but is used where buttons occur in a sub-frame and
     16# require target=_top
     17_gstimage_ {<a href="_1_" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);" target="\_top"><img
     18name="_4_" src="_2_" onLoad="gbutton(this,'_3_');" border=0 alt="_5_"></a>}
     19_gstimage_ [v=1] {<a href="_1_" target="\_top">_5_</a><br>}
     20
    1521
    1622
    … …  
    2228# icons
    2329
    24 _iconhcolect_ {<img src="_httpimg_/h_colect.gif" alt="the collector">}
     30_iconhcolect_ {<img src="_httpimg_/h_colect.gif" alt="the collector" border=0>}
    2531_icongreyarrow_ {<img src="_httpimg_/grarrow.gif">}
    2632_icongreyuparrow_ {<img src="_httpimg_/guarrow.gif">}
    … …  
    7379_httpconf_ {_gwcgi_?e=_compressedoptions_&cp=conf}
    7480_httpbild_ {_gwcgi_?e=_compressedoptions_&cp=bild}
    75 _httpview_ {_gwcgi_?e=_compressedoptions_&cp=view}
     81_httpview_ {_gwcgi_?e=_compressedoptions_&a=p&p=about&c=_cgiargbc1dirname_}
    7682_httpdel_  {javascript:do_delete();}
    7783
    … …  
    131137There are social issues:  collections should respect the customs of the
    132138community out of which the documents arise.
    133 And there are ethical issues.
    134 Be sensitive to the power of information and use it wisely.
     139And there are ethical issues: some things simply should not be made
     140available to others.
     141<br>Be sensitive to the power of information and use it wisely.
    135142</i>
    136143</center>
    … …  
    603610
    604611_bildcontent_ {
     612<html>
    605613<frameset rows="*,150" border=0>
    606614  <noframes><body bgcolor="#ffffff">
    … …  
    611619  <frame src="_gwcgi_?e=_compressedoptions_&cp=bildstatus">
    612620</frameset>
     621</html>
    613622}
    614623
    … …  
    662671<tr><td>
    663672_statusline_
     673</td></tr>
     674</table></center>
     675</form>
     676}
     677
     678_bilddoneheader_ {_cgihead_
     679_htmlhead_(background="_httpiconchalk_")_startspacer_
     680}
     681_bilddonescriptextra_ {}
     682_bilddonecontent_ {
     683<form name="collectorform" method=post action="_gwcgi_">
     684<input type=hidden name="e" value="_decodedcompressedoptions_">
     685<center>
     686<table width=_pagewidth_>
     687<tr><td>
     688<p>Collection built successfully.
     689
     690<p><center>
     691_collectorbar_
     692</center>
     693
     694</td></tr>
     695</table></center>
     696</form>
     697}
     698
     699_bildfailheader_ {_cgihead_
     700_htmlhead_(background="_httpiconchalk_")_startspacer_
     701}
     702_bildfailscriptextra_ {}
     703_bildfailcontent_ {
     704<form name="collectorform" method=post action="_gwcgi_">
     705<input type=hidden name="e" value="_decodedcompressedoptions_">
     706<center>
     707<table width=_pagewidth_>
     708<tr><td>
     709<p>An error has occurred while attempting to build your collection.
    664710</td></tr>
    665711</table></center>

  • trunk/gsdl/src/recpt/collectoraction.cpp

    r1438 r1449  
    240240  text_t &current_page = args["cp"];
    241241
    242   if (current_page != "intro") {
     242  if (current_page != "intro" && current_page != "bildstatus") {
    243243    // authenticate the user if authentication is available
    244244    args["uan"] = 1;
    … …  
    499499    if (thispage == "info" || thispage == "srce" || thispage == "conf") {
    500500      gsmacro = "_gsjimage_";
     501    } else if (type == "view") {
     502      // view button is special case as it needs a target=_top
     503      gsmacro = "_gstimage_";
    501504    }
    502505    return "<td>" + gsmacro + "(_collector:http" + type + "_,_collector:" + httpicon +
    … …  
    645648    statusline += file_tail (bld_file + ".import");
    646649  } else if (file_exists (bld_file + ".build")) {
    647     statusline = "Building collection ...";
     650    statusline = "Building collection ...<br>";
    648651    statusline += file_tail (bld_file + ".build");
    649652  } else {
    … …  
    674677  disp.setmacro ("pagescriptextra", "collector", "_" + collector_page + "scriptextra_");
    675678
    676   if (collector_page == "bildstatus") {
     679  if (collector_page == "bildstatus" || collector_page == "bilddone" || collector_page == "bildfail") {
    677680    disp.setmacro ("header", "collector", "_" + collector_page + "header_");
    678681  }
    … …  
    744747    collectorbar += "</tr><tr><td colspan=4></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";
    745748
    746   } else if (collector_page == "bild") {
    747 
    748 
     749  } else if (collector_page == "bilddone") {
     750    // all previous buttons grey after build was completed
     751    collectorbar += get_button (collector_page, "grey", "info", false);
     752    collectorbar += "<td>_icongreyarrow_</td>\n";
     753    collectorbar += get_button (collector_page, "grey", "srce", false);
     754    collectorbar += "<td>_icongreyarrow_</td>\n";
     755    collectorbar += get_button (collector_page, "grey", "conf", false);
     756    collectorbar += "<td>_icongreyarrow_</td>\n";
     757    collectorbar += get_button (collector_page, "yellow", "bild", false);
     758    collectorbar += "<td>_icongreyarrow_</td>\n";
     759    collectorbar += get_button (collector_page, "green", "view", true);
     760    collectorbar += "</tr><tr><td colspan=6></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n";
    749761  }
    750762
    … …  
    769781
    770782  if (collector_page == "bild") {
     783
     784    // don't want header and stuff for build page as it uses frames
     785    textout << outconvert << disp << ("_collector:bildcontent_\n");
     786
    771787    // do the work (download, import, build)
    772788    text_t tmpdir = filename_cat (gsdlhome, "tmp", collection + ".bld");
    … …  
    801817#endif
    802818    delete build_cmdc;
    803 
    804     // don't want header and stuff for build page as it uses frames
    805     textout << outconvert << disp << ("_collector:bildcontent_\n");
    806819
    807820  } else {
Note: See TracChangeset for help on using the changeset viewer.