Changeset 2418

Timestamp:

2001-05-15T12:20:38+12:00 (23 years ago)

Author:

sjboddie

Message:

some more small changes to the collector interface

Location:

trunk/gsdl

Files:

• macros/collect.dm (modified) (2 diffs)
• src/recpt/collectoraction.cpp (modified) (5 diffs)

trunk/gsdl/macros/collect.dm

@@ -42 +42 @@
 
 _imagemore_ {<a href="javascript:more()" onMouseover="roll('more',1);" onMouseOut="roll('more',0);"><img
-name="more" src="_httpimg_/moreof.gif" onLoad="gbutton(this,'_httpimg_/moreon.gif');" border=0 alt="more"></a>}
+name="more" src="_httpimg_/moreof.gif" onLoad="gbutton(this,'_httpimg_/moreon.gif');" border=0 alt="more"
+align=top></a>}
 _imagemore_ [v=1] {more}
 
@@ -500 +501 @@
 _srcebadsources_ {
 <p>One or more of the input sources you specified is unavailable (marked
-&quot;X&quot; below).
+_iconcross_ below).
 
 <p>This might be because

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -228 +228 @@
   arg_ainfo.longname = "collector specific";
   arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
@@ -326 +327 @@
       current_page != "bildframe1" && current_page != "new") {
     // update arguments that were saved to the harddrive
-    enum source_t {default_arg, compressed_arg, cgi_arg, program_arg};
     text_tmap saved_args;
     saved_args["bc1fullname"] = "";
@@ -342 +342 @@
     text_tmap::iterator end = saved_args.end();
     while (here != end) {
-      if (args.lookupcgiarg((*here).first).source != default_arg) {
+      if (args.lookupcgiarg((*here).first).source != cgiarg_t::default_arg) {
     (*here).second = args[(*here).first];
       }
@@ -921 +921 @@
     }
     if (i+1 == numboxes) {
-      rv += "_imagemore_</nobr>";
+      if (!badsources) rv += "_iconblank_";
+      rv += "_imagemore_</nobr><br>";
     } else {
-      rv += "</nobr>\n";
+      rv += "</nobr><br>\n";
     }
   }
@@ -1853 +1854 @@
   // this relies on filenames/URLs not being able to contain
   // commas
+  char *tmp = args["bc1input"].getcstr();
   splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);