Changeset 12178

Timestamp:

2006-07-12T16:40:21+12:00 (18 years ago)

Author:

kjdon

Message:

changed the args for navtab, renamed the old navtab to navtaborig cos home, help, pref uses it, removed tabtextXXX macros which are no longer used

File:

• trunk/gsdl/macros/nav_css.dm (modified) (3 diffs)

trunk/gsdl/macros/nav_css.dm

@@ -15 +15 @@
 
 _globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink_}
-_homelink_ {_navtab_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
-_helplink_ {_navtab_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
-_preflink_ {_navtab_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
+_homelink_ {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
+_helplink_ {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
+_preflink_ {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
 
 # The following is useful if collection specific macro.  Override
@@ -39 +39 @@
 # 3. alt/title explanatory text
 # 4. optional "selected" or not if it is the current tab
-#_navtab_ {<span _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink"><a href="_1_" title="_3_">_2_</a>)</span>}
-_navtab_ {<a _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink" href="_1_" title="_3_">_2_)</a>}
+_navtaborig_ {<a _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink" href="_1_" title="_3_">_2_)</a>}
 
-# this is done like this because the receptionist checks if a macro called
-# _tabtext$FIELD_ is defined. This way we can make sure things are
-# undefined for nav_ns4.dm and it can fall back to using the roll-over images
-_tabtextSearch_ {_labelSearch_}
-_tabtextTitle_ {_labelTitle_}
-_tabtextCreator_ {_labelCreator_}
-_tabtextSubject_ {_labelSubject_}
-_tabtextDescription_ {_labelDescription_}
-_tabtextPublisher_ {_labelPublisher_}
-_tabtextContributor_ {_labelContributor_}
-_tabtextDate_ {_labelDate_}
-_tabtextTypes_ {_labelTypes_}
-_tabtextFormat_ {_labelFormat_}
-_tabtextIdentifier_ {_labelIdentifier_}
-_tabtextSource_ {_labelSource_}
-_tabtextLanguage_ {_labelLanguage_}
-_tabtextRelation_ {_labelRelation_}
-_tabtextCoverage_ {_labelCoverage_}
-_tabtextRights_ {_labelRights_}
-_tabtextOrg_ {_labelOrg_}
-_tabtextKeyword_ {_labelKeyword_}
-_tabtextHow_ {_labelHow_}
-_tabtextSeries_ {_labelSeries_}
-_tabtextList_ {_labelList_}
-_tabtextTo_ {_labelTo_}
-_tabtextFrom_ {_labelFrom_}
-_tabtextTopic_ {_labelTopic_}
-_tabtextBrwse_ {_labelBrwse_}
-_tabtextCollage_ {_labelCollage_}
-_tabtextbrows_ {_labelbrows_}
-_tabtextPeople_ {_labelPeople_}
-_tabtextAcronym_ {_labelAcronym_}
-_tabtextPhrase_ {_labelPhrase_}
-_tabtextArtist_ {_labelArtist_}
-_tabtextVolume_ {_labelVolume_}
-_tabtextCaptions_ {_labelCaptions_}
-_tabtextCountries_ {_labelCountries_}
+# parameters are
+# 1. The url to go to when clicked
+# 2. The metadata name - this gets used to determine the title and alt text
+# 3. optional "selected" if it is the current tab
+_navtab_ {<a _If_("_3_" eq "selected",class="navlink_sel">_navlinktitle_(_2_),class="navlink" href="_1_" title="_navlinkalt_(_2_)">_navlinktitle_(_2_))</a>}
 
 
@@ -92 +59 @@
 }
 
-# image macros for all the classifications currently supported by
-# this receptionist.
-
-## used to make the tabs in the navigation bar
-
 # cgiargu means "static page", so no search link should be shown
-_navtabsearch_ {_If_("_cgiargu_" ne "1",_navtabsearchlink_(_1_))}
-_navtabsearchlink_ {_navtab_(_httpquery_,_labelSearch_,_textdescrsearch_,_1_)}
-
+_navtabsearch_ {_If_("_cgiargu_" ne "1",_navtab_(_httpquery_,Search,_1_))}
 
 package about
+
 _imagethispage_ {_titleabout_}
 
 package query
+
 _imagethispage_ {_labelSearch_}