Changeset 12175

Timestamp:

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

Author:

kjdon

Message:

removed navtabXXX macros which weren't used. tidied up some comments, and added navlinktitle and navlinkalt macros

File:

• trunk/gsdl/macros/base.dm (modified) (2 diffs)

trunk/gsdl/macros/base.dm

@@ -65 +65 @@
 # _win32_ will be set to 1 if we're on windows
 _win32_ {}
-
-_navigationbar_ {}
-_widthtspace_ {2}
-
-# The following is useful if collection specific macro.  Override
-# _optnavigationbar_ to be empty if you don't want the navigation bar to
-# appear in the standard place, and then specify _navigationbar_ elsewhere
-# in a collection specific macro file(s) to be where you do want it.
-
-# _optnavigationbar_ is now defined in nav_css/nav_ns4 macro files
 
 # all cgi args are set as _cgiargX_ macros - those I've put here 
@@ -91 +81 @@
 _fqfselection_ {}
 
-# this is used for the tabs (eg for search/classifiers) on the navigation bar
-# parameters are:
-# 1. the url to go to when clicked
-# 2. the name of the tab
-# 3. alt/title explanatory text
-# 4. optional "selected" or not if it is the current tab
-
-# _navtab_ is defined in the nav_css/nav_ns4 macro files
-
-
-#######################################################################
-# navigation bar images
-#
-#######################################################################
-
-# the spacer image - the width of this is calculated and set from server
-# _navbarspacer_ set in nav_css/ns4
-
-# image macros for all the classifications currently supported by
-# this receptionist.
-
-## used to make the tabs in the navigation bar
-
-# _navtabsearch_ defined in nav_css/ns4 macro files
-
-# Dublin Core Metadata Element Set, Version 1.1
-
-_navtabTitle_ {_navtab_(_httpbrowseTitle_,titles,_textdescrTitle_,_1_)}
-_navtabCreator_ {_navtab_(_httpbrowseCreator_,creators,_textdescrCreator_,_1_)}
-_navtabSubject_ {_navtab_(_httpbrowseSubject_,_labelSubject_,_textdescrSubject_,_1_)}
-_navtabDescription_ {_navtab_(_httpbrowseDescription_,,_1_)}
-_navtabPublisher_ {_navtab_(_httpbrowsePublisher_,tabtepublishers,_textdescrPublisher_,_1_)}
-_navtabContributor_ {_navtab_(_httpbrowseContributor_,_labelContributor_,_textdescrContributor_,_1_)}
-_navtabDate_ {_navtab_(_httpbrowseDate_,_labelDate_,_textdescrDate_,_1_)}
-_navtabType_ {_navtab_(_httpbrowseType_,types,_textdescrType_,_1_)}
-_navtabFormat_ {_navtab_(_httpbrowseFormat_,formats,_textdescrFormat_,_1_)}
-_navtabIdentifier_ {_navtab_(_httpbrowseIdentifier_,identifiers,_textdescrIdentifier_,_1_)}
-_navtabSource_ {_navtab_(_httpbrowseSource_,source,_textdescrSource_,_1_)}
-_navtabLanguage_ {_navtab_(_httpbrowseLanguage_,language,_textdescrLanguage_,_1_)}
-_navtabRelation_ {_navtab_(_httpbrowseRelation_,,_1_)}
-_navtabCoverage_ {_navtab_(_httpbrowseCoverage_,coverage,_textdescrCoverage_,_1_)}
-_navtabRights_ {_navtab_(_httpbrowseRights_,rights,_textdescrRights_,_1_)}
-
-_navtabSeries_ {_navtab_(_httpbrowseSeries_,series,_textdescrSeries_,_1_)}
-_navtabTo_ {_navtab_(_httpbrowseTo_,to,_textdescrTo_,_1_)}
-_navtabFrom_ {_navtab_(_httpbrowseFrom_,from,_textdescrFrom_,_1_)}
-_navtabOrganization_ {_navtab_(_httpbrowseOrganization_,,_1_)}
-_navtabHowto_ {_navtab_(_httpbrowseHowto_,how,_textdescrHowto_,_1_)}
-_navtabTopic_ {_navtab_(_httpbrowseTopic_,topic,_textdescrTopic_,_1_)}
-_navtabBrowse_ {_navtab_(_httpbrowseBrowse_,browse,_textdescrBrowse_}
-_navtabPeople_ {_navtab_(_httpbrowsePeople_,people,_textdescrPeople_,_1_)}
-_navtabAcronym_ {_navtab_(_httpbrowseAcronym_,acronym,_textdescrAcronym_,_1_)}
-_navtabCollage_ {_navtab_(_httpbrowseCollage_,collage,_textdescrCollage_,_1_)}
-_navtabPhrase_ {_navtab_(_httpbrowsePhrase_,phrase,_textdescrPhrase_,_1_)}
-_navtabArtist_ {_navtab_(_httpbrowseArtist_,artist,_textdescrArtist_,_1_)}
-_navtabKeyword_ {_navtab_(_httpbrowseKeyword_,kw,_textdescrKeyword_,_1_)}
-_navtabVolume_ {_navtab_(_httpbrowseVolume_,volume,_textdescrVolume_,_1_)}
-_navtabCaptions_ {_navtab_(_httpbrowseCaptions_,captions,_textdescrCaptions_,_1_)}
-_navtabCountries_ {_navtab_(_httpbrowseCountries_,countries,_textdescrCountries_,_1_)}
+
+#######################################################################
+# navigation bar 
+#
+#######################################################################
+# Most of the stuff to do with navigation bars is now defined in nav_css.dm 
+# and nav_ns4.dm
+
+_navigationbar_ {}
+_widthtspace_ {2}
+
+_navlinktitle_ {_If_("_label_1__" eq "\_label_1_\_",_1_,_label_1__)}
+_navlinkalt_ {_If_("_textdescr_1__" ne "\_textdescr_1_\_", _textdescr_1__, _If_("_text_1__" eq "\_text_1_\_",_textdescrdefault_(_1_),_textdescrdefault_(_text_1__)) }
 
 #######################################################################