Changeset 454 for trunk


Ignore:
Timestamp:
1999-08-12T11:32:00+12:00 (25 years ago)
Author:
sjboddie
Message:

lots of little changes to macro files

Location:
trunk/gsdl/macros
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/macros/base.dm

    r306 r454  
    3434_Organizationwidth_ {_widthtorgx_}
    3535_Howtowidth_ {_widththowx_}
     36_Topicwidth_ {_widthttopicx_}
     37_Browsewidth_ {_widthtbrwsex_}
    3638
    3739#######################################################################
    … …  
    6668
    6769_optionhstx_ {chapters}
    68 _optionhstx_ [collection=gberg] {pages}
    69 _optionhstt_ {titles}
    7070_optionhscr_ {authors}
     71_optionhdtx_ {entire books}
     72_optionhstt_ {section titles}
     73_optionhptx_ {paragraphs}
     74
     75# gberg
    7176_optionhdtt_ {titles}
    7277_optionhdcr_ {authors}
    73 _optionhdtx_ {entire books}
     78_optionhstx_ [collection=gberg] {pages}
     79
     80# hcibib
     81_optionhdsr_ [collection=hcibib] {conference/publication titles}
     82_optionhdrf_ [collection=hcibib] {references}
     83_optionhdra_ [collection=hcibib] {references and abstracts}
     84
     85
     86# tcc
     87_optionhstx_ [collection=tcc] {sections}
     88
     89# tidbits
     90_optionhstx_ [collection=tidbits] {sections}
     91_optionhscr_ [collection=tidbits] {section authors}
     92
     93# csbib
     94_optionhstt_ [collection=csbib] {titles}
     95_optionhscr_ [collection=csbib] {authors}
     96_optionhssr_ [collection=csbib] {conference/publication titles}
     97_optionhsrf_ [collection=csbib] {references}
     98_optionhsrd_ [collection=csbib] {references and abstracts}
     99
    74100
    75101#######################################################################
    … …  
    162188}
    163189
     190_imageTopic_ {<a href="_httpbrowseTopic_"
     191    onMouseover = "img\_on('topic')"
     192    onMouseout = "img\_off('topic')"><img name="topic"
     193        src="_httpiconttopicof_" width="_widthttopicx_" height="_heightttopicx_"
     194        border="0" alt="_textimageTopic_"></a>}
     195_imageTopic_[version=text] {<a href="_httpbrowseTopic_">_textimageTopic_</a><br>
     196}
     197
     198_imageBrowse_ {<a href="_httpbrowseBrowse_"
     199    onMouseover = "img\_on('browse')"
     200    onMouseout = "img\_off('browse')"><img name="browse"
     201        src="_httpicontbrwseof_" width="_widthtbrwsex_" height="_heighttbrwsex_"
     202        border="0" alt="_textimageBrowse_"></a>}
     203_imageBrowse_[version=text] {<a href="_httpbrowseBrowse_">_textimageBrowse_</a><br>
     204}
     205
    164206
    165207#######################################################################
    … …  
    170212# the page.
    171213
    172 _javalinks_ {_imagehome__imageabout__imagehelp__imagepref_}
     214_javalinks_ {_imagehome__imagehelp__imagepref_}
    173215_javalinks_ [version=text] {
    174216_imagehome_<br>
    175 _imageabout_<br>
    176217_imagehelp_<br>
    177218_imagepref_<br>
    … …  
    187228# image link within the page.
    188229
    189 _javaimagesheader_ {_javaabout__javahome__javahelp__javapref_}
     230_javaimagesheader_ {_javahome__javahelp__javapref_}
    190231_javaimagesheader_ [version=text] {}
    191232
    … …  
    279320    org\_off = new Image(_widthtorgx_, _heighttorgx_);         
    280321    org\_off.src = "_httpicontorgof_";         
     322}
     323
     324_javaTopic_ {
     325    topic\_on = new Image(_widthttopicx_, _heightttopicx_);         
     326    topic\_on.src = "_httpiconttopicon_";
     327    topic\_off = new Image(_widthttopicx_, _heightttopicx_);         
     328    topic\_off.src = "_httpiconttopicof_";         
     329}
     330
     331_javaBrowse_ {
     332    browse\_on = new Image(_widthtbrwsex_, _heighttbrwsex_);         
     333    browse\_on.src = "_httpicontbrwseon_";
     334    browse\_off = new Image(_widthtbrwsex_, _heighttbrwsex_);         
     335    browse\_off.src = "_httpicontbrwseof_";         
    281336}
    282337
    … …  
    371426_heightmore_ {16}
    372427
    373 _httpiconopenbook_ {_httpimg_/openbook.gif}
    374 _widthopenbook_ {28}
    375 _heightopenbook_ {23}
    376 
    377 _httpiconopenfldr_ {_httpimg_/openfldr.gif}
    378 _widthopenfldr_ {23}
    379 _heightopenfldr_ {15}
    380 
    381428_httpiconqryresb_ {_httpimg_/qryresb.gif}
    382429_httpiconqryresb_ [language=mi] {_httpimg_/mqryresb.gif}
    … …  
    390437_httpicontabspace_ {_httpimg_/tabspace.gif}
    391438_widthtabspace_ {23}
    392 _heighttabspace_ {15}
     439_heighttabspace_ {1}
    393440
    394441_httpicontauthgr_ {_httpimg_/tauthgr.gif}
    … …  
    435482_heightthowx_ {17}
    436483
     484_httpiconttopicgr_{_httpimg_/ttopicgr.gif}
     485_httpiconttopicon_{_httpimg_/ttopicon.gif}
     486_httpiconttopicof_{_httpimg_/ttopicof.gif}
     487_widthttopicx_ {87}
     488_heightttopicx_ {17}
     489
     490_httpicontbrwsegr_{_httpimg_/tbrwsegr.gif}
     491_httpicontbrwseon_{_httpimg_/tbrwseon.gif}
     492_httpicontbrwseof_{_httpimg_/tbrwseof.gif}
     493_widthtbrwsex_ {87}
     494_heighttbrwsex_ {17}
     495
    437496_httpicontsrchgr_ {_httpimg_/tsrchgr.gif}
    438497_httpicontsrchgr_ [language=mi] {_httpimg_/mtsrchgr.gif}
    … …  
    485544_heightarrrght_ {15}
    486545
     546_httpiconopenbook_ {_httpimg_/openbook.gif}
     547_widthopenbook_ {28}
     548_heightopenbook_ {23}
     549
     550_httpiconaopenbk_ {_httpimg_/aopenbk.gif}
     551_widthaopenbk_ {28}
     552_heightaopenbk_ {23}
     553
     554_httpiconopenfldr_ {_httpimg_/openfldr.gif}
     555_widthopenfldr_ {23}
     556_heightopenfldr_ {15}
     557
     558_httpiconaopenfdr_ {_httpimg_/aopenfdr.gif}
     559_widthaopenfdr_ {23}
     560_heightaopenfdr_ {15}
     561
    487562_httpiconbook_ {_httpimg_/book.gif}
    488563_widthbook_ {18}
    489564_heightbook_ {11}
    490565
     566_httpiconabook_ {_httpimg_/abook.gif}
     567_widthabook_ {18}
     568_heightabook_ {11}
     569
    491570_httpiconbshelf_ {_httpimg_/bshelf.gif}
    492571_widthbshelf_ {20}
    493572_heightbshelf_ {16}
     573
     574_httpiconabshelf_ {_httpimg_/abshelf.gif}
     575_widthabshelf_ {20}
     576_heightabshelf_ {16}
     577
     578_httpiconsmtext_ {_httpimg_/smtext.gif}
     579_widthsmtext_ {23}
     580_heightsmtext_ {15}
     581
     582_httpiconasmtext_ {_httpimg_/asmtext.gif}
     583_widthasmtext_ {23}
     584_heightasmtext_ {15}
     585
     586_httpiconclsdfldr_ {_httpimg_/clsdfldr.gif}
     587_widthclsdfldr_ {23}
     588_heightclsdfldr_ {15}
     589
     590_httpiconaclsdfdr_ {_httpimg_/aclsdfdr.gif}
     591_widthaclsdfdr_ {23}
     592_heightaclsdfdr_ {15}
    494593
    495594
    … …  
    538637
    539638_icontabHowtogreen_ {<img
    540 src="_httpiconthowgr_" height=_heightthowgr_ width=_widththowgr_ border=0>}
     639src="_httpiconthowgr_" height=_heightthowx_ width=_widththowx_ border=0>}
    541640_icontabHowtogreen_[version=text] {_texticontabhowgreen_}
     641
     642_icontabTopicgreen_ {<img
     643src="_httpiconttopicgr_" height=_heightttopicx_ width=_widthttopicx_ border=0>}
     644_icontabTopicgreen_[version=text] {_texticontabtopicgreen_}
     645
     646_icontabBrowsegreen_ {<img
     647src="_httpicontbrwsegr_" height=_heighttbrwsex_ width=_widthtbrwsex_ border=0>}
     648_icontabBrowsegreen_[version=text] {_texticontabbrwsegreen_}
    542649
    543650_icontabOrganizationgreen_ {<img
    … …  
    639746_textimageOrganization_ {Browse by organization}
    640747_textimageHowto_ {Browse how to categories}
     748_textimageTopic_ {Browse special topic issues}
     749_textimageBrowse_ {Browse}
    641750
    642751_texticontabsearchgreen_{Search}
    … …  
    649758_texticontaborggreen_{Organization}
    650759_texticontabhowgreen_{How to}
     760_texticontabtopicgreen_{Topics}
     761_texticontabbrwsegreen_{Browse}
    651762_texticontext_ {View the document}
    652763_texticonglobhelp_ {Global Help Projects}
    … …  
    654765_texticonprev_ {to previous section}
    655766
    656 _page_ {page}
    657 _of_ {of}
     767_page_ {page }
     768_of_ {of }
    658769_vol_ {Volume}
    659770_num_ {Number}
    660771
    661 _jan_ {January}
    662 _feb_ {February}
    663 _mar_ {March}
    664 _apr_ {April}
    665 _may_ {May}
    666 _jun_ {June}
    667 _jul_ {July}
    668 _aug_ {August}
    669 _sep_ {September}
    670 _oct_ {October}
    671 _nov_ {November}
    672 _dec_ {December}
    673 
     772_textmonth00_ {}
     773_textmonth01_ {January}
     774_textmonth02_ {February}
     775_textmonth03_ {March}
     776_textmonth04_ {April}
     777_textmonth05_ {May}
     778_textmonth06_ {June}
     779_textmonth07_ {July}
     780_textmonth08_ {August}
     781_textmonth09_ {September}
     782_textmonth10_ {October}
     783_textmonth11_ {November}
     784_textmonth12_ {December}
     785
     786_magazines_ {Magazines}
    674787
    675788################################
    … …  
    687800_vol_ [language=mi] {Pukapuka}
    688801_num_ [language=mi] {Nama}
    689 _jan_ [language=mi] {Hanuere}
    690 _feb_ [language=mi] {Pepuere}
    691 _mar_ [language=mi] {Maehe}
    692 _apr_ [language=mi] {Aperira}
    693 _may_ [language=mi] {Mei}
    694 _jun_ [language=mi] {Hune}
    695 _jul_ [language=mi] {Hurae}
    696 _aug_ [language=mi] {Akuhata}
    697 _sep_ [language=mi] {Hepetema}
    698 _oct_ [language=mi] {Oketopa}
    699 _nov_ [language=mi] {Noema}
    700 _dec_ [language=mi] {Tihema}
     802_textmonth01_ [language=mi] {Hanuere}
     803_textmonth02_ [language=mi] {Pepuere}
     804_textmonth03_ [language=mi] {Maehe}
     805_textmonth04_ [language=mi] {Aperira}
     806_textmonth05_ [language=mi] {Mei}
     807_textmonth06_ [language=mi] {Hune}
     808_textmonth07_ [language=mi] {Hurae}
     809_textmonth08_ [language=mi] {Akuhata}
     810_textmonth09_ [language=mi] {Hepetema}
     811_textmonth10_ [language=mi] {Oketopa}
     812_textmonth11_ [language=mi] {Noema}
     813_textmonth12_ [language=mi] {Tihema}
    701814_of_ [language=mi] {i te}
    702815

  • trunk/gsdl/macros/document.dm

    r283 r454  
    55#######################################################################
    66
    7 
    8 _random_ {rand}
    97_classificationlinks_ {}
    108_imagethispage_ {}
    … …  
    3432# that may appear within a document page
    3533#######################################################################
     34
     35# javaextras allows specific collections to include extra java macros
     36# without having to override their document action
     37_javaextras_ {}
    3638
    3739_javadetach_ {
    … …  
    163165_iconHowtopage_ [version=text] {<h2>_texticonhhow_</h2>}
    164166
     167_iconTopicpage_ {<img src="_httpiconhtopic_" width=_widthhtopic_
     168height=_heighthtopic_}
     169_iconTopicpage_ [version=text] {<h2>_texticonhtopic_</h2>}
     170
    165171_iconOrganizationpage_ {<img src="_httpiconhorg_" width=_widthhorg_
    166172height=_heighthorg_}
    167173_iconOrganizationpage_ [version=text] {<h2>_texticonhorg_</h2>}
    168174
     175_iconBrowsepage_ {<img src="_httpiconhbrwse_" width=_widthhbrwse_
     176height=_heighthbrwse_}
     177_iconBrowsepage_ [version=text] {<h2>_texticonhbrwse_</h2>}
     178
     179
    169180
    170181_iconsmalltext_ {<img src="_httpiconsmtext_" border=0 width=_widthsmtext_ height=_heightsmtext_ alt="_texticonsmalltext_">}
    171182_iconsmalltext_ [version=text] {<small><b>_texticonsmalltext2_</b></small>}
    172183
     184_iconarrowsmalltext_ {<img src="_httpiconasmtext_" border=0 width=_widthasmtext_ height=_heightasmtext_ alt="_texticonsmalltext_">}
     185_iconarrowsmalltext_ [version=text] {<small><b>->_texticonsmalltext2_</b></small>}
     186
    173187_iconclosedfolder_ {<img src="_httpiconclsdfldr_" border=0 width=_widthclsdfldr_ height=_heightclsdfldr_ alt="_texticonclosedfolder_">}
    174188_iconclosedfolder_ [version=text] {<small><b>_texticonclosedfolder2_</b></small>}
    175189
     190_iconarrowclosedfolder_ {<img src=_httpiconaclsdfdr_" border=0 width=_widthaclsdfdr_ height=_heightaclsdfdr_ alt="_texticonclosedfolder_">}
     191_iconarrowclosedfolder_ [version=text] {<small><b>->_texticonclosedfolder2_</b></small>}
     192
    176193_iconopenfolder_ {<img src="_httpiconopenfldr_" border=0 width=_widthopenfldr_ height=_heightopenfldr_ alt="_texticonopenfolder_">}
    177194_iconopenfolder_ [version=text] {<small><b>_texticonopenfolder2_</b></small>}
    178195
     196_iconarrowopenfolder_ {<img src="_httpiconaopenfdr_" border=0 width=_widthaopenfdr_ height=_heightaopenfdr_ alt="_texticonopenfolder_">}
     197_iconarrowopenfolder_ [version=text] {<small><b>->_texticonopenfolder2_</b></small>}
     198
    179199_iconclosedbook_ {<img src="_httpiconbook_" width=_widthbook_ height=_heightbook_ border=0 alt="_texticonclosedbook_">}
    180200_iconclosedbook_ [version=text] {<small><b>_texticonclosedbook_: </b></small>}
    181201
     202_iconarrowclosedbook_ {<img src="_httpiconabook_" width=_widthabook_ height=_heightabook_ border=0 alt="_texticonclosedbook_">}
     203_iconarrowclosedbook_ [version=text] {<small><b>->_texticonclosedbook_: </b></small>}
     204
    182205_iconopenbook_ {<img src="_httpiconopenbook_" width=_widthopenbook_ height=_heightopenbook_ border=0 alt="_texticonopenbook_">}
    183206_iconopenbook_ [version=text] {<small><b>_texticonopenbook_: </b></small>}
    184207
     208_iconarrowopenbook_ {<img src="_httpiconaopenbk_" width=_widthaopenbk_ height=_heightaopenbk_ border=0 alt="_texticonopenbook_">}
     209_iconarrowopenbook_ [version=text] {<small><b>->_texticonopenbook_: </b></small>}
     210
    185211_iconopenbookshelf_ {<img src="_httpiconbshelf_" border=0 width=_widthbshelf_ height=_heightbshelf_ alt="_texticonopenbookshelf_">}
    186212_iconopenbookshelf_ [version=text] {<small><b>_texticonopenbookshelf_: </b></small>}
    187213
     214_iconarrowopenbookshelf_ {<img src="_httpiconabshelf_" border=0 width=_widthabshelf_ height=_heightabshelf_ alt="_texticonopenbookshelf_">}
     215_iconarrowopenbookshelf_ [version=text] {<small><b>->_texticonopenbookshelf_: </b></small>}
     216
    188217_iconclosedbookshelf_ {<img src="_httpiconbshelf_" border=0 width=_widthbshelf_ height=_heightbshelf_ alt="_texticonclosedbookshelf_">}
    189218_iconclosedbookshelf_ [version=text] {<small><b>_texticonclosedbookshelf_: </b></small>}
    190219
     220_iconarrowclosedbookshelf_ {<img src="_httpiconabshelf_" border=0 width=_widthabshelf_ height=_heightabshelf_ alt="_texticonclosedbookshelf_">}
     221_iconarrowclosedbookshelf_ [version=text] {<small><b>->_texticonclosedbookshelf_: </b></small>}
     222
    191223_iconpointer_ {<img src="_httpiconarrrght_" border=0 width=_widtharrrght_ height=_heightarrrght_>}
    192224_iconpointer_ [version=text] {<small><b>_texticonpointer_-> </b></small>}
    193225
    194226_icontab_ {<img src="_httpicontabspace_" width=_widthtabspace_ height=_heighttabspace_>}
     227_tab_ {<td>_icontab_</td>}
    195228
    196229_iconcontracttoc_ {<img name="concon" src="_httpiconeconcof_" width=_widtheconcx_ height=_heighteconcof_ alt="_texticoncontracttoc_" border=0>}
    … …  
    226259#######################################################################
    227260
    228 _imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=_random_ onMouseover = "img\_on('detach')"
     261_imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=\_blank onMouseover = "img\_on('detach')"
    229262onMouseout = "img\_off('detach')">_icondetach_</a>}
    230 _imagedetach_[version=text] {<a href="_httpcurrentdocument_&x=1" target=_random_>_texticondetach_</a><br>}
     263_imagedetach_[version=text] {<a href="_httpcurrentdocument_&x=1" target=\_blank>_texticondetach_</a><br>}
    231264
    232265_imagehighlight_ {<a href="_httpcurrentdocument_&hl=1" onMouseover = "img\_on('hl')"
    … …  
    300333_heighthhow_ {57}
    301334
     335_httpiconhtopic_ {_httpimg_/h\_topic.gif}
     336_widthhhow_ {200}
     337_heighthhow_ {57}
     338
    302339_httpiconhorg_ {_httpimg_/h\_org.gif}
    303340_widthhorg_ {250}
    304341_heighthorg_ {57}
    305342
    306 _httpiconsmtext_ {_httpimg_/smtext.gif}
    307 _widthsmtext_ {23}
    308 _heightsmtext_ {15}
    309 
    310 _httpiconclsdfldr_ {_httpimg_/clsdfldr.gif}
    311 _widthclsdfldr_ {23}
    312 _heightclsdfldr_ {15}
     343_httpiconhbrwse_ {_httpimg_/h\_brwse.gif}
     344_widthhbrwse_ {200}
     345_heighthbrwse_ {57}
    313346
    314347_httpiconcontoff_ {_httpimg_/contoff.gif}
    … …  
    369402# header overridden for text pages
    370403_textheader_ {_cgihead_
    371 _htmlhead_('background="_httpiconchalk_"')
     404_htmlhead_
    372405}
    373406
    … …  
    400433_textSubjectpage_ {_texticonhsubj_}
    401434_textSeriespage_ {_texticonhser_}
    402 _textDatespage_ {_texticonhdate_}
     435_textDatepage_ {_texticonhdate_}
    403436_textHowtopage_ {_texticonhhow_}
    404437_textOrganizationpage_ {_texticonhorg_}
     438_textBrowsepage_ {_texticonhbrwse_}
    405439
    406440_texticonhtitle_ {Titles A-Z}
    … …  
    411445_texticonhhow_ {How to}
    412446_texticonhorg_ {Organizations}
     447_texticonhbrwse_ {Browse}
    413448
    414449_texticonopenbookshelf_ {close this section of the library}

  • trunk/gsdl/macros/pref.dm

    r283 r454  
    131131  <option value="100"_If_("_cgiargm_" eq "100", selected)>100
    132132  <option value="200"_If_("_cgiargm_" eq "200", selected)>200
    133   <option value="500"_If_("_cgiargm_" eq "500", selected)>500
    134133</select>
    135134}
    … …  
    140139  <option value="20"_If_("_cgiargo_" eq "20", selected)>20
    141140  <option value="50"_If_("_cgiargo_" eq "50", selected)>50
    142   <option value="100")_If_("_cgiargo_" eq "100", selected)>100
    143   <option value="500"_If_("_cgiargo_" eq "500", selected)>all
     141  <option value="100")_If_("_cgiargo_" eq "100", selected)>all
    144142</select>
    145143}

  • trunk/gsdl/macros/query.dm

    r332 r454  
    134134# _hselection_, _jselection_ and _nselection_ are set from within the server
    135135# some or all of them may remain unset
    136 _textselect_ {Search _hselection__If_(_jselection_, of _jselection_)_If_(_nselection_, in _nselection_ language) for
     136_textselect_ {Search_If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) for
    137137_querytypeselection_ of the words}
     138_textjselect_ {_If_(_hselection_, of) _jselection_}
    138139
    139140_querytypeselection_ {
    … …  
    143144</select>
    144145}
     146
     147_textstemon_ { (ignoring word endings)}
    145148
    146149
    … …  
    159162_textlotsdocs_ [language=mi] {ng&auml; pukapuka e p&auml; ana ki &auml;u kupu rapu.}
    160163
     164_textstemon_ [language=mi] { (hei aha te k&uuml;muri)}
    161165
    162 

  • trunk/gsdl/macros/style.dm

    r341 r454  
    3838_htmlhead_(background="_httpiconchalk_")_startspacer__pagebanner_
    3939}
     40
     41
    4042
    4143# this declaration ends up being the same as style=restrict, never mind
Note: See TracChangeset for help on using the changeset viewer.