Changeset 11166

Timestamp:

2006-01-31T15:40:55+13:00 (18 years ago)

Author:

kjdon

Message:

collector buttons now use css. left them in a table, but used background colors instead of images

File:

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

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -728 +728 @@
 // will be hyperlinked
 
-text_t collectoraction::get_button (const text_t &thispage, const text_t &color, 
+text_t collectoraction::get_button(const text_t &thispage, const text_t &color, 
                     const text_t &type, bool enabled) {
 
@@ -735 +735 @@
     return g_EmptyText;
 
-  text_t prefix = "gc";
-  if (color == "grey") prefix = "nc";
-  else if (color == "yellow") prefix = "yc";
+  text_t href = "_http"+type+"_";
+  text_t target = "";
+  if (thispage == "info" || thispage == "srce" || thispage == "conf" || 
+      thispage == "bildcancel" || thispage == "bildfail") {
+    // call the check submit macro instead of linking directly to the page
+    href="\"javascript:check_submit('"+type+"');\"";
+  } else if (type == "view") {
+    // view button is special case as it needs a target=_top
+    target = " target=_top";
+  }
   
-  text_t httpicon = "httpicon" + prefix + type;
-  
+  text_t tdclass = "collectorbar"+color;
   if (enabled) {
-    text_t gsmacro = "_gsimage_";
-    if (thispage == "info" || thispage == "srce" || thispage == "conf" || 
-    thispage == "bildcancel" || thispage == "bildfail") {
-      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 + 
-      "of_,_collector:" + httpicon + "on_," + type + ",_collector:text" + type + "_)</td>\n";
-  } else {
-    return "<td>_icon" + prefix + type + "of_</td>\n";
-  }
-}
+    // link to the appropriate page
+    return "<td class="+tdclass+"><a href="+href+target+">_text"+type+"_</a></td>";
+  }
+  else {
+    // just display the text
+    return "<td class="+tdclass+">_text"+type+"_</td>";
+  }
+}
+
 
 // set the _fullnamemenu_ macro (and _warnindex_ and _selectedindex_ if
@@ -1064 +1065 @@
 
   // set the collectorbar macro
-  text_t collectorbar = "<table border=0 cellspacing=4 cellpadding=0><tr>\n";
+  text_t collectorbar = "<table class=collectorbar border=0 cellspacing=4 cellpadding=0><tr>\n";
 
   if (collector_page == "new") {