Changeset 11152

Show
Ignore:
Timestamp:
27.01.2006 17:15:18 (14 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:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/images/style.css

    r11146 r11152  
    4040/* home, help, preferences links */ 
    4141p.bannerlinks { 
    42   font-family: arial; 
     42  font-family: sans-serif, arial, helvetica; 
    4343  font-size: 10pt; 
    4444  font-weight: bold; 
    4545} 
    4646/* the image based on the page action */ 
    47 p.bannerimage {} 
     47p.bannerimage { 
     48    font-family: sans-serif, arial, helvetica; 
     49    font-size: 24px; 
     50    font-weight: bold; 
     51    padding-top: 4px; 
     52    padding-right: 4px; 
     53    padding-bottom: 10px; 
     54    margin-left: 40px; 
     55    text-transform: lowercase; 
     56    background: #96c19b; 
     57    width: 40px; 
     58    text-align: right; 
     59} 
    4860/* the image for the collection, shown in the banner */ 
    4961div.collectimage { 
     
    6375  min-width: 500px; 
    6476  white-space: nowrap; 
    65   font-family: arial; 
     77  font-family: sans-serif, arial, helvetica; 
    6678  font-size: 10pt; 
    6779  font-weight: bold; 
  • trunk/gsdl/src/recpt/documentaction.cpp

    r11144 r11152  
    882882    bool unknown = false; 
    883883 
    884     // test the _iconXXXpage_ macro to see if image macros are 
    885     // defined for this type of classification - if not we'll 
    886     // just display the text 
     884    // test if we have macros defined for this classification's 
     885    // metadata name - if not we'll just display the name 
    887886    text_t tmp; 
    888     text_t macroname="_icon" + title + "page_"; 
    889     disp.expandstring ("document", macroname, tmp); 
     887    text_t macroname="_label" + title + "_"; 
     888    disp.expandstring ("Global", macroname, tmp); 
    890889    if (tmp == macroname) unknown = true; // it wasn't expanded 
    891890 
    892891    if (unknown) { 
    893892      disp.setmacro ("pagetitle", "document", title); 
    894       disp.setmacro ("imagethispage", "document", "<h2>" + title + "</h2>"); 
     893      disp.setmacro ("imagethispage", "document", title); 
    895894    } else { 
    896       disp.setmacro ("pagetitle", "document", "_text" + title + "page_"); 
    897       disp.setmacro ("imagethispage", "document", "_icon" + title + "page_"); 
     895      disp.setmacro ("pagetitle", "document", macroname); 
     896      disp.setmacro ("imagethispage", "document", macroname); 
    898897    } 
    899898