Index: /trunk/gsdl/macros/armenian.dm
===================================================================
--- /trunk/gsdl/macros/armenian.dm	(revision 11160)
+++ /trunk/gsdl/macros/armenian.dm	(revision 11161)
@@ -186,8 +186,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ÕÖÕÔ±ÕÔ¿Ô»Õ Ô¿Ô±ÕÔŸÔ»Õ" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=hy] {_httpimg_/hy/cusabof.gif}
-_httpiconcusabon_ [l=hy] {_httpimg_/hy/cusabon.gif}
 
 
@@ -517,8 +513,4 @@
 
 
-## "Õ¡ÖÕ€ÕµÕžÖÕ¶ÖÕ¶Õ¥Ö" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=hy] {_httpimg_/hy/qryresb.gif}
-_widthqryresb_ [l=hy] {_pagewidth_}
-_heightqryresb_ [l=hy] {17}
 
 ## "ÕºÕ¡Õ¿ÕŽÕžÖÕ©ÕµÕžÖÕ¶" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/catalan2.dm
===================================================================
--- /trunk/gsdl/macros/catalan2.dm	(revision 11160)
+++ /trunk/gsdl/macros/catalan2.dm	(revision 11161)
@@ -94,33 +94,9 @@
 _textdescrselcol_ [l=ca] {seleccioneu una colÂ·lecciÃ³}
 
-## "La interfÃ­cie\ndel bibliotecari" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=ca] {_httpimg_/ca/cgliof.gif}
-_httpiconcglion_ [l=ca] {_httpimg_/ca/cglion.gif}
-_widthcgli_ [l=ca] {100}
-
-## "El colÂ·leccionista" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=ca] {_httpimg_/ca/ccolof.gif}
-_httpiconccolon_ [l=ca] {_httpimg_/ca/ccolon.gif}
-_widthccol_ [l=ca] {100}
-
-## "El traductor" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=ca] {_httpimg_/ca/ctransof.gif}
-_httpiconctranson_ [l=ca] {_httpimg_/ca/ctranson.gif}
-_widthctrans_ [l=ca] {100}
-
-## "PÃ gina\nd'administraciÃ³" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=ca] {_httpimg_/ca/cadminof.gif}
-_httpiconcadminon_ [l=ca] {_httpimg_/ca/cadminon.gif}
-_widthcadmin_ [l=ca] {100}
-
-## "Sobre\nGreenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=ca] {_httpimg_/ca/cabgsof.gif}
-_httpiconcabgson_ [l=ca] {_httpimg_/ca/cabgson.gif}
-_widthcabgs_ [l=ca] {100}
-
-## "DocumentaciÃ³\nde Greenstone" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=ca] {_httpimg_/ca/cgsdocof.gif}
-_httpiconcgsdocon_ [l=ca] {_httpimg_/ca/cgsdocon.gif}
-_widthcgsdoc_ [l=ca] {100}
+
+
+
+
+
 
 
@@ -490,8 +466,4 @@
 _httpiconncsrceof_ [l=ca] {_httpimg_/ca/ncsrceof.gif}
 
-## "configura\nla colÂ·lecciÃ³" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=ca] {_httpimg_/ca/gcconfof.gif}
-_httpicongcconfon_ [l=ca] {_httpimg_/ca/gcconfon.gif}
-_httpiconycconfof_ [l=ca] {_httpimg_/ca/ycconfof.gif}
 _httpiconycconfon_ [l=ca] {_httpimg_/ca/ycconfon.gif}
 _httpiconncconfof_ [l=ca] {_httpimg_/ca/ncconfof.gif}
Index: /trunk/gsdl/macros/chinese-trad.dm
===================================================================
--- /trunk/gsdl/macros/chinese-trad.dm	(revision 11160)
+++ /trunk/gsdl/macros/chinese-trad.dm	(revision 11161)
@@ -199,8 +199,4 @@
 # icons
 #------------------------------------------------------------
-
-## "å°åèŠéåº" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=zh-tr] {_httpimg_/zh-tr/cusabof.gif}
-_httpiconcusabon_ [l=zh-tr] {_httpimg_/zh-tr/cusabon.gif}
 
 
@@ -517,8 +513,4 @@
 
 
-## "çµæ" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=zh-tr] {_httpimg_/zh-tr/qryresb.gif}
-_widthqryresb_ [l=zh-tr] {_pagewidth_}
-_heightqryresb_ [l=zh-tr] {17}
 
 ## "æ­·å²çŽé" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/chinese-trad2.dm
===================================================================
--- /trunk/gsdl/macros/chinese-trad2.dm	(revision 11160)
+++ /trunk/gsdl/macros/chinese-trad2.dm	(revision 11161)
@@ -146,35 +146,9 @@
 žèè³æåº«}
 
-## "åæžé€šå¡ç®¡çä»é¢" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=zh-tr] {_httpimg_/zh-tr/cgliof.gif}
-_httpiconcglion_ [l=zh-tr] {_httpimg_/zh-tr/cglion.gif}
-_widthcgli_ [l=zh-tr] {100}
-
-## "å
-žèè³æåº«" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=zh-tr] {_httpimg_/zh-tr/ccolof.gif}
-_httpiconccolon_ [l=zh-tr] {_httpimg_/zh-tr/ccolon.gif}
-_widthccol_ [l=zh-tr] {100}
-
-## "ç¿»è­¯è
-" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=zh-tr] {_httpimg_/zh-tr/ctransof.gif}
-_httpiconctranson_ [l=zh-tr] {_httpimg_/zh-tr/ctranson.gif}
-_widthctrans_ [l=zh-tr] {100}
-
-## "ç³»çµ±ç®¡çé é¢" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=zh-tr] {_httpimg_/zh-tr/cadminof.gif}
-_httpiconcadminon_ [l=zh-tr] {_httpimg_/zh-tr/cadminon.gif}
-_widthcadmin_ [l=zh-tr] {100}
-
-## "éæŒ\nGreenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=zh-tr] {_httpimg_/zh-tr/cabgsof.gif}
-_httpiconcabgson_ [l=zh-tr] {_httpimg_/zh-tr/cabgson.gif}
-_widthcabgs_ [l=zh-tr] {100}
-
-## "Greenstone\nç³»çµ±æä»¶" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=zh-tr] {_httpimg_/zh-tr/cgsdocof.gif}
-_httpiconcgsdocon_ [l=zh-tr] {_httpimg_/zh-tr/cgsdocon.gif}
-_widthcgsdoc_ [l=zh-tr] {100}
+
+
+
+
+
 
 
@@ -783,9 +757,4 @@
 _httpiconncsrceof_ [l=zh-tr] {_httpimg_/zh-tr/ncsrceof.gif}
 
-## "èš­å®å
-žèè³æåº«" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=zh-tr] {_httpimg_/zh-tr/gcconfof.gif}
-_httpicongcconfon_ [l=zh-tr] {_httpimg_/zh-tr/gcconfon.gif}
-_httpiconycconfof_ [l=zh-tr] {_httpimg_/zh-tr/ycconfof.gif}
 _httpiconycconfon_ [l=zh-tr] {_httpimg_/zh-tr/ycconfon.gif}
 _httpiconncconfof_ [l=zh-tr] {_httpimg_/zh-tr/ncconfof.gif}
Index: /trunk/gsdl/macros/croatian.dm
===================================================================
--- /trunk/gsdl/macros/croatian.dm	(revision 11160)
+++ /trunk/gsdl/macros/croatian.dm	(revision 11161)
@@ -515,8 +515,4 @@
 
 
-## "rezultati" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=hr] {_httpimg_/hr/qryresb.gif}
-_widthqryresb_ [l=hr] {_pagewidth_}
-_heightqryresb_ [l=hr] {17}
 
 ## "popis prethodnih pretraÅŸivanja" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/czech.dm
===================================================================
--- /trunk/gsdl/macros/czech.dm	(revision 11160)
+++ /trunk/gsdl/macros/czech.dm	(revision 11161)
@@ -180,8 +180,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ODESLAT ZPRÃVU" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=cs] {_httpimg_/cs/cusabof.gif}
-_httpiconcusabon_ [l=cs] {_httpimg_/cs/cusabon.gif}
 
 
@@ -504,8 +500,4 @@
 
 
-## "vÃœsledky" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=cs] {_httpimg_/cs/qryresb.gif}
-_widthqryresb_ [l=cs] {_pagewidth_}
-_heightqryresb_ [l=cs] {17}
 
 ## "historie" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/czech2.dm
===================================================================
--- /trunk/gsdl/macros/czech2.dm	(revision 11160)
+++ /trunk/gsdl/macros/czech2.dm	(revision 11161)
@@ -111,8 +111,4 @@
 _textdescrselcol_ [l=cs] {zvolit kolekci}
 
-## "RozhranÃ­\nLibrarian" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=cs] {_httpimg_/cs/cgliof.gif}
-_httpiconcglion_ [l=cs] {_httpimg_/cs/cglion.gif}
-_widthcgli_ [l=cs] {100}
 
 # -- Missing translation: ccol
@@ -121,8 +117,4 @@
 # -- Missing translation: _widthccol_
 
-## "PÅekladatel" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=cs] {_httpimg_/cs/ctransof.gif}
-_httpiconctranson_ [l=cs] {_httpimg_/cs/ctranson.gif}
-_widthctrans_ [l=cs] {100}
 
 # -- Missing translation: cadmin
@@ -520,8 +512,4 @@
 _httpiconncsrceof_ [l=cs] {_httpimg_/cs/ncsrceof.gif}
 
-## "konfigurovat\n     kolekci" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=cs] {_httpimg_/cs/gcconfof.gif}
-_httpicongcconfon_ [l=cs] {_httpimg_/cs/gcconfon.gif}
-_httpiconycconfof_ [l=cs] {_httpimg_/cs/ycconfof.gif}
 _httpiconycconfon_ [l=cs] {_httpimg_/cs/ycconfon.gif}
 _httpiconncconfof_ [l=cs] {_httpimg_/cs/ncconfof.gif}
Index: /trunk/gsdl/macros/dutch.dm
===================================================================
--- /trunk/gsdl/macros/dutch.dm	(revision 11160)
+++ /trunk/gsdl/macros/dutch.dm	(revision 11161)
@@ -520,8 +520,4 @@
 
 
-## "resultaten" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=nl] {_httpimg_/nl/qryresb.gif}
-_widthqryresb_ [l=nl] {_pagewidth_}
-_heightqryresb_ [l=nl] {17}
 
 # -- Missing translation: schhistb
Index: /trunk/gsdl/macros/english.dm
===================================================================
--- /trunk/gsdl/macros/english.dm	(revision 11160)
+++ /trunk/gsdl/macros/english.dm	(revision 11161)
@@ -122,4 +122,6 @@
 _textdescrCaptions_ {Browse by photo captions}
 
+_labelSearch_ {Search}
+
 # Dublin Core Metadata Element Set, Version 1.1
 _labelTitle_ {Titles A-Z}  # Not true DC, kept for legacy reasons
@@ -159,4 +161,5 @@
 _labelCountries_ {Countries}
 
+
 _texticontext_ {View the document}
 _texticonclosedbook_ {open this document and view contents}
@@ -215,25 +218,5 @@
 #------------------------------------------------------------
 
-## "HOME" ## top_nav_button ## chome ##
-_httpiconchomeof_ {_httpimg_/chomeof.gif}
-_httpiconchomeon_ {_httpimg_/chomeon.gif}
-
-## "HELP" ## top_nav_button ## chelp ##
-_httpiconchelpof_ {_httpimg_/chelpof.gif}
-_httpiconchelpon_ {_httpimg_/chelpon.gif}
-
-## "PREFERENCES" ## top_nav_button ## cpref ##
-_httpiconcprefof_ {_httpimg_/cprefof.gif}
-_httpiconcprefon_ {_httpimg_/cprefon.gif}
-
-## "SEND FEEDBACK" ## top_nav_button ## cusab ##
-_httpiconcusabof_ {_httpimg_/cusabof.gif}
-_httpiconcusabon_ {_httpimg_/cusabon.gif}
-
-
-## "search" ## nav_bar_button ## tsrch ##
-_httpicontsrchgr_ {_httpimg_/tsrchgr.gif}
-_httpicontsrchof_ {_httpimg_/tsrchof.gif}
-_httpicontsrchon_ {_httpimg_/tsrchon.gif}
+
 _widthtsrchx_ {87}
 
@@ -242,192 +225,68 @@
 
 # Not true DC, kept for legacy reasons
-## "titles a-z" ## nav_bar_button ## ttitl ##
-_httpiconttitlegr_ {_httpimg_/ttitlgr.gif}
-_httpiconttitleof_ {_httpimg_/ttitlof.gif}
-_httpiconttitleon_ {_httpimg_/ttitlon.gif}
 _widthttitlex_ {87}
 
 # Not true DC, kept for legacy reasons
-## "authors a-z" ## nav_bar_button ## tauth ##
-_httpicontcreatgr_ {_httpimg_/tauthgr.gif}
-_httpicontcreatof_ {_httpimg_/tauthof.gif}
-_httpicontcreaton_ {_httpimg_/tauthon.gif}
 _widthtcreatx_ {87}
 
-## "subjects" ## nav_bar_button ## tsubj ##
-_httpicontsubjgr_ {_httpimg_/tsubjgr.gif}
-_httpicontsubjon_ {_httpimg_/tsubjon.gif}
-_httpicontsubjof_ {_httpimg_/tsubjof.gif}
 _widthtsubjx_ {87}
 
-## "descriptions" ## nav_bar_button ## tdesc ##
-_httpicontdescgr_ {_httpimg_/tdescgr.gif}
-_httpicontdescon_ {_httpimg_/tdescon.gif}
-_httpicontdescof_ {_httpimg_/tdescof.gif}
 _widthtdescx_ {90}
 
-## "publishers" ## nav_bar_button ## tpubl ##
-_httpicontpublgr_ {_httpimg_/tpublgr.gif}
-_httpicontpublon_ {_httpimg_/tpublon.gif}
-_httpicontpublof_ {_httpimg_/tpublof.gif}
 _widthtpublx_ {87}
 
-## "contributors" ## nav_bar_button ## tcontr ##
-_httpicontcontrgr_ {_httpimg_/tcontrgr.gif}
-_httpicontcontron_ {_httpimg_/tcontron.gif}
-_httpicontcontrof_ {_httpimg_/tcontrof.gif}
 _widthtcontrx_ {89}
 
-## "dates" ## nav_bar_button ## tdate ##
-_httpicontdategr_ {_httpimg_/tdategr.gif}
-_httpicontdateof_ {_httpimg_/tdateof.gif}
-_httpicontdateon_ {_httpimg_/tdateon.gif}
 _widthtdatex_ {87}
 
-## "types" ## nav_bar_button ## ttype ##
-_httpiconttypegr_ {_httpimg_/ttypegr.gif}
-_httpiconttypeof_ {_httpimg_/ttypeof.gif}
-_httpiconttypeon_ {_httpimg_/ttypeon.gif}
 _widthttypex_ {87}
 
-## "formats" ## nav_bar_button ## tform ##
-_httpicontformgr_ {_httpimg_/tformgr.gif}
-_httpicontformof_ {_httpimg_/tformof.gif}
-_httpicontformon_ {_httpimg_/tformon.gif}
 _widthtformx_ {87}
 
-## "identifiers" ## nav_bar_button ## tident ##
-_httpicontidentgr_ {_httpimg_/tidentgr.gif}
-_httpicontidentof_ {_httpimg_/tidentof.gif}
-_httpicontidenton_ {_httpimg_/tidenton.gif}
 _widthtidentx_ {87}
 
 # Not true DC, kept for legacy reasons
-## "filenames" ## nav_bar_button ## tsrc ##
-_httpicontsrcgr_ {_httpimg_/tsrcgr.gif}
-_httpicontsrcof_ {_httpimg_/tsrcof.gif}
-_httpicontsrcon_ {_httpimg_/tsrcon.gif}
 _widthtsrcx_ {87}
 
-## "languages" ## nav_bar_button ## tlang ##
-_httpicontlanggr_ {_httpimg_/tlanggr.gif}
-_httpicontlangon_ {_httpimg_/tlangon.gif}
-_httpicontlangof_ {_httpimg_/tlangof.gif}
 _widthtlangx_ {87}
 
-## "relations" ## nav_bar_button ## trel ##
-_httpicontrelgr_ {_httpimg_/trelgr.gif}
-_httpicontrelon_ {_httpimg_/trelon.gif}
-_httpicontrelof_ {_httpimg_/trelof.gif}
 _widthtrelx_ {87}
 
-## "coverage" ## nav_bar_button ## tcover ##
-_httpicontcovergr_ {_httpimg_/tcovergr.gif}
-_httpicontcoveron_ {_httpimg_/tcoveron.gif}
-_httpicontcoverof_ {_httpimg_/tcoverof.gif}
 _widthtcoverx_ {87}
 
-## "rights" ## nav_bar_button ## tright ##
-_httpicontrightgr_ {_httpimg_/trightgr.gif}
-_httpicontrighton_ {_httpimg_/trighton.gif}
-_httpicontrightof_ {_httpimg_/trightof.gif}
 _widthtrightx_ {87}
 
 
 
-## "series" ## nav_bar_button ## tser ##
-_httpicontsergr_ {_httpimg_/tsergr.gif}
-_httpicontserof_ {_httpimg_/tserof.gif}
-_httpicontseron_ {_httpimg_/tseron.gif}
 _widthtserx_ {87}
 
-## "to" ## nav_bar_button ## tto ##
-_httpiconttogr_ {_httpimg_/ttogr.gif}
-_httpiconttoon_ {_httpimg_/ttoon.gif}
-_httpiconttoof_ {_httpimg_/ttoof.gif}
 _widthttox_ {87}
 
-## "from" ## nav_bar_button ## tfrom ##
-_httpicontfromgr_ {_httpimg_/tfromgr.gif}
-_httpicontfromon_ {_httpimg_/tfromon.gif}
-_httpicontfromof_ {_httpimg_/tfromof.gif}
 _widthtfromx_ {87}
 
-## "organisations" ## nav_bar_button ## torg ##
-_httpicontorggr_ {_httpimg_/torggr.gif}
-_httpicontorgon_ {_httpimg_/torgon.gif}
-_httpicontorgof_ {_httpimg_/torgof.gif}
 _widthtorgx_ {98}
 
-## "how to" ## nav_bar_button ## thow ##
-_httpiconthowgr_ {_httpimg_/thowgr.gif}
-_httpiconthowon_ {_httpimg_/thowon.gif}
-_httpiconthowof_ {_httpimg_/thowof.gif}
 _widththowx_ {87}
 
-## "topic" ## nav_bar_button ## ttopic ##
-_httpiconttopicgr_ {_httpimg_/ttopicgr.gif}
-_httpiconttopicon_ {_httpimg_/ttopicon.gif}
-_httpiconttopicof_ {_httpimg_/ttopicof.gif}
 _widthttopicx_ {87}
 
-## "browse" ## nav_bar_button ## tbrwse ##
-_httpicontbrwsegr_ {_httpimg_/tbrwsegr.gif}
-_httpicontbrwseon_ {_httpimg_/tbrwseon.gif}
-_httpicontbrwseof_ {_httpimg_/tbrwseof.gif}
 _widthtbrwsex_ {87}
 
-## "collage" ## nav_bar_button ## tcoll ##
-_httpicontcollgr_ {_httpimg_/tcollgr.gif}
-_httpicontcollof_ {_httpimg_/tcollof.gif}
-_httpicontcollon_ {_httpimg_/tcollon.gif}
 _widthtcollx_ {87}
 
-## "people" ## nav_bar_button ## tpeop ##
-_httpicontpeopgr_ {_httpimg_/tpeopgr.gif}
-_httpicontpeopof_ {_httpimg_/tpeopof.gif}
-_httpicontpeopon_ {_httpimg_/tpeopon.gif}
 _widthtpeopx_ {97}
 
-## "acronyms" ## nav_bar_button ## tacro ##
-_httpicontacrogr_ {_httpimg_/tacrogr.gif}
-_httpicontacroof_ {_httpimg_/tacroof.gif}
-_httpicontacroon_ {_httpimg_/tacroon.gif}
 _widthtacrox_ {87}
 
-## "phrases" ## nav_bar_button ## tphrse ##
-_httpicontphrsegr_ {_httpimg_/tphrsegr.gif}
-_httpicontphrseof_ {_httpimg_/tphrseof.gif}
-_httpicontphrseon_ {_httpimg_/tphrseon.gif}
 _widthtphrsex_ {87}
 
-## "artists" ## nav_bar_button ## tartst ##
-_httpicontartstgr_ {_httpimg_/tartstgr.gif}
-_httpicontartstof_ {_httpimg_/tartstof.gif}
-_httpicontartston_ {_httpimg_/tartston.gif}
 _widthtartstx_ {87}
 
-## "keywords" ## nav_bar_button ## tkw ##
-_httpicontkwgr_ {_httpimg_/tkwgr.gif}
-_httpicontkwof_ {_httpimg_/tkwof.gif}
-_httpicontkwon_ {_httpimg_/tkwon.gif}
 _widthtkwx_ {87}
 
-## "volumes" ## nav_bar_button ## tvol ##
-_httpicontvolgr_ {_httpimg_/tvolgr.gif}
-_httpicontvolof_ {_httpimg_/tvolof.gif}
-_httpicontvolon_ {_httpimg_/tvolon.gif}
 _widthtvolx_ {87}
 
-## "captions" ## nav_bar_button ## tcapt ##
-_httpicontcaptgr_ {_httpimg_/tcaptgr.gif}
-_httpicontcaptof_ {_httpimg_/tcaptof.gif}
-_httpicontcapton_ {_httpimg_/tcapton.gif}
 _widthtcaptx_ {87}
 
-## "countries" ## nav_bar_button ## tcount ##
-_httpicontcountgr_ {_httpimg_/tcountgr.gif}
-_httpicontcountof_ {_httpimg_/tcountof.gif}
-_httpicontcounton_ {_httpimg_/tcounton.gif}
 _widthtcountx_ {87}
 
@@ -636,5 +495,4 @@
 _textnoquerytitle_ {Search page}
 
-_labelSearch_ {search}
 _textsome_ {some}
 _textall_ {all}
@@ -723,8 +581,4 @@
 
 
-## "results" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ {_httpimg_/qryresb.gif}
-_widthqryresb_ {_pagewidth_}
-_heightqryresb_ {17}
 
 ## "history" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/english2.dm
===================================================================
--- /trunk/gsdl/macros/english2.dm	(revision 11160)
+++ /trunk/gsdl/macros/english2.dm	(revision 11161)
@@ -147,33 +147,9 @@
 _textdescrselcol_ {select a collection}
 
-## "The Librarian\nInterface" ## home_page_button ## cgli ##
-_httpiconcgliof_ {_httpimg_/cgliof.gif}
-_httpiconcglion_ {_httpimg_/cglion.gif}
-_widthcgli_ {100}
-
-## "The Collector" ## home_page_button ## ccol ##
-_httpiconccolof_ {_httpimg_/ccolof.gif}
-_httpiconccolon_ {_httpimg_/ccolon.gif}
-_widthccol_ {100}
-
-## "The Translator" ## home_page_button ## ctrans ##
-_httpiconctransof_ {_httpimg_/ctransof.gif}
-_httpiconctranson_ {_httpimg_/ctranson.gif}
-_widthctrans_ {100}
-
-## "Administration\nPage" ## home_page_button ## cadmin ##
-_httpiconcadminof_ {_httpimg_/cadminof.gif}
-_httpiconcadminon_ {_httpimg_/cadminon.gif}
-_widthcadmin_ {100}
-
-## "About\nGreenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ {_httpimg_/cabgsof.gif}
-_httpiconcabgson_ {_httpimg_/cabgson.gif}
-_widthcabgs_ {100}
-
-## "Greenstone\nDocumentation" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ {_httpimg_/cgsdocof.gif}
-_httpiconcgsdocon_ {_httpimg_/cgsdocon.gif}
-_widthcgsdoc_ {100}
+
+
+
+
+
 
 
@@ -700,8 +676,4 @@
 _httpiconncsrceof_ {_httpimg_/ncsrceof.gif}
 
-## "configure\ncollection" ## collector_bar_button ## conf ##
-_httpicongcconfof_ {_httpimg_/gcconfof.gif}
-_httpicongcconfon_ {_httpimg_/gcconfon.gif}
-_httpiconycconfof_ {_httpimg_/ycconfof.gif}
 _httpiconycconfon_ {_httpimg_/ycconfon.gif}
 _httpiconncconfof_ {_httpimg_/ncconfof.gif}
Index: /trunk/gsdl/macros/farsi.dm
===================================================================
--- /trunk/gsdl/macros/farsi.dm	(revision 11160)
+++ /trunk/gsdl/macros/farsi.dm	(revision 11161)
@@ -259,8 +259,4 @@
 #------------------------------------------------------------
 
-## "Ø§Ø±Ø³Ø§Ù ØšØ§Ø²Ø®ÙØ±Ø¯" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=fa] {_httpimg_/fa/cusabof.gif}
-_httpiconcusabon_ [l=fa] {_httpimg_/fa/cusabon.gif}
-
 
 
@@ -654,8 +650,4 @@
 
 
-## "ÙØªØ§ÙØ¬" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=fa] {_httpimg_/fa/qryresb.gif}
-_widthqryresb_ [l=fa] {_pagewidth_}
-_heightqryresb_ [l=fa] {17}
 
 ## "Ø³Ø§ØšÙÙ" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/finnish.dm
===================================================================
--- /trunk/gsdl/macros/finnish.dm	(revision 11160)
+++ /trunk/gsdl/macros/finnish.dm	(revision 11161)
@@ -180,8 +180,4 @@
 # icons
 #------------------------------------------------------------
-
-## "LÃHETÃ PALUTETTA" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=fi] {_httpimg_/fi/cusabof.gif}
-_httpiconcusabon_ [l=fi] {_httpimg_/fi/cusabon.gif}
 
 
@@ -503,8 +499,4 @@
 
 
-## "tulokset" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=fi] {_httpimg_/fi/qryresb.gif}
-_widthqryresb_ [l=fi] {_pagewidth_}
-_heightqryresb_ [l=fi] {17}
 
 ## "historia" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/french.dm
===================================================================
--- /trunk/gsdl/macros/french.dm	(revision 11160)
+++ /trunk/gsdl/macros/french.dm	(revision 11161)
@@ -188,8 +188,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ENVOYER FEEDBACK" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=fr] {_httpimg_/fr/cusabof.gif}
-_httpiconcusabon_ [l=fr] {_httpimg_/fr/cusabon.gif}
 
 
@@ -506,8 +502,4 @@
 
 
-## "rÃ©sultats" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=fr] {_httpimg_/fr/qryresb.gif}
-_widthqryresb_ [l=fr] {_pagewidth_}
-_heightqryresb_ [l=fr] {17}
 
 ## "historique" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/french2.dm
===================================================================
--- /trunk/gsdl/macros/french2.dm	(revision 11160)
+++ /trunk/gsdl/macros/french2.dm	(revision 11161)
@@ -161,33 +161,9 @@
 _textdescrselcol_ [l=fr] {sÃ©lectionnez une collection}
 
-## "l'Interface\nBibliothÃ©caire\nde Greenstone" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=fr] {_httpimg_/fr/cgliof.gif}
-_httpiconcglion_ [l=fr] {_httpimg_/fr/cglion.gif}
-_widthcgli_ [l=fr] {100}
-
-## "Le Collector" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=fr] {_httpimg_/fr/ccolof.gif}
-_httpiconccolon_ [l=fr] {_httpimg_/fr/ccolon.gif}
-_widthccol_ [l=fr] {100}
-
-## "Le Traducteur" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=fr] {_httpimg_/fr/ctransof.gif}
-_httpiconctranson_ [l=fr] {_httpimg_/fr/ctranson.gif}
-_widthctrans_ [l=fr] {100}
-
-## "Page\nd'Administration" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=fr] {_httpimg_/fr/cadminof.gif}
-_httpiconcadminon_ [l=fr] {_httpimg_/fr/cadminon.gif}
-_widthcadmin_ [l=fr] {100}
-
-## "Ã Propos\nde Greenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=fr] {_httpimg_/fr/cabgsof.gif}
-_httpiconcabgson_ [l=fr] {_httpimg_/fr/cabgson.gif}
-_widthcabgs_ [l=fr] {100}
-
-## "Documentation\nGreenstone" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=fr] {_httpimg_/fr/cgsdocof.gif}
-_httpiconcgsdocon_ [l=fr] {_httpimg_/fr/cgsdocon.gif}
-_widthcgsdoc_ [l=fr] {100}
+
+
+
+
+
 
 
@@ -803,8 +779,4 @@
 _httpiconncsrceof_ [l=fr] {_httpimg_/fr/ncsrceof.gif}
 
-## "configurer\nla collection" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=fr] {_httpimg_/fr/gcconfof.gif}
-_httpicongcconfon_ [l=fr] {_httpimg_/fr/gcconfon.gif}
-_httpiconycconfof_ [l=fr] {_httpimg_/fr/ycconfof.gif}
 _httpiconycconfon_ [l=fr] {_httpimg_/fr/ycconfon.gif}
 _httpiconncconfof_ [l=fr] {_httpimg_/fr/ncconfof.gif}
Index: /trunk/gsdl/macros/galician.dm
===================================================================
--- /trunk/gsdl/macros/galician.dm	(revision 11160)
+++ /trunk/gsdl/macros/galician.dm	(revision 11161)
@@ -519,8 +519,4 @@
 
 
-## "resultados" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=gl] {_httpimg_/gl/qryresb.gif}
-_widthqryresb_ [l=gl] {_pagewidth_}
-_heightqryresb_ [l=gl] {17}
 
 ## "historial" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/galician2.dm
===================================================================
--- /trunk/gsdl/macros/galician2.dm	(revision 11160)
+++ /trunk/gsdl/macros/galician2.dm	(revision 11161)
@@ -808,8 +808,4 @@
 _httpiconncsrceof_ [l=gl] {_httpimg_/gl/ncsrceof.gif}
 
-## "configurar\na colecciÃ³n" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=gl] {_httpimg_/gl/gcconfof.gif}
-_httpicongcconfon_ [l=gl] {_httpimg_/gl/gcconfon.gif}
-_httpiconycconfof_ [l=gl] {_httpimg_/gl/ycconfof.gif}
 _httpiconycconfon_ [l=gl] {_httpimg_/gl/ycconfon.gif}
 _httpiconncconfof_ [l=gl] {_httpimg_/gl/ncconfof.gif}
Index: /trunk/gsdl/macros/georgian.dm
===================================================================
--- /trunk/gsdl/macros/georgian.dm	(revision 11160)
+++ /trunk/gsdl/macros/georgian.dm	(revision 11161)
@@ -181,8 +181,4 @@
 # icons
 #------------------------------------------------------------
-
-## "á£áá£áááášáá á" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=ka] {_httpimg_/ka/cusabof.gif}
-_httpiconcusabon_ [l=ka] {_httpimg_/ka/cusabon.gif}
 
 
@@ -503,8 +499,4 @@
 
 
-## "ášááááá" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=ka] {_httpimg_/ka/qryresb.gif}
-_widthqryresb_ [l=ka] {_pagewidth_}
-_heightqryresb_ [l=ka] {17}
 
 ## "áá á¥ááá" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/georgian2.dm
===================================================================
--- /trunk/gsdl/macros/georgian2.dm	(revision 11160)
+++ /trunk/gsdl/macros/georgian2.dm	(revision 11161)
@@ -102,8 +102,4 @@
 _textdescrselcol_ [l=ka] {ááá á©ááá ááááá¥áªáá}
 
-## "á¡ááááááááááá\nááá¢áá á€ááá¡á" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=ka] {_httpimg_/ka/cgliof.gif}
-_httpiconcglion_ [l=ka] {_httpimg_/ka/cglion.gif}
-_widthcgli_ [l=ka] {100}
 
 # -- Missing translation: ccol
@@ -112,8 +108,4 @@
 # -- Missing translation: _widthccol_
 
-## "á¢á ááá¡ááá¢áá á" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=ka] {_httpimg_/ka/ctransof.gif}
-_httpiconctranson_ [l=ka] {_httpimg_/ka/ctranson.gif}
-_widthctrans_ [l=ka] {100}
 
 # -- Missing translation: cadmin
@@ -525,8 +517,4 @@
 _httpiconncsrceof_ [l=ka] {_httpimg_/ka/ncsrceof.gif}
 
-## "ááááá¥áªááá¡\náááá€ááá£á ááªáá" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=ka] {_httpimg_/ka/gcconfof.gif}
-_httpicongcconfon_ [l=ka] {_httpimg_/ka/gcconfon.gif}
-_httpiconycconfof_ [l=ka] {_httpimg_/ka/ycconfof.gif}
 _httpiconycconfon_ [l=ka] {_httpimg_/ka/ycconfon.gif}
 _httpiconncconfof_ [l=ka] {_httpimg_/ka/ncconfof.gif}
Index: /trunk/gsdl/macros/german.dm
===================================================================
--- /trunk/gsdl/macros/german.dm	(revision 11160)
+++ /trunk/gsdl/macros/german.dm	(revision 11161)
@@ -525,8 +525,4 @@
 
 
-## "resultate" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=de] {_httpimg_/de/qryresb.gif}
-_widthqryresb_ [l=de] {_pagewidth_}
-_heightqryresb_ [l=de] {17}
 
 # -- Missing translation: schhistb
Index: /trunk/gsdl/macros/greek.dm
===================================================================
--- /trunk/gsdl/macros/greek.dm	(revision 11160)
+++ /trunk/gsdl/macros/greek.dm	(revision 11161)
@@ -234,8 +234,4 @@
 #------------------------------------------------------------
 
-## "Î£Î€ÎÎÎÎ€Î ÎÎÎ£ Î€Î ÎÎÎ©ÎÎ Î£ÎÎ£" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=el] {_httpimg_/el/cusabof.gif}
-_httpiconcusabon_ [l=el] {_httpimg_/el/cusabon.gif}
-
 
 
@@ -613,8 +609,4 @@
 
 
-## "Î±ÏÎ¿ÏÎµÎ»Î­ÏÎŒÎ±ÏÎ±" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=el] {_httpimg_/el/qryresb.gif}
-_widthqryresb_ [l=el] {_pagewidth_}
-_heightqryresb_ [l=el] {17}
 
 ## "Î¹ÏÏÎ¿ÏÎ¹ÎºÏ" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/hebrew.dm
===================================================================
--- /trunk/gsdl/macros/hebrew.dm	(revision 11160)
+++ /trunk/gsdl/macros/hebrew.dm	(revision 11161)
@@ -515,8 +515,4 @@
 
 
-## "×ª×××Š××ª" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=he] {_httpimg_/he/qryresb.gif}
-_widthqryresb_ [l=he] {_pagewidth_}
-_heightqryresb_ [l=he] {17}
 
 ## "×××š×××¡×" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/home.dm
===================================================================
--- /trunk/gsdl/macros/home.dm	(revision 11160)
+++ /trunk/gsdl/macros/home.dm	(revision 11161)
@@ -41,15 +41,18 @@
 # Buttons for the pane after the collections and before the text
 
-_imagegli_ {_gsimage_(_httppagegli_,_home:httpiconcgliof_,_home:httpiconcglion_,gli,_gli:textgli_)}
-
-_imagecollector_ {_gsimage_(_httppagecollector_,_home:httpiconccolof_,_home:httpiconccolon_,col,_collector:textcollector_)}
-
-_imagetranslator_ {_gsimage_(_httppagetranslator_,_home:httpiconctransof_,_home:httpiconctranson_,trans,_translang:texttranslator_)}
-
-_imageadmin_ {_gsimage_(_httppagestatus_,_home:httpiconcadminof_,_home:httpiconcadminon_,admin,_home:textadmin_)}
-
-_imagegogreenstone_ {_gsimage_(_home:httppagegsdl_,_home:httpiconcabgsof_,_home:httpiconcabgson_,gogs,_home:textabgs_)}
-
-_imagegodocs_ {_gsimage_(_home:httppagedocs_,_home:httpiconcgsdocof_,_home:httpiconcgsdocon_,docs,_home:textgsdocs_)}
+_button_ {<div class="button"><span class="button" title="_3_"><a href="_1_">_2_</a></span></div>
+}
+
+_imagegli_ {_button_(_httppagegli_,_gli:textgli_,_gli:textglilong_)}
+
+_imagecollector_ {_button_(_httppagecollector_,_collector:textcollector_,_collector::textcollector_)}
+
+_imagetranslator_ {_button_(_httppagetranslator_,_translang:texttranslator_)}
+
+_imageadmin_ {_button_(_httppagestatus_,_home:textadmin_,_home:textadmin_)}
+
+_imagegogreenstone_ {_button_(_home:httppagegsdl_,_home:textabgs_,_home:textabgs_)}
+
+_imagegodocs_ {_button_(_home:httppagedocs_,_home:textgsdocs_,_home:textgsdocs_)}
 
 
Index: /trunk/gsdl/macros/indo.dm
===================================================================
--- /trunk/gsdl/macros/indo.dm	(revision 11160)
+++ /trunk/gsdl/macros/indo.dm	(revision 11161)
@@ -180,8 +180,4 @@
 # icons
 #------------------------------------------------------------
-
-## "KIRIM UMPAN BALIK" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=id] {_httpimg_/id/cusabof.gif}
-_httpiconcusabon_ [l=id] {_httpimg_/id/cusabon.gif}
 
 
@@ -487,8 +483,4 @@
 
 
-## "Hasil" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=id] {_httpimg_/id/qryresb.gif}
-_widthqryresb_ [l=id] {_pagewidth_}
-_heightqryresb_ [l=id] {17}
 
 ## "Riwayat\n" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/italian.dm
===================================================================
--- /trunk/gsdl/macros/italian.dm	(revision 11160)
+++ /trunk/gsdl/macros/italian.dm	(revision 11161)
@@ -183,8 +183,4 @@
 # icons
 #------------------------------------------------------------
-
-## "INVIA FEEDBACK" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=it] {_httpimg_/it/cusabof.gif}
-_httpiconcusabon_ [l=it] {_httpimg_/it/cusabon.gif}
 
 
@@ -507,8 +503,4 @@
 
 
-## "risultati" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=it] {_httpimg_/it/qryresb.gif}
-_widthqryresb_ [l=it] {_pagewidth_}
-_heightqryresb_ [l=it] {17}
 
 ## "storico" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/italian2.dm
===================================================================
--- /trunk/gsdl/macros/italian2.dm	(revision 11160)
+++ /trunk/gsdl/macros/italian2.dm	(revision 11161)
@@ -103,8 +103,4 @@
 _textdescrselcol_ [l=it] {scegli una collezione}
 
-## "Interfaccia\nbibliotecario" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=it] {_httpimg_/it/cgliof.gif}
-_httpiconcglion_ [l=it] {_httpimg_/it/cglion.gif}
-_widthcgli_ [l=it] {100}
 
 # -- Missing translation: ccol
@@ -113,8 +109,4 @@
 # -- Missing translation: _widthccol_
 
-## "Il traduttore" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=it] {_httpimg_/it/ctransof.gif}
-_httpiconctranson_ [l=it] {_httpimg_/it/ctranson.gif}
-_widthctrans_ [l=it] {100}
 
 # -- Missing translation: cadmin
@@ -500,8 +492,4 @@
 _httpiconncsrceof_ [l=it] {_httpimg_/it/ncsrceof.gif}
 
-## "configura\nla collezione" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=it] {_httpimg_/it/gcconfof.gif}
-_httpicongcconfon_ [l=it] {_httpimg_/it/gcconfon.gif}
-_httpiconycconfof_ [l=it] {_httpimg_/it/ycconfof.gif}
 _httpiconycconfon_ [l=it] {_httpimg_/it/ycconfon.gif}
 _httpiconncconfof_ [l=it] {_httpimg_/it/ncconfof.gif}
Index: /trunk/gsdl/macros/japanese.dm
===================================================================
--- /trunk/gsdl/macros/japanese.dm	(revision 11160)
+++ /trunk/gsdl/macros/japanese.dm	(revision 11161)
@@ -184,8 +184,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ãã£ãŒãããã¯ãéã" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=ja] {_httpimg_/ja/cusabof.gif}
-_httpiconcusabon_ [l=ja] {_httpimg_/ja/cusabon.gif}
 
 
@@ -532,8 +528,4 @@
 
 
-## "çµæ" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=ja] {_httpimg_/ja/qryresb.gif}
-_widthqryresb_ [l=ja] {_pagewidth_}
-_heightqryresb_ [l=ja] {17}
 
 ## "å±¥æ­Ž" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/kazakh.dm
===================================================================
--- /trunk/gsdl/macros/kazakh.dm	(revision 11160)
+++ /trunk/gsdl/macros/kazakh.dm	(revision 11161)
@@ -183,8 +183,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ÒÐÐÐ¢Ð«Ð ÐÐÐÐ£ ÐÐÐÐÐÐÐ«Ð¡Ð«Ð ÐÐÐÐÐ Ð£" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=kk] {_httpimg_/kk/cusabof.gif}
-_httpiconcusabon_ [l=kk] {_httpimg_/kk/cusabon.gif}
 
 
@@ -489,8 +485,4 @@
 
 
-## "ÐœÓÑÐžÐ¶ÐµÐ»ÐµÑ" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=kk] {_httpimg_/kk/qryresb.gif}
-_widthqryresb_ [l=kk] {_pagewidth_}
-_heightqryresb_ [l=kk] {17}
 
 ## "ÑÐ°ÑÐžÑ
Index: /trunk/gsdl/macros/kazakh2.dm
===================================================================
--- /trunk/gsdl/macros/kazakh2.dm	(revision 11160)
+++ /trunk/gsdl/macros/kazakh2.dm	(revision 11161)
@@ -108,34 +108,9 @@
 _textdescrselcol_ [l=kk] {ÐÐžÐœÐ°ÒÑÑ ÑÐ°Ò£ÐŽÐ°Ò£ÑÐ·}
 
-## "ÐÑÑÐ°Ð¿Ñ
-Ð°ÐœÐ°Ð»ÑÒ\nÐžÐœÑÐµÑÑÐµÐ¹Ñ" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=kk] {_httpimg_/kk/cgliof.gif}
-_httpiconcglion_ [l=kk] {_httpimg_/kk/cglion.gif}
-_widthcgli_ [l=kk] {100}
-
-## "ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑ" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=kk] {_httpimg_/kk/ccolof.gif}
-_httpiconccolon_ [l=kk] {_httpimg_/kk/ccolon.gif}
-_widthccol_ [l=kk] {100}
-
-## "ÐÑÐŽÐ°ÑÐŒÐ°ÑÑ\n(ÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ)" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=kk] {_httpimg_/kk/ctransof.gif}
-_httpiconctranson_ [l=kk] {_httpimg_/kk/ctranson.gif}
-_widthctrans_ [l=kk] {100}
-
-## "ÐÐŽÐŒÐžÐœÐžÑÑÑÐ°ÑÐžÐ²ÑÑÐº\nÐ¿Ð°ÑÐ°Ò" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=kk] {_httpimg_/kk/cadminof.gif}
-_httpiconcadminon_ [l=kk] {_httpimg_/kk/cadminon.gif}
-_widthcadmin_ [l=kk] {100}
-
-## "Greenstone\nÑÑÑÐ°Ð»Ñ" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=kk] {_httpimg_/kk/cabgsof.gif}
-_httpiconcabgson_ [l=kk] {_httpimg_/kk/cabgson.gif}
-_widthcabgs_ [l=kk] {100}
-
-## "Greenstone\nÒÒ±Ð¶Ð°ÑÑÐ°ÐŒÐ°ÑÑ" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=kk] {_httpimg_/kk/cgsdocof.gif}
-_httpiconcgsdocon_ [l=kk] {_httpimg_/kk/cgsdocon.gif}
-_widthcgsdoc_ [l=kk] {100}
+
+
+
+
+
 
 
@@ -466,8 +441,4 @@
 _httpiconncsrceof_ [l=kk] {_httpimg_/kk/ncsrceof.gif}
 
-## "ÐÐžÐœÐ°Ò\nÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÑÑÑ" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=kk] {_httpimg_/kk/gcconfof.gif}
-_httpicongcconfon_ [l=kk] {_httpimg_/kk/gcconfon.gif}
-_httpiconycconfof_ [l=kk] {_httpimg_/kk/ycconfof.gif}
 _httpiconycconfon_ [l=kk] {_httpimg_/kk/ycconfon.gif}
 _httpiconncconfof_ [l=kk] {_httpimg_/kk/ncconfof.gif}
Index: /trunk/gsdl/macros/kirghiz.dm
===================================================================
--- /trunk/gsdl/macros/kirghiz.dm	(revision 11160)
+++ /trunk/gsdl/macros/kirghiz.dm	(revision 11161)
@@ -181,8 +181,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ÐÐÐ¢ ÐÐÐÐ£Ð£" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=ky] {_httpimg_/ky/cusabof.gif}
-_httpiconcusabon_ [l=ky] {_httpimg_/ky/cusabon.gif}
 
 
@@ -488,8 +484,4 @@
 
 
-## "ÐœÐ°ÑÑÐ¹Ð¶Ð°" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=ky] {_httpimg_/ky/qryresb.gif}
-_widthqryresb_ [l=ky] {_pagewidth_}
-_heightqryresb_ [l=ky] {17}
 
 ## "ÑÐ°ÑÑÑ
Index: /trunk/gsdl/macros/maori.dm
===================================================================
--- /trunk/gsdl/macros/maori.dm	(revision 11160)
+++ /trunk/gsdl/macros/maori.dm	(revision 11161)
@@ -182,8 +182,4 @@
 # icons
 #------------------------------------------------------------
-
-## "WHAKAHOKI KÅRERO MAI" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=mi] {_httpimg_/mi/cusabof.gif}
-_httpiconcusabon_ [l=mi] {_httpimg_/mi/cusabon.gif}
 
 
@@ -504,8 +500,4 @@
 
 
-## "kitenga" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=mi] {_httpimg_/mi/qryresb.gif}
-_widthqryresb_ [l=mi] {_pagewidth_}
-_heightqryresb_ [l=mi] {17}
 
 ## "hÄ«tori" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/polish.dm
===================================================================
--- /trunk/gsdl/macros/polish.dm	(revision 11160)
+++ /trunk/gsdl/macros/polish.dm	(revision 11161)
@@ -235,8 +235,4 @@
 #------------------------------------------------------------
 
-## "WYÅLIJ UWAGI" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=pl] {_httpimg_/pl/cusabof.gif}
-_httpiconcusabon_ [l=pl] {_httpimg_/pl/cusabon.gif}
-
 
 
@@ -564,8 +560,4 @@
 
 
-## "wyniki" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=pl] {_httpimg_/pl/qryresb.gif}
-_widthqryresb_ [l=pl] {_pagewidth_}
-_heightqryresb_ [l=pl] {17}
 
 ## "historia" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/port-br.dm
===================================================================
--- /trunk/gsdl/macros/port-br.dm	(revision 11160)
+++ /trunk/gsdl/macros/port-br.dm	(revision 11161)
@@ -526,8 +526,4 @@
 
 
-## "resultados" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=pt-br] {_httpimg_/pt-br/qryresb.gif}
-_widthqryresb_ [l=pt-br] {_pagewidth_}
-_heightqryresb_ [l=pt-br] {17}
 
 # -- Missing translation: schhistb
Index: /trunk/gsdl/macros/port-pt.dm
===================================================================
--- /trunk/gsdl/macros/port-pt.dm	(revision 11160)
+++ /trunk/gsdl/macros/port-pt.dm	(revision 11161)
@@ -180,8 +180,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ENVIAR NOTA" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=pt-pt] {_httpimg_/pt-pt/cusabof.gif}
-_httpiconcusabon_ [l=pt-pt] {_httpimg_/pt-pt/cusabon.gif}
 
 
@@ -510,8 +506,4 @@
 
 
-## "resultados" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=pt-pt] {_httpimg_/pt-pt/qryresb.gif}
-_widthqryresb_ [l=pt-pt] {_pagewidth_}
-_heightqryresb_ [l=pt-pt] {17}
 
 ## "histÃ³rico" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/russian.dm
===================================================================
--- /trunk/gsdl/macros/russian.dm	(revision 11160)
+++ /trunk/gsdl/macros/russian.dm	(revision 11161)
@@ -185,8 +185,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ÐÐ¡ÐÐÐÐ¬ÐÐÐÐÐ¢Ð¬ ÐÐÐ ÐÐ¢ÐÐ£Ð® Ð¡ÐÐ¯ÐÐ¬" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=ru] {_httpimg_/ru/cusabof.gif}
-_httpiconcusabon_ [l=ru] {_httpimg_/ru/cusabon.gif}
 
 
@@ -498,8 +494,4 @@
 
 
-## "ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=ru] {_httpimg_/ru/qryresb.gif}
-_widthqryresb_ [l=ru] {_pagewidth_}
-_heightqryresb_ [l=ru] {17}
 
 ## "ÐžÑÑÐŸÑÐžÑ" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/russian2.dm
===================================================================
--- /trunk/gsdl/macros/russian2.dm	(revision 11160)
+++ /trunk/gsdl/macros/russian2.dm	(revision 11161)
@@ -131,33 +131,9 @@
 _textdescrselcol_ [l=ru] {ÐÑÐ±ÐµÑÐžÑÐµ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ}
 
-## "The Librarian\nInterface" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=ru] {_httpimg_/ru/cgliof.gif}
-_httpiconcglion_ [l=ru] {_httpimg_/ru/cglion.gif}
-_widthcgli_ [l=ru] {100}
-
-## "ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑ" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=ru] {_httpimg_/ru/ccolof.gif}
-_httpiconccolon_ [l=ru] {_httpimg_/ru/ccolon.gif}
-_widthccol_ [l=ru] {100}
-
-## "Ð¢ÑÐ°ÐœÑÐ»ÑÑÐŸÑ" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=ru] {_httpimg_/ru/ctransof.gif}
-_httpiconctranson_ [l=ru] {_httpimg_/ru/ctranson.gif}
-_widthctrans_ [l=ru] {100}
-
-## "Administration\nPage" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=ru] {_httpimg_/ru/cadminof.gif}
-_httpiconcadminon_ [l=ru] {_httpimg_/ru/cadminon.gif}
-_widthcadmin_ [l=ru] {100}
-
-## "About\nGreenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=ru] {_httpimg_/ru/cabgsof.gif}
-_httpiconcabgson_ [l=ru] {_httpimg_/ru/cabgson.gif}
-_widthcabgs_ [l=ru] {100}
-
-## "Greenstone\nDocumentation" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=ru] {_httpimg_/ru/cgsdocof.gif}
-_httpiconcgsdocon_ [l=ru] {_httpimg_/ru/cgsdocon.gif}
-_widthcgsdoc_ [l=ru] {100}
+
+
+
+
+
 
 
@@ -540,8 +516,4 @@
 _httpiconncsrceof_ [l=ru] {_httpimg_/ru/ncsrceof.gif}
 
-## "configure\ncollection" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=ru] {_httpimg_/ru/gcconfof.gif}
-_httpicongcconfon_ [l=ru] {_httpimg_/ru/gcconfon.gif}
-_httpiconycconfof_ [l=ru] {_httpimg_/ru/ycconfof.gif}
 _httpiconycconfon_ [l=ru] {_httpimg_/ru/ycconfon.gif}
 _httpiconncconfof_ [l=ru] {_httpimg_/ru/ncconfof.gif}
Index: /trunk/gsdl/macros/serbian.dm
===================================================================
--- /trunk/gsdl/macros/serbian.dm	(revision 11160)
+++ /trunk/gsdl/macros/serbian.dm	(revision 11161)
@@ -188,8 +188,4 @@
 #------------------------------------------------------------
 
-## "POÅ ALJI POVRATNU INFORMACIJU" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=sr] {_httpimg_/sr/cusabof.gif}
-_httpiconcusabon_ [l=sr] {_httpimg_/sr/cusabon.gif}
-
 
 
@@ -514,8 +510,4 @@
 
 
-## "rezultati" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=sr] {_httpimg_/sr/qryresb.gif}
-_widthqryresb_ [l=sr] {_pagewidth_}
-_heightqryresb_ [l=sr] {17}
 
 ## "prethodna pretraÅŸivanja" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/spanish.dm
===================================================================
--- /trunk/gsdl/macros/spanish.dm	(revision 11160)
+++ /trunk/gsdl/macros/spanish.dm	(revision 11161)
@@ -187,8 +187,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ENVIAR COMENTARIOS" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=es] {_httpimg_/es/cusabof.gif}
-_httpiconcusabon_ [l=es] {_httpimg_/es/cusabon.gif}
 
 
@@ -504,8 +500,4 @@
 
 
-## "resultados" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=es] {_httpimg_/es/qryresb.gif}
-_widthqryresb_ [l=es] {_pagewidth_}
-_heightqryresb_ [l=es] {17}
 
 ## "historial" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/spanish2.dm
===================================================================
--- /trunk/gsdl/macros/spanish2.dm	(revision 11160)
+++ /trunk/gsdl/macros/spanish2.dm	(revision 11161)
@@ -156,33 +156,9 @@
 _textdescrselcol_ [l=es] {seleccionar una colecciÃ³n}
 
-## "Interfaz de la\nBiblioteca Digital\nGreenstone" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=es] {_httpimg_/es/cgliof.gif}
-_httpiconcglion_ [l=es] {_httpimg_/es/cglion.gif}
-_widthcgli_ [l=es] {100}
-
-## "El Colector" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=es] {_httpimg_/es/ccolof.gif}
-_httpiconccolon_ [l=es] {_httpimg_/es/ccolon.gif}
-_widthccol_ [l=es] {100}
-
-## "El traductor" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=es] {_httpimg_/es/ctransof.gif}
-_httpiconctranson_ [l=es] {_httpimg_/es/ctranson.gif}
-_widthctrans_ [l=es] {100}
-
-## "PÃ¡gina de\nadministraciÃ³n" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=es] {_httpimg_/es/cadminof.gif}
-_httpiconcadminon_ [l=es] {_httpimg_/es/cadminon.gif}
-_widthcadmin_ [l=es] {100}
-
-## "Acerca\nde Greenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=es] {_httpimg_/es/cabgsof.gif}
-_httpiconcabgson_ [l=es] {_httpimg_/es/cabgson.gif}
-_widthcabgs_ [l=es] {100}
-
-## "DocumentaciÃ³n\nde Greenstone" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=es] {_httpimg_/es/cgsdocof.gif}
-_httpiconcgsdocon_ [l=es] {_httpimg_/es/cgsdocon.gif}
-_widthcgsdoc_ [l=es] {100}
+
+
+
+
+
 
 
@@ -842,8 +818,4 @@
 _httpiconncsrceof_ [l=es] {_httpimg_/es/ncsrceof.gif}
 
-## "configurar\nla colecciÃ³n" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=es] {_httpimg_/es/gcconfof.gif}
-_httpicongcconfon_ [l=es] {_httpimg_/es/gcconfon.gif}
-_httpiconycconfof_ [l=es] {_httpimg_/es/ycconfof.gif}
 _httpiconycconfon_ [l=es] {_httpimg_/es/ycconfon.gif}
 _httpiconncconfof_ [l=es] {_httpimg_/es/ncconfof.gif}
Index: /trunk/gsdl/macros/thai.dm
===================================================================
--- /trunk/gsdl/macros/thai.dm	(revision 11160)
+++ /trunk/gsdl/macros/thai.dm	(revision 11161)
@@ -180,8 +180,4 @@
 # icons
 #------------------------------------------------------------
-
-## "àžªà¹àžàžàž¥àžªàž°àžà¹àž­àžàžàž¥àž±àž" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=th] {_httpimg_/th/cusabof.gif}
-_httpiconcusabon_ [l=th] {_httpimg_/th/cusabon.gif}
 
 
@@ -508,8 +504,4 @@
 
 
-## "àžàž¥àž¥àž±àžàžà¹" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=th] {_httpimg_/th/qryresb.gif}
-_widthqryresb_ [l=th] {_pagewidth_}
-_heightqryresb_ [l=th] {17}
 
 ## "àžàž£àž°àž§àž±àžàžŽ" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/turkish.dm
===================================================================
--- /trunk/gsdl/macros/turkish.dm	(revision 11160)
+++ /trunk/gsdl/macros/turkish.dm	(revision 11161)
@@ -182,8 +182,4 @@
 # icons
 #------------------------------------------------------------
-
-## "GERÄ°BÄ°LDÄ°RÄ°M" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=tr] {_httpimg_/tr/cusabof.gif}
-_httpiconcusabon_ [l=tr] {_httpimg_/tr/cusabon.gif}
 
 
@@ -509,8 +505,4 @@
 
 
-## "sonuÃ§lar" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=tr] {_httpimg_/tr/qryresb.gif}
-_widthqryresb_ [l=tr] {_pagewidth_}
-_heightqryresb_ [l=tr] {17}
 
 ## "geÃ§miÅ aramalar" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/ukrainian.dm
===================================================================
--- /trunk/gsdl/macros/ukrainian.dm	(revision 11160)
+++ /trunk/gsdl/macros/ukrainian.dm	(revision 11161)
@@ -184,8 +184,4 @@
 # icons
 #------------------------------------------------------------
-
-## "ÐÐÐšÐÐ¢Ð¬ ÐÐÐ" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=uk] {_httpimg_/uk/cusabof.gif}
-_httpiconcusabon_ [l=uk] {_httpimg_/uk/cusabon.gif}
 
 
@@ -515,8 +511,4 @@
 
 
-## "ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐž" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=uk] {_httpimg_/uk/qryresb.gif}
-_widthqryresb_ [l=uk] {_pagewidth_}
-_heightqryresb_ [l=uk] {17}
 
 ## "ÑÑÑÐŸÑÑÑ" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/vietnamese.dm
===================================================================
--- /trunk/gsdl/macros/vietnamese.dm	(revision 11160)
+++ /trunk/gsdl/macros/vietnamese.dm	(revision 11161)
@@ -182,8 +182,4 @@
 # icons
 #------------------------------------------------------------
-
-## "Pháº£n há»i" ## top_nav_button ## cusab ##
-_httpiconcusabof_ [l=vi] {_httpimg_/vi/cusabof.gif}
-_httpiconcusabon_ [l=vi] {_httpimg_/vi/cusabon.gif}
 
 
@@ -505,8 +501,4 @@
 
 
-## "cÃ¡c káº¿t quáº£" ## green_bar_left_aligned ## qryresb ##
-_httpiconqryresb_ [l=vi] {_httpimg_/vi/qryresb.gif}
-_widthqryresb_ [l=vi] {_pagewidth_}
-_heightqryresb_ [l=vi] {17}
 
 ## "lá»ch sá»­" ## green_bar_left_aligned ## schhistb ##
Index: /trunk/gsdl/macros/vietnamese2.dm
===================================================================
--- /trunk/gsdl/macros/vietnamese2.dm	(revision 11160)
+++ /trunk/gsdl/macros/vietnamese2.dm	(revision 11161)
@@ -99,33 +99,9 @@
 _textdescrselcol_ [l=vi] {chá»n má»t bá» sÆ°u táº­p}
 
-## "Giao diá»n thá»§ thÆ°" ## home_page_button ## cgli ##
-_httpiconcgliof_ [l=vi] {_httpimg_/vi/cgliof.gif}
-_httpiconcglion_ [l=vi] {_httpimg_/vi/cglion.gif}
-_widthcgli_ [l=vi] {100}
-
-## "Táº¡o bá» sÆ°u táº­p" ## home_page_button ## ccol ##
-_httpiconccolof_ [l=vi] {_httpimg_/vi/ccolof.gif}
-_httpiconccolon_ [l=vi] {_httpimg_/vi/ccolon.gif}
-_widthccol_ [l=vi] {100}
-
-## "Chuyá»n ngá»¯" ## home_page_button ## ctrans ##
-_httpiconctransof_ [l=vi] {_httpimg_/vi/ctransof.gif}
-_httpiconctranson_ [l=vi] {_httpimg_/vi/ctranson.gif}
-_widthctrans_ [l=vi] {100}
-
-## "Trang quáº£n trá»" ## home_page_button ## cadmin ##
-_httpiconcadminof_ [l=vi] {_httpimg_/vi/cadminof.gif}
-_httpiconcadminon_ [l=vi] {_httpimg_/vi/cadminon.gif}
-_widthcadmin_ [l=vi] {100}
-
-## "Giá»i thiá»u\nGreenstone" ## home_page_button ## cabgs ##
-_httpiconcabgsof_ [l=vi] {_httpimg_/vi/cabgsof.gif}
-_httpiconcabgson_ [l=vi] {_httpimg_/vi/cabgson.gif}
-_widthcabgs_ [l=vi] {100}
-
-## "TÃ i liá»u\nGreenstone" ## home_page_button ## cgsdoc ##
-_httpiconcgsdocof_ [l=vi] {_httpimg_/vi/cgsdocof.gif}
-_httpiconcgsdocon_ [l=vi] {_httpimg_/vi/cgsdocon.gif}
-_widthcgsdoc_ [l=vi] {100}
+
+
+
+
+
 
 
@@ -519,8 +495,4 @@
 _httpiconncsrceof_ [l=vi] {_httpimg_/vi/ncsrceof.gif}
 
-## "cáº¥u hÃ¬nh bá»\nsÆ°u táº­p" ## collector_bar_button ## conf ##
-_httpicongcconfof_ [l=vi] {_httpimg_/vi/gcconfof.gif}
-_httpicongcconfon_ [l=vi] {_httpimg_/vi/gcconfon.gif}
-_httpiconycconfof_ [l=vi] {_httpimg_/vi/ycconfof.gif}
 _httpiconycconfon_ [l=vi] {_httpimg_/vi/ycconfon.gif}
 _httpiconncconfof_ [l=vi] {_httpimg_/vi/ncconfof.gif}
