Changeset 1449 for trunk/gsdl/src/recpt

Timestamp:

2000-08-25T16:09:25+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

File:

• trunk/gsdl/src/recpt/collectoraction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -240 +240 @@
   text_t &current_page = args["cp"];
 
-  if (current_page != "intro") {
+  if (current_page != "intro" && current_page != "bildstatus") {
     // authenticate the user if authentication is available
     args["uan"] = 1;
@@ -499 +499 @@
     if (thispage == "info" || thispage == "srce" || thispage == "conf") {
       gsmacro = "_gsjimage_";
+    } else if (type == "view") {
+      // view button is special case as it needs a target=_top
+      gsmacro = "_gstimage_";
     }
     return "<td>" + gsmacro + "(_collector:http" + type + "_,_collector:" + httpicon + 
@@ -645 +648 @@
     statusline += file_tail (bld_file + ".import");
   } else if (file_exists (bld_file + ".build")) {
-    statusline = "Building collection ...";
+    statusline = "Building collection ...<br>";
     statusline += file_tail (bld_file + ".build");
   } else {
@@ -674 +677 @@
   disp.setmacro ("pagescriptextra", "collector", "_" + collector_page + "scriptextra_");
 
-  if (collector_page == "bildstatus") {
+  if (collector_page == "bildstatus" || collector_page == "bilddone" || collector_page == "bildfail") {
     disp.setmacro ("header", "collector", "_" + collector_page + "header_");
   }
@@ -744 +747 @@
     collectorbar += "</tr><tr><td colspan=4></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";
 
-  } else if (collector_page == "bild") {
-
-
+  } else if (collector_page == "bilddone") {
+    // all previous buttons grey after build was completed
+    collectorbar += get_button (collector_page, "grey", "info", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "grey", "srce", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "grey", "conf", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "yellow", "bild", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "green", "view", true);
+    collectorbar += "</tr><tr><td colspan=6></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n";
   }
 
@@ -769 +781 @@
 
   if (collector_page == "bild") {
+
+    // don't want header and stuff for build page as it uses frames
+    textout << outconvert << disp << ("_collector:bildcontent_\n");
+
     // do the work (download, import, build)
     text_t tmpdir = filename_cat (gsdlhome, "tmp", collection + ".bld");
@@ -801 +817 @@
 #endif
     delete build_cmdc;
-
-    // don't want header and stuff for build page as it uses frames
-    textout << outconvert << disp << ("_collector:bildcontent_\n");
 
   } else {