Changeset 11156

Timestamp:

2006-01-30T12:24:06+13:00 (18 years ago)

Author:

jrm21

Message:

moved _imagethispage_ definitions into the nav_css/nav_ns4 macro files
so we can switch between text titles and image titles.

Location:

trunk/gsdl/macros

Files:

• about.dm (modified) (1 diff)
• nav_css.dm (modified) (1 diff)
• query.dm (modified) (1 diff)
• style.dm (modified) (2 diffs)

trunk/gsdl/macros/about.dm

@@ -6 +6 @@
 #######################################################################
 
-_imagethispage_ {_titleabout_}
+# _imagethispage_ set in nav_css/nav_ns4 macro files
 
 # don't want link to 'about' page

trunk/gsdl/macros/nav_css.dm

@@ -105 +105 @@
 _navtabsearchlink_ {_navtab_(_httpquery_,_labelSearch_,_textdescrsearch_,_1_)}
 
+
+package about
+_imagethispage_ {_titleabout_}
+
+package query
+_imagethispage {_labelSearch_}
+
+
 package Style
 
 _imagescript_ {}
+
+_bannertitle_ {_If_(_imagethispage_,<p class="bannertitle">_imagethispage_</p>)}
 
 package home

trunk/gsdl/macros/query.dm

@@ -55 +55 @@
 #######################################################################
 
-_imagethispage_ {_labelSearch_}
+# _imagethispage_ set in nav_css/nav_ns4 macro files
 
 #the buttons for the search history entries

trunk/gsdl/macros/style.dm

@@ -100 +100 @@
 }
 
-
+# _bannertitle_ is defined in nav_css/ns4.dm, and is either text or
+# a banner image
 _pagebanner_ {
 <!-- page banner (\_style:pagebanner\_) -->
@@ -106 +107 @@
 <div class="pageinfo"> 
 <p class="bannerlinks">_globallinks_</p>
-_If_(_imagethispage_,<p class="bannerimage">_imagethispage_</p>)
+_bannertitle_
 </div>
 <div class="collectimage">_imagecollection_</div>