Changeset 12177

Timestamp:

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

Author:

kjdon

Message:

navtab arguments have changed, and now use navlinkalt(xxx) instead of textdescrXXX for imageXXX alt parts

File:

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

trunk/gsdl/macros/nav_ns4.dm

@@ -39 +39 @@
 # I'm surprised _image_2__ works... but it does. _imageTitle_ _imageCreator_ etc
 # 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_ {_If_("_image_2__" eq "\_image_2_\_",_If_("_4_" eq "selected",_2_,<a href="_1_" title="_3_">_2_</a>),_If_("_4_" eq "selected",_image_2_green_,_image_2__))}
+# 2. The metadata name - this gets used to determine the title and alt text
+# 3. optional "selected" if it is the current tab
+_navtab_ {_If_("_image_2__" eq "\_image_2_\_",_If_("_3_" eq "selected",_navlinktitle_(_2_),<a href="_1_" title="_navlinkalt_(_2_)">_navlinktitle_(_2_)</a>),_If_("_3_" eq "selected",_image_2_green_,_image_2__))}
 # doesn't yet work for metadata that isn't dublin core... !!!
 
@@ -62 +61 @@
 
 _imagesearch_ {_If_("_cgiargu_" ne "1",_imagesearch2_,_iconnosearch_)}
-_imagesearch2_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_textdescrsearch_)}
+_imagesearch2_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_navlinkalt_(Search))}
 _imagesearchgreen_ {<img src="_httpicontsrchgr_" width="_widthtsrchx_" border="0">}
 
 # Dublin Core Metadata Element Set, Version 1.1
-_imageTitle_ {_gsimage_(_httpbrowseTitle_,_httpiconttitleof_,_httpiconttitleon_,titles,_textdescrTitle_)}
+_imageTitle_ {_gsimage_(_httpbrowseTitle_,_httpiconttitleof_,_httpiconttitleon_,titles,_navlinkalt_(Title))}
 _imageTitlegreen_ {<img src="_httpiconttitlegr_" width="_widthttitlex_" border="0">}
-_imageCreator_ {_gsimage_(_httpbrowseCreator_,_httpicontcreatof_,_httpicontcreaton_,creators,_textdescrCreator_)}
+_imageCreator_ {_gsimage_(_httpbrowseCreator_,_httpicontcreatof_,_httpicontcreaton_,creators,_navlinkalt_(Creator))}
 _imageCreatorgreen_ {<img src="_httpicontcreatgr_" width="_widthtcreatx_" border="0">}
-_imageSubject_ {_gsimage_(_httpbrowseSubject_,_httpicontsubjof_,_httpicontsubjon_,subjects,_textdescrSubject_)}
+_imageSubject_ {_gsimage_(_httpbrowseSubject_,_httpicontsubjof_,_httpicontsubjon_,subjects,_navlinkalt_(Subject))}
 _imageSubjectgreen_ {<img src="_httpicontsubjgr_" width="_widthtsubjx_" border="0">}
-_imageDescription_ {_gsimage_(_httpbrowseDescription_,_httpicontdescof_,_httpicontdescon_,descriptions,_textdescrDescription_)}
+_imageDescription_ {_gsimage_(_httpbrowseDescription_,_httpicontdescof_,_httpicontdescon_,descriptions,_navlinkalt_(Description))}
 _imageDescriptiongreen_ {<img src="_httpicontdescgr_" width="_widthtdescx_" border="0">}
-_imagePublisher_ {_gsimage_(_httpbrowsePublisher_,_httpicontpublof_,_httpicontpublon_,publishers,_textdescrPublisher_)}
+_imagePublisher_ {_gsimage_(_httpbrowsePublisher_,_httpicontpublof_,_httpicontpublon_,publishers,_navlinkalt_(Publisher))}
 _imagePublishergreen_ {<img src="_httpicontpublgr_" width="_widthtpublx_" border="0">}
-_imageContributor_ {_gsimage_(_httpbrowseContributor_,_httpicontcontrof_,_httpicontcontron_,contributors,_textdescrContributor_)}
+_imageContributor_ {_gsimage_(_httpbrowseContributor_,_httpicontcontrof_,_httpicontcontron_,contributors,_navlinkalt_(Contributor))}
 _imageContributorgreen_ {<img src="_httpicontcontrgr_" width="_widthtcontrx_" border="0">}
-_imageDate_ {_gsimage_(_httpbrowseDate_,_httpicontdateof_,_httpicontdateon_,dates,_textdescrDate_)}
+_imageDate_ {_gsimage_(_httpbrowseDate_,_httpicontdateof_,_httpicontdateon_,dates,_navlinkalt_(Date))}
 _imageDategreen_ {<img src="_httpicontdategr_" width="_widthtdatex_" border="0">}
-_imageType_ {_gsimage_(_httpbrowseType_,_httpiconttypeof_,_httpiconttypeon_,types,_textdescrType_)}
+_imageType_ {_gsimage_(_httpbrowseType_,_httpiconttypeof_,_httpiconttypeon_,types,_navlinkalt_(Type))}
 _imageTypegreen_ {<img src="_httpiconttypegr_" width="_widthttypex_" border="0">}
-_imageFormat_ {_gsimage_(_httpbrowseFormat_,_httpicontformof_,_httpicontformon_,formats,_textdescrFormat_)}
+_imageFormat_ {_gsimage_(_httpbrowseFormat_,_httpicontformof_,_httpicontformon_,formats,_navlinkalt_(Format))}
 _imageFormatgreen_ {<img src="_httpicontformgr_" width="_widthtformx_" border="0">}
-_imageIdentifier_ {_gsimage_(_httpbrowseIdentifier_,_httpicontidentof_,_httpicontidenton_,identifiers,_textdescrIdentifier_)}
+_imageIdentifier_ {_gsimage_(_httpbrowseIdentifier_,_httpicontidentof_,_httpicontidenton_,identifiers,_navlinkalt_(Identifier))}
 _imageIdentifiergreen_ {<img src="_httpicontidentgr_" width="_widthtidentx_" border="0">}
-_imageSource_ {_gsimage_(_httpbrowseSource_,_httpicontsrcof_,_httpicontsrcon_,source,_textdescrSource_)}
+_imageSource_ {_gsimage_(_httpbrowseSource_,_httpicontsrcof_,_httpicontsrcon_,source,_navlinkalt_(Source))}
 _imageSourcegreen_ {<img src="_httpicontsrcgr_" width="_widthtsrcx_" border="0">}
-_imageLanguage_ {_gsimage_(_httpbrowseLanguage_,_httpicontlangof_,_httpicontlangon_,language,_textdescrLanguage_)}
+_imageLanguage_ {_gsimage_(_httpbrowseLanguage_,_httpicontlangof_,_httpicontlangon_,language,_navlinkalt_(Language))}
 _imageLanguagegreen_ {<img src="_httpicontlanggr_" width="_widthtlangx_" border="0">}
-_imageRelation_ {_gsimage_(_httpbrowseRelation_,_httpicontrelof_,_httpicontrelon_,relations,_textdescrRelation_)}
+_imageRelation_ {_gsimage_(_httpbrowseRelation_,_httpicontrelof_,_httpicontrelon_,relations,_navlinkalt_(Relation))}
 _imageRelationgreen_ {<img src="_httpicontrelgr_" width="_widthtrelx_" border="0">}
-_imageCoverage_ {_gsimage_(_httpbrowseCoverage_,_httpicontcoverof_,_httpicontcoveron_,coverage,_textdescrCoverage_)}
+_imageCoverage_ {_gsimage_(_httpbrowseCoverage_,_httpicontcoverof_,_httpicontcoveron_,coverage,_navlinkalt_(Coverage))}
 _imageCoveragegreen_ {<img src="_httpicontcovergr_" width="_widthtcoverx_" border="0">}
-_imageRights_ {_gsimage_(_httpbrowseRights_,_httpicontrightof_,_httpicontrighton_,rights,_textdescrRights_)}
+_imageRights_ {_gsimage_(_httpbrowseRights_,_httpicontrightof_,_httpicontrighton_,rights,_navlinkalt_(Rights))}
 _imageRightsgreen_ {<img src="_httpicontrightgr_" width="_widthtrightx_" border="0">}
-_imageSeries_ {_gsimage_(_httpbrowseSeries_,_httpicontserof_,_httpicontseron_,series,_textdescrSeries_)}
+_imageSeries_ {_gsimage_(_httpbrowseSeries_,_httpicontserof_,_httpicontseron_,series,_navlinkalt_(Series))}
 _imageSeriesgreen_ {<img src="_httpicontsergr_" width="_widthtserx_" border="0">}
-_imageTo_ {_gsimage_(_httpbrowseTo_,_httpiconttoof_,_httpiconttoon_,to,_textdescrTo_)}
+_imageTo_ {_gsimage_(_httpbrowseTo_,_httpiconttoof_,_httpiconttoon_,to,_navlinkalt_(To))}
 _imageTogreen_ {<img src="_httpiconttogr_" width="_widthttox_" border="0">}
-_imageFrom_ {_gsimage_(_httpbrowseFrom_,_httpicontfromof_,_httpicontfromon_,from,_textdescrFrom_)}
+_imageFrom_ {_gsimage_(_httpbrowseFrom_,_httpicontfromof_,_httpicontfromon_,from,_navlinkalt_(From))}
 _imageFromgreen_ {<img src="_httpicontfromgr_" width="_widthtfromx_" border="0">}
-_imageOrganization_ {_gsimage_(_httpbrowseOrganization_,_httpicontorgof_,_httpicontorgon_,org,_textdescrOrganization_)}
+_imageOrganization_ {_gsimage_(_httpbrowseOrganization_,_httpicontorgof_,_httpicontorgon_,org,_navlinkalt_(Organization))}
 _imageOrganizationgreen_ {<img src="_httpicontorggr_" width="_widthtorgx_" border="0">}
-_imageHowto_ {_gsimage_(_httpbrowseHowto_,_httpiconthowof_,_httpiconthowon_,how,_textdescrHowto_)}
+_imageHowto_ {_gsimage_(_httpbrowseHowto_,_httpiconthowof_,_httpiconthowon_,how,_navlinkalt_(Howto))}
 _imageHowtogreen_ {<img src="_httpiconthowgr_" width="_widththowx_" border="0">}
-_imageTopic_ {_gsimage_(_httpbrowseTopic_,_httpiconttopicof_,_httpiconttopicon_,topic,_textdescrTopic_)}
+_imageTopic_ {_gsimage_(_httpbrowseTopic_,_httpiconttopicof_,_httpiconttopicon_,topic,_navlinkalt_(Topic))}
 _imageTopicgreen_ {<img src="_httpiconttopicgr_" width="_widthttopicx_" border="0">}
-_imageBrowse_ {_gsimage_(_httpbrowseBrowse_,_httpicontbrwseof_,_httpicontbrwseon_,browse,_textdescrBrowse_}
+_imageBrowse_ {_gsimage_(_httpbrowseBrowse_,_httpicontbrwseof_,_httpicontbrwseon_,browse,_navlinkalt_(Browse)}
 _imageBrowsegreen_ {<img src="_httpicontbrwsegr_" width="_widthtbrwsex_" border="0">}
-_imagePeople_ {_gsimage_(_httpbrowsePeople_,_httpicontpeopof_,_httpicontpeopon_,people,_textdescrPeople_)}
+_imagePeople_ {_gsimage_(_httpbrowsePeople_,_httpicontpeopof_,_httpicontpeopon_,people,_navlinkalt_(People))}
 _imagePeoplegreen_ {<imgsrc="_httpicontpeopgr_" width="_widthtpeopx_" border="0">}
-_imageAcronym_ {_gsimage_(_httpbrowseAcronym_,_httpicontacroof_,_httpicontacroon_,acronym,_textdescrAcronym_)}
+_imageAcronym_ {_gsimage_(_httpbrowseAcronym_,_httpicontacroof_,_httpicontacroon_,acronym,_navlinkalt_(Acronym))}
 _imageAcronymgreen_ {<imgsrc="_httpicontacrogr_" width="_widthtacrox_" border="0">}
-_imageCollage_ {_gsimage_(_httpbrowseCollage_,_httpicontcollof_,_httpicontcollon_,collage,_textdescrCollage_)}
+_imageCollage_ {_gsimage_(_httpbrowseCollage_,_httpicontcollof_,_httpicontcollon_,collage,_navlinkalt_(Collage))}
 _imageCollagegreen_ {<img src="_httpicontcollgr_" width="_widthtcollx_" border="0">}
-_imagePhrase_ {_gsimage_(_httpbrowsePhrase_,_httpicontphrseof_,_httpicontphrseon_,phrase,_textdescrPhrase_)}
+_imagePhrase_ {_gsimage_(_httpbrowsePhrase_,_httpicontphrseof_,_httpicontphrseon_,phrase,_navlinkalt_(Phrase))}
 _imagePhrasegreen_ {<imgsrc="_httpicontphrsegr_" width="_widthtphrsex_" border="0">}
-_imageArtist_ {_gsimage_(_httpbrowseArtist_,_httpicontartstof_,_httpicontartston_,artist,_textdescrArtist_)}
+_imageArtist_ {_gsimage_(_httpbrowseArtist_,_httpicontartstof_,_httpicontartston_,artist,_navlinkalt_(Artist))}
 _imageArtistgreen_ {<imgsrc="_httpicontartstgr_" width="_widthtartstx_" border="0">}
-_imageKeyword_ {_gsimage_(_httpbrowseKeyword_,_httpicontkwof_,_httpicontkwon_,kw,_textdescrKeyword_)}
+_imageKeyword_ {_gsimage_(_httpbrowseKeyword_,_httpicontkwof_,_httpicontkwon_,kw,_navlinkalt_(Keyword))}
 _imageKeywordgreen_ {<img src="_httpicontkwgr_" width="_widthtkwx_" border="0">}
-_imageVolume_ {_gsimage_(_httpbrowseVolume_,_httpicontvolof_,_httpicontvolon_,volume,_textdescrVolume_)}
+_imageVolume_ {_gsimage_(_httpbrowseVolume_,_httpicontvolof_,_httpicontvolon_,volume,_navlinkalt_(Volume))}
 _imageVolumegreen_ {<img src="_httpicontvolgr_" width="_widthtvolx_" border="0">}
-_imageCaptions_ {_gsimage_(_httpbrowseCaptions_,_httpicontcaptof_,_httpicontcapton_,captions,_textdescrCaptions_)}
+_imageCaptions_ {_gsimage_(_httpbrowseCaptions_,_httpicontcaptof_,_httpicontcapton_,captions,_navlinkalt_(Captions))}
 _imageCaptionsgreen_ {<imgsrc="_httpicontcaptgr_" width="_widthtcaptx_" border="0">}
-_imageCountries_ {_gsimage_(_httpbrowseCountries_,_httpicontcountof_,_httpicontcounton_,countries,_textdescrCountries_)}
+_imageCountries_ {_gsimage_(_httpbrowseCountries_,_httpicontcountof_,_httpicontcounton_,countries,_navlinkalt_(Countries))}
 _imageCountriesgreen_ {<img src="_httpicontcountgr_" width="_widthtcountx_" border="0">}