Changeset 11152 for trunk/gsdl

Timestamp:

2006-01-27T17:15:18+13:00 (18 years ago)

Author:

jrm21

Message:

we now use the page title where the banner image used to be... this means
we can now remove all the images for "about" "titles a-z" etc that were
shown on the top right hand side.

Location:

trunk/gsdl

Files:

• images/style.css (modified) (2 diffs)
• src/recpt/documentaction.cpp (modified) (1 diff)

trunk/gsdl/images/style.css

@@ -40 +40 @@
 /* home, help, preferences links */
 p.bannerlinks {
-  font-family: arial;
+  font-family: sans-serif, arial, helvetica;
   font-size: 10pt;
   font-weight: bold;
 }
 /* the image based on the page action */
-p.bannerimage {}
+p.bannerimage {
+    font-family: sans-serif, arial, helvetica;
+    font-size: 24px;
+    font-weight: bold;
+    padding-top: 4px;
+    padding-right: 4px;
+    padding-bottom: 10px;
+    margin-left: 40px;
+    text-transform: lowercase;
+    background: #96c19b;
+    width: 40px;
+    text-align: right;
+}
 /* the image for the collection, shown in the banner */
 div.collectimage {
@@ -63 +75 @@
   min-width: 500px;
   white-space: nowrap;
-  font-family: arial;
+  font-family: sans-serif, arial, helvetica;
   font-size: 10pt;
   font-weight: bold;

trunk/gsdl/src/recpt/documentaction.cpp

@@ -882 +882 @@
     bool unknown = false;
 
-    // test the _iconXXXpage_ macro to see if image macros are
-    // defined for this type of classification - if not we'll
-    // just display the text
+    // test if we have macros defined for this classification's
+    // metadata name - if not we'll just display the name
     text_t tmp;
-    text_t macroname="_icon" + title + "page_";
-    disp.expandstring ("document", macroname, tmp);
+    text_t macroname="_label" + title + "_";
+    disp.expandstring ("Global", macroname, tmp);
     if (tmp == macroname) unknown = true; // it wasn't expanded
 
     if (unknown) {
       disp.setmacro ("pagetitle", "document", title);
-      disp.setmacro ("imagethispage", "document", "<h2>" + title + "</h2>");
+      disp.setmacro ("imagethispage", "document", title);
     } else {
-      disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
-      disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
+      disp.setmacro ("pagetitle", "document", macroname);
+      disp.setmacro ("imagethispage", "document", macroname);
     }