Index: trunk/protemix/macros/base.dm
===================================================================
--- trunk/protemix/macros/base.dm (revision 3162)
+++ trunk/protemix/macros/base.dm (revision 3168)
@@ -32,8 +32,5 @@
_collectionname_ {}
-_imagecollection_ {_If_("_iconcollection_" ne "",
-,
-_imagecollectionv_}
-_imagecollectionv_ {_If_(_collectionname_,
)}
+_imagecollection_ {}
#######################################################################
@@ -140,5 +137,5 @@
# the page.
-_javalinks_ {_imagehome_}
+_javalinks_ {}
Index: trunk/protemix/macros/english.dm
===================================================================
--- trunk/protemix/macros/english.dm (revision 3162)
+++ trunk/protemix/macros/english.dm (revision 3168)
@@ -131,4 +131,7 @@
_texticonexpandtext_ {Display all text}
_texticoncontracttext_ {Display text only for currently selected section}
+_texticonpagepdf_ {Display PDF file of this page}
+_texticonartpdf_ {Display PDF file of entire article}
+
_textgoto_ {go to page}
@@ -170,4 +173,12 @@
_httpiconenhlof_ {_httpimg_/enhlof.gif}
_httpiconenhlon_ {_httpimg_/enhlon.gif}
+
+## "SINGLE PAGE PDF" ## document_button ## sppdf ##
+_httpiconsppdfof_ {_httpcollection_/images/sppdfof.gif}
+_httpiconsppdfon_ {_httpcollection_/images/sppdfon.gif}
+
+## "ARTICLE PDF" ## document_button ## apdf ##
+_httpiconapdfof_ {_httpcollection_/images/apdfof.gif}
+_httpiconapdfon_ {_httpcollection_/images/apdfon.gif}
######################################################################
Index: trunk/protemix/macros/query.dm
===================================================================
--- trunk/protemix/macros/query.dm (revision 3162)
+++ trunk/protemix/macros/query.dm (revision 3168)
@@ -28,15 +28,11 @@
_iconthispage_ {}
-_iconthispage_ [v=1] {_texticonthispage_
}
_iconqueryresultsbar_ {}
-_iconqueryresultsbar_[v=1] {_texticonqueryresultsbar_}
# _iconnext_ and _iconprev_ are overridden in this package as we
# don't want alt text here
_iconnext_{}
-_iconnext_ [v=1] {}
_iconprev_{}
-_iconprev_ [v=1] {}
#######################################################################
@@ -75,10 +71,13 @@
form.c3.options.length = 0;
+ var isselected = 0;
for (i = 0; i < options[c2].length; i++) \{
form.c3.options[i] = new Option(options[c2][i], options[c2][i]);
+ if (options[c2][i] == "_cgiargc3_") \{
+ form.c3.selectedIndex = i;
+ isselected = 1;
+ \}
\}
-
- form.c3.selectedIndex = 0;
-
+ if (!isselected) form.c3.selectedIndex = 0;
\}
}
@@ -88,5 +87,5 @@
}
-_pagetitle_ {_If_(_cgiargq_,_textquerytitle_,_textnoquerytitle_)}
+_pagetitle_ {}
_content_ {
@@ -97,10 +96,6 @@
_queryform_
-_If_(_cgiargq_,_iconqueryresultsbar_
-
-_freqmsg_
-_textpostprocess_
+_iconblankbar_
_resultline_
-,_iconblankbar_)
}
@@ -109,4 +104,5 @@
+
@@ -116,8 +112,8 @@
|
@@ -129,12 +125,12 @@
|
@@ -153,4 +149,5 @@
+AND
@@ -162,2 +159,14 @@
}
+
+# we want to put the links to previous/next pages of results
+# in the footer
+_pagefooterextra_ {
+
+
+
+}
|