Changeset 19029 for documented-example-collections/trunk/garish-e/macros

Timestamp:

2009-04-17T11:00:54+12:00 (15 years ago)

Author:

kjdon

Message:

updated extra.dm and collect.cfg for current macros, matching extra and the description, changing paths to work with the collection inside a collect group

File:

• documented-example-collections/trunk/garish-e/macros/extra.dm (modified) (10 diffs)

documented-example-collections/trunk/garish-e/macros/extra.dm

@@ -40 +40 @@
 ## macros can have optional parameters, that make them more specific.
 ## For example, you could have _macro_ {general case} as well as
-## _macro_ [c=garish] {For garish only} for when the "c" argument (which means
-## the collection) is set to "garish". Or _macro_ [l=fr] {french case} for 
+## _macro_ [c=garish-e] {For garish-e collection only} for when the 
+# "c" argument (which means the collection) is set to "garish-e". 
+## Or _macro_ [l=fr] {french case} for 
 ## when the language is set to French. This is how we cope with different 
 ## language interfaces.
 
 ## Collection specific macros put into the main macro files must have a 
-## collection parameter ([c=garish]), otherwise they will apply to all 
+## collection parameter ([c=garish-e]), otherwise they will apply to all 
 ## collections. Macros in a collection's extra.dm do not need this parameter.
 
@@ -56 +57 @@
 ## help see the effect of changes of these macros.
 
-## _httpcimg_ is a macro that expands to the images directory of the current 
-## collection. Any collection images or stylesheets should be put there. 
+## _httpcimages_ is a macro that expands to the images directory of the 
+## current collection. Any collection images or stylesheets should be put 
+## there. 
 
 ## The macros below modify the appearance of a specific greenstone collection.
@@ -67 +69 @@
 ## here as a demonstration.
 ##
-## Edit the file images/garish/style.css to change the colours and fonts.
+## Edit the file images/garish-e/style.css to change the colours and fonts.
 
 
@@ -76 +78 @@
 ## of these macros are in the file base.dm (and in the language-specific
 ## macro files such as english.dm and french.dm)
-
 
 ## These 2 macros are used for highlighting text that matched a query when
@@ -138 +139 @@
 #}
 
-#To keep most of the standard greenstone style, and just override a few style declarations, we can define _collectionspecificstyle_, which is included in the default _cssheader_ macro. The title of a stylesheet link must be 'Greenstone Style', in order for it to be used in conjunction with the main stylesheet.
-
-# Here we include the garish collection's stylesheet, which defines the page color to pink.
-We also remove the background image for the page to get rid of the green swirly bar, and specify a new (blue) background image for hover (mouse over) on the navigation bar buttons 
+## To keep most of the standard greenstone style, and just override a few 
+## style declarations, we can define _collectionspecificstyle_, which is 
+## included in the default _cssheader_ macro. The title of a stylesheet 
+## link must be 'Greenstone Style', in order for it to be used in 
+## conjunction with the main stylesheet.
+
+## Here we include the garish-e collection's stylesheet, which defines the 
+## page color to pink.
+## We also remove the background image for the page to get rid of the green 
+## swirly bar, and specify a new (blue) background image for hover 
+## (mouse over) on the navigation bar buttons 
 
 _collectionspecificstyle_ {
@@ -148 +156 @@
 <style>
 body.bgimage \{ background-image: none; \}
-span.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
+a.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
 </style>
 
@@ -165 +173 @@
 ## Just leave in the home button
 _pagebanner_  {
+<div id="banner">
 <div class="pageinfo"> 
 <p class="bannerlinks">_homelink_</p>
+</div>
 </div>
 }
@@ -188 +198 @@
 <!-- start of custom about:content -->
 _navigationbar_
+<div class="document">
 _textabout_
 
+<div class="section">
 <h3>_help:textsimplehelpheading_</h3>
 _help:simplehelp_
-
+</div>
+</div>
 <!-- end of custom about:content -->
 }
@@ -205 +218 @@
 
 ## This is similar to the default, except we don't centre the _navigationbar_
-## and we've removed the green bars and search history
+## and we've removed one of the green bars
 _content_  {
 <!-- start of custom query:content -->
 _navigationbar_
 
+<div class="document">
+<div class="queryform">
 <center>
 _If_(_cgiargct_,_selectqueryform_,_queryform_)
 </center>
-_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br>
+</div>
+_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br />
 <center>
 _searchhistorylist_
 </center>)
-_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br>_resultline_,)
-<br>
+_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br />_resultline_,)
+<br />
 <!-- end of custom query:content -->
 }
@@ -252 +268 @@
 <!-- start of custom document:content -->
 _navigationbar_
-<p>
-<center>
+
+_If_(_phindclassifier__collageclassifier_,
+<p style="text-align: center;">
 _phindclassifier_
 _collageclassifier_
-</center>
+</p>
+)
+
+_If_("_cgiargcl_" eq "search",
+<ul id="searchresults">
+_prevsearchresult_
+_nextsearchresult_
+</ul>)
+
+<div class="document">
 <!-- end of custom document:content -->
 }