Changeset 19029 for documented-example-collections/trunk/garish-e

Timestamp:

2009-04-17T11:00:54+12:00 (15 years ago)

Author:

kjdon

Message:

updated extra.dm and collect.cfg for current macros, matching extra and the description, changing paths to work with the collection inside a collect group

Location:

documented-example-collections/trunk/garish-e

Files:

• etc/collect.cfg (modified) (25 diffs)
• macros/extra.dm (modified) (10 diffs)

documented-example-collections/trunk/garish-e/etc/collect.cfg

@@ -139 +139 @@
 The appearance of Greenstone collections is defined by \"macro files\" in the
 <i>greenstone/macros</i> directory, and can be completely altered by changing the contents of these files.
-Editing them will change the appearance of all collections. To change the appearance of just one collection, place appropriately modified macros in a file called <i>extra.dm</i> in the collection's <i>macros</i> directory. For example, this collection uses the file <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
+Editing them will change the appearance of all collections. To change the appearance of just one collection, place appropriately modified macros in a file called <i>extra.dm</i> in the collection's <i>macros</i> directory. For example, this collection uses the file <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
 <p>
 To separate presentation details from the macro files,
@@ -146 +146 @@
 more information), which allow you to specify fonts, colours, spacings, and
 other elements for HTML pages. The standard Greenstone stylesheet is located in <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (it is placed in the <i>images</i> directory because
-macro files can easily reference this directory). This collection specifies an auxiliary stylesheet, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, to be used in addition to the default ones. It includes some comments
+macro files can easily reference this directory). This collection specifies an auxiliary stylesheet, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, to be used in addition to the default ones. It includes some comments
 for those unfamiliar with cascading style sheets. Some of the
 macros in <i>extra.dm</i> reference images that have been placed in
-<i>greenstone/collect/garish/images</i>.\n
+<i>greenstone/collect/_cgiargc_/images</i>.\n
 <p>
 The
@@ -184 +184 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -233 +233 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -294 +294 @@
 <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>),
 which is used to generate the
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">search page</a>:
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">search page</a>:
 <pre>
 ##############################################################################\n
@@ -319 +319 @@
 <i>navigationbar</i> macro, whereas the above version does not, and it
 includes an additional green bar. Compare
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">this</a>
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">this</a>
 and
 <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">this</a>.\n
@@ -342 +342 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
-}
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 
@@ -365 +375 @@
 
 <p>
-L'apparence des collections Greenstone est définie par des \"fichiers de macros\" dans le répertoire <i>greenstone/macros</i> et elle peut être complÚtement modifiée en changeant le contenu de ces fichiers. L' édition de ceux-ci changera l' apparence de toutes les collections.Pour changer l' apparence d' une seule collection, il faut placer correctement les macros modifiés dans un fichier appelé <i>extra.dm</i> dans le répertoirede la collection <i>macros</i>. Par exemple, cette collection utilise le fichier <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
-<p>
-Pour séparer certains détails de présentation des fichiers de macros, Greenstone utilise <i>Cascading Style Sheets</i>(voir <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> pour plus d' information), ce qui vous permet de spécifier la police, les couleurs, les espaces, et autres éléments pour les pages HTML. Le 'stylesheet' de Greenstone standardisé est alloqué dans <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (il est placé dans le répertoire <i>images</i> car les macros fichiers peuvent reférer ce répertoire facilement). Cette collection spécifie un 'stylesheet' auxiliaire, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, à être utilisé à part ceux du défaut. Ceci inclus quelques commentaires qui ont été placés dans <i>greenstone/collect/garish/images</i>.\n
+L'apparence des collections Greenstone est définie par des \"fichiers de macros\" dans le répertoire <i>greenstone/macros</i> et elle peut être complÚtement modifiée en changeant le contenu de ces fichiers. L' édition de ceux-ci changera l' apparence de toutes les collections.Pour changer l' apparence d' une seule collection, il faut placer correctement les macros modifiés dans un fichier appelé <i>extra.dm</i> dans le répertoirede la collection <i>macros</i>. Par exemple, cette collection utilise le fichier <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
+<p>
+Pour séparer certains détails de présentation des fichiers de macros, Greenstone utilise <i>Cascading Style Sheets</i>(voir <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> pour plus d' information), ce qui vous permet de spécifier la police, les couleurs, les espaces, et autres éléments pour les pages HTML. Le 'stylesheet' de Greenstone standardisé est alloqué dans <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (il est placé dans le répertoire <i>images</i> car les macros fichiers peuvent reférer ce répertoire facilement). Cette collection spécifie un 'stylesheet' auxiliaire, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, à être utilisé à part ceux du défaut. Ceci inclus quelques commentaires qui ont été placés dans <i>greenstone/collect/_cgiargc_/images</i>.\n
 <p>
 Le fichier de macros <a href=\"_httpcollection_/macros/extra.dm\" target=macro>extra.dm</a>
@@ -387 +397 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -424 +434 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -465 +475 @@
 <p>
 La partie suivante de <i>extra.dm</i> redéfinit des macros dans le paquetage <i>query</i> (\"<i>requête</i>\") (dans <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>),
-qui est utilisé pour générer la <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">page de recherche</a>:
+qui est utilisé pour générer la <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">page de recherche</a>:
 <pre>
 ##############################################################################\n
@@ -487 +497 @@
 
 La définition de <i>content</i> dans le paquetage de <i>requête</i> standard est similaire à la version donnée ci-dessus, excepté le fait qu'elle centre la macro <i>barre de navigation</i>, alors que la version ci-dessu ne le fait pas, et qu'elle inclut une barre verte supplémentaire. Comparez
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">ceci</a> Ã  <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ceci</a>.
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">ceci</a> Ã  <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ceci</a>.
 
 <p>
@@ -505 +515 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
-}
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 
@@ -524 +544 @@
 <h3>Cómo trabaja esta colección</h3>
 <p>
-La apariencia de las colecciones Greenstone se define por medio de los \"archivos de macros\" que se encuentran en el directorio de <i>macros</i> y puede ser modificada completamente cambiando el contenido de estos archivos. Editando estos cambiará la apariencia de todas las colecciones. Para cambiar la apariencia de unicamente una colección, coloque apropiadamente la macros modificado en un archivo llamado <i>extra.dm</i> en el directorio de la colección <i>macros</i>. Por ejemplo, este directorio utiliza un archivo llamado <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
-
-<p>
-Para separar ciertos detalles de la presentación de los archivos de macros, Greenstone utiliza <i>Cascading Style Sheets</i>(ver <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> para mas información), que le permite especificar la fuente, los colores, espacios, y otros elementos para las páginas HTML. La hojaestilo Greenstone estándar está alocada en <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (está colocado en el directorio <i>images</i> porque los archivos macro puede sencillamente referir el directorio). Esta colección especifica una hojaestilo auxiliar, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, a ser usada en adición a las de defaul. Esto incluye algunos comentarios para aquellos para aquellos que no están familiarizados con hojas estilo cascada. Algunos de los macro en <i>extra.dm</i> refieren a imágenes que han sido colocadas en <i>greenstone/collect/garish/images</i>.\n
+La apariencia de las colecciones Greenstone se define por medio de los \"archivos de macros\" que se encuentran en el directorio de <i>macros</i> y puede ser modificada completamente cambiando el contenido de estos archivos. Editando estos cambiará la apariencia de todas las colecciones. Para cambiar la apariencia de unicamente una colección, coloque apropiadamente la macros modificado en un archivo llamado <i>extra.dm</i> en el directorio de la colección <i>macros</i>. Por ejemplo, este directorio utiliza un archivo llamado <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
+
+<p>
+Para separar ciertos detalles de la presentación de los archivos de macros, Greenstone utiliza <i>Cascading Style Sheets</i>(ver <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> para mas información), que le permite especificar la fuente, los colores, espacios, y otros elementos para las páginas HTML. La hojaestilo Greenstone estándar está alocada en <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (está colocado en el directorio <i>images</i> porque los archivos macro puede sencillamente referir el directorio). Esta colección especifica una hojaestilo auxiliar, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, a ser usada en adición a las de defaul. Esto incluye algunos comentarios para aquellos para aquellos que no están familiarizados con hojas estilo cascada. Algunos de los macro en <i>extra.dm</i> refieren a imágenes que han sido colocadas en <i>greenstone/collect/_cgiargc_/images</i>.\n
 
 <p>
@@ -547 +567 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -593 +613 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -637 +657 @@
 <p>
 
-La siguiente parte de <i>extra.dm</i> redefine las macros del paquete de <i>consulta</i> (que se encuentra en <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), el cual se utiliza para generar la <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">página de búsqueda</a>. 
+La siguiente parte de <i>extra.dm</i> redefine las macros del paquete de <i>consulta</i> (que se encuentra en <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), el cual se utiliza para generar la <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">página de búsqueda</a>. 
 <p>
 
@@ -661 +681 @@
 <p>
 
-La definición de <i>contenido</i> en el paquete de <i>consulta</i> estándar es similar a la versión dada arriba, excepto que centra la macro <i>navigationbar</i>, mientras que la versión de arriba no lo hace, e incluye una barra verde adicional. Compárese <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">ésta</a> con <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ésta</a>. 
+La definición de <i>contenido</i> en el paquete de <i>consulta</i> estándar es similar a la versión dada arriba, excepto que centra la macro <i>navigationbar</i>, mientras que la versión de arriba no lo hace, e incluye una barra verde adicional. Compárese <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">ésta</a> con <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ésta</a>. 
 <p>
 
@@ -679 +699 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 <p>
@@ -700 +731 @@
 ВОЎ кПллекцОй ГрОМстПуМ заЎается «ЌакрПфайлаЌО» в ЎОректПрОО ЌакрПса (<i>greenstone/macros</i>>) О ЌПжет быть пПлМПстью ОзЌеМеМП с пПЌПщью ЌПЎОфОкацОй в файлаÑ
  ЌакрПсПв. ЭтО ЌПЎОфОкацОО ОзЌеМят вОЎ всеÑ
- кПллекцОй. ЧтПбы ОзЌеМОть вОЎ всегП лОшь ПЎМПй кПллекцОО, пПЌестОте сППтветствующОй ЌПЎОфОцОрПваММый ЌакрПс в файл МазваММый <i>extra.dm</i> в папке <i>macros</i> этПй кПллекцОО. НапрОЌер, эта кПллекцОя ОспПльзует файл <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>.\n
+ кПллекцОй. ЧтПбы ОзЌеМОть вОЎ всегП лОшь ПЎМПй кПллекцОО, пПЌестОте сППтветствующОй ЌПЎОфОцОрПваММый ЌакрПс в файл МазваММый <i>extra.dm</i> в папке <i>macros</i> этПй кПллекцОО. НапрОЌер, эта кПллекцОя ОспПльзует файл <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>.\n
 <p>
 
 Для ПтЎелеМОя МекПтПрыÑ
- Ўеталей презеМтацОО Пт ЌакрПфайлПв ГрОМстПуМ ОспПльзует  <i>Cascading Style Sheets</i> (сЌ. ЎПпПлМОтельМую ОМфПрЌацОя Ма <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a>), кПтПрые пПзвПляют ВаЌ устаМавлОвать шрОфты, цвета, ОМтервалы О ЎругОе элеЌеМты Ўля страМОц HTML. Ѐайл сП стаМЎартМыЌ МабПрПЌ стОлей в ГрОМстПуМ пПЌещеМ зЎесь: <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (ПМ пПЌещеМ в ЎОректПрОО <i>images</i>, пПтПЌу чтП ЌакрП файлы ЌПгут сПЎержать уЎПбМые ссылкО к этПй ЎОректПрОО.) Эта кПллекцОя ОЌеет вспПЌПгательМый стОлевПй файл, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, кПтПрый сПЎержОт МескПлькП кПЌЌеМтарОев Ўля теÑ
-, ктП Ме разбОрается с CSS. НекПтПрые ЌакрПсы в <i>extra.dm</i> ОЌеют ссылкО к ОзПбражеМОяЌ пПЌещеММыЌ в <i>greenstone/collect/garish/images</i>.\n 
+ Ўеталей презеМтацОО Пт ЌакрПфайлПв ГрОМстПуМ ОспПльзует  <i>Cascading Style Sheets</i> (сЌ. ЎПпПлМОтельМую ОМфПрЌацОя Ма <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a>), кПтПрые пПзвПляют ВаЌ устаМавлОвать шрОфты, цвета, ОМтервалы О ЎругОе элеЌеМты Ўля страМОц HTML. Ѐайл сП стаМЎартМыЌ МабПрПЌ стОлей в ГрОМстПуМ пПЌещеМ зЎесь: <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (ПМ пПЌещеМ в ЎОректПрОО <i>images</i>, пПтПЌу чтП ЌакрП файлы ЌПгут сПЎержать уЎПбМые ссылкО к этПй ЎОректПрОО.) Эта кПллекцОя ОЌеет вспПЌПгательМый стОлевПй файл, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, кПтПрый сПЎержОт МескПлькП кПЌЌеМтарОев Ўля теÑ
+, ктП Ме разбОрается с CSS. НекПтПрые ЌакрПсы в <i>extra.dm</i> ОЌеют ссылкО к ОзПбражеМОяЌ пПЌещеММыЌ в <i>greenstone/collect/_cgiargc_/images</i>.\n 
 
 <p>
@@ -736 +767 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -785 +816 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -832 +863 @@
 <p>
 
-СлеЎующая часть <i>extra.dm</i> переПпреЎеляет ЌакрПс в пакете <i>запрПса</i> (<i>query</i>) в <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), кПтПрый ОспПльзуется Ўля геМерацОО <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">пПОскПвПй страМОцы</a>.
+СлеЎующая часть <i>extra.dm</i> переПпреЎеляет ЌакрПс в пакете <i>запрПса</i> (<i>query</i>) в <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), кПтПрый ОспПльзуется Ўля геМерацОО <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">пПОскПвПй страМОцы</a>.
 
 <pre>
@@ -854 +885 @@
 </pre>\n
 
-ОпреЎелеМОе <i>сПЎержаМОя</i> в стаМЎартМПЌ пакете <i>запрПса</i> пПЎПбМП версОО, ЎаММПй выше, за ОсключеМОеЌ тПгП, чтП ПМП пПЌещает в цеМтре ЌакрПс <i>navigationbar</i>, тПгЎа как вышеупПЌяМутая версОя Ме Ўелает этПгП О включает ЎПпПлМОтельМую зелеМую лОМейку. СравМОте <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">тП</a> О <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">этП</a>.
+ОпреЎелеМОе <i>сПЎержаМОя</i> в стаМЎартМПЌ пакете <i>запрПса</i> пПЎПбМП версОО, ЎаММПй выше, за ОсключеМОеЌ тПгП, чтП ПМП пПЌещает в цеМтре ЌакрПс <i>navigationbar</i>, тПгЎа как вышеупПЌяМутая версОя Ме Ўелает этПгП О включает ЎПпПлМОтельМую зелеМую лОМейку. СравМОте <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">тП</a> О <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">этП</a>.
 <p>
 
@@ -872 +903 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
 }
 </pre>\n

documented-example-collections/trunk/garish-e/macros/extra.dm

@@ -40 +40 @@
 ## macros can have optional parameters, that make them more specific.
 ## For example, you could have _macro_ {general case} as well as
-## _macro_ [c=garish] {For garish only} for when the "c" argument (which means
-## the collection) is set to "garish". Or _macro_ [l=fr] {french case} for 
+## _macro_ [c=garish-e] {For garish-e collection only} for when the 
+# "c" argument (which means the collection) is set to "garish-e". 
+## Or _macro_ [l=fr] {french case} for 
 ## when the language is set to French. This is how we cope with different 
 ## language interfaces.
 
 ## Collection specific macros put into the main macro files must have a 
-## collection parameter ([c=garish]), otherwise they will apply to all 
+## collection parameter ([c=garish-e]), otherwise they will apply to all 
 ## collections. Macros in a collection's extra.dm do not need this parameter.
 
@@ -56 +57 @@
 ## help see the effect of changes of these macros.
 
-## _httpcimg_ is a macro that expands to the images directory of the current 
-## collection. Any collection images or stylesheets should be put there. 
+## _httpcimages_ is a macro that expands to the images directory of the 
+## current collection. Any collection images or stylesheets should be put 
+## there. 
 
 ## The macros below modify the appearance of a specific greenstone collection.
@@ -67 +69 @@
 ## here as a demonstration.
 ##
-## Edit the file images/garish/style.css to change the colours and fonts.
+## Edit the file images/garish-e/style.css to change the colours and fonts.
 
 
@@ -76 +78 @@
 ## of these macros are in the file base.dm (and in the language-specific
 ## macro files such as english.dm and french.dm)
-
 
 ## These 2 macros are used for highlighting text that matched a query when
@@ -138 +139 @@
 #}
 
-#To keep most of the standard greenstone style, and just override a few style declarations, we can define _collectionspecificstyle_, which is included in the default _cssheader_ macro. The title of a stylesheet link must be 'Greenstone Style', in order for it to be used in conjunction with the main stylesheet.
-
-# Here we include the garish collection's stylesheet, which defines the page color to pink.
-We also remove the background image for the page to get rid of the green swirly bar, and specify a new (blue) background image for hover (mouse over) on the navigation bar buttons 
+## To keep most of the standard greenstone style, and just override a few 
+## style declarations, we can define _collectionspecificstyle_, which is 
+## included in the default _cssheader_ macro. The title of a stylesheet 
+## link must be 'Greenstone Style', in order for it to be used in 
+## conjunction with the main stylesheet.
+
+## Here we include the garish-e collection's stylesheet, which defines the 
+## page color to pink.
+## We also remove the background image for the page to get rid of the green 
+## swirly bar, and specify a new (blue) background image for hover 
+## (mouse over) on the navigation bar buttons 
 
 _collectionspecificstyle_ {
@@ -148 +156 @@
 <style>
 body.bgimage \{ background-image: none; \}
-span.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
+a.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
 </style>
 
@@ -165 +173 @@
 ## Just leave in the home button
 _pagebanner_  {
+<div id="banner">
 <div class="pageinfo"> 
 <p class="bannerlinks">_homelink_</p>
+</div>
 </div>
 }
@@ -188 +198 @@
 <!-- start of custom about:content -->
 _navigationbar_
+<div class="document">
 _textabout_
 
+<div class="section">
 <h3>_help:textsimplehelpheading_</h3>
 _help:simplehelp_
-
+</div>
+</div>
 <!-- end of custom about:content -->
 }
@@ -205 +218 @@
 
 ## This is similar to the default, except we don't centre the _navigationbar_
-## and we've removed the green bars and search history
+## and we've removed one of the green bars
 _content_  {
 <!-- start of custom query:content -->
 _navigationbar_
 
+<div class="document">
+<div class="queryform">
 <center>
 _If_(_cgiargct_,_selectqueryform_,_queryform_)
 </center>
-_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br>
+</div>
+_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br />
 <center>
 _searchhistorylist_
 </center>)
-_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br>_resultline_,)
-<br>
+_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br />_resultline_,)
+<br />
 <!-- end of custom query:content -->
 }
@@ -252 +268 @@
 <!-- start of custom document:content -->
 _navigationbar_
-<p>
-<center>
+
+_If_(_phindclassifier__collageclassifier_,
+<p style="text-align: center;">
 _phindclassifier_
 _collageclassifier_
-</center>
+</p>
+)
+
+_If_("_cgiargcl_" eq "search",
+<ul id="searchresults">
+_prevsearchresult_
+_nextsearchresult_
+</ul>)
+
+<div class="document">
 <!-- end of custom document:content -->
 }