Changeset 4740

Timestamp:

2003-06-20T12:00:41+12:00 (21 years ago)

Author:

sjboddie

Message:

Tidied things up a bit so the large javascript functions for the usability
function aren't included in html pages unless usability is actually turned
on. Also renamed a few images that weren't using 8.3 filenames.

Location:

trunk/gsdl

Files:

• images/auxiliary.gif (deleted)
• images/auxilry.gif (added)
• images/tranhead.gif (added)
• images/transhead.gif (deleted)
• images/usabbanner.gif (deleted)
• images/usabbnr.gif (added)
• macros/base.dm (modified) (2 diffs)
• macros/english2.dm (modified) (2 diffs)
• src/recpt/documentaction.cpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/macros/base.dm

@@ -163 +163 @@
 _gsimage_ [v=1] {<a href="_1_">_5_</a><br>}
 
-_usabilityscript_ {
+_usabilityscript_ {}
+
+_usabshowscript_ {
 
 //this is for where something goes wrong and an error message has to be shown.
@@ -491 +493 @@
 _heightgsdl_ {77}
 
-_httpusabbanner_ {_httpimg_/usabbanner.gif}
+_httpusabbanner_ {_httpimg_/usabbnr.gif}
 
 _httpiconitext_ {_httpimg_/itext.gif}

trunk/gsdl/macros/english2.dm

@@ -1055 +1055 @@
 
 <strong><br></center><a href=\"_gwcgi_?e=_compressedoptions_&a=lang&p=translang\">
-<img src=\"_httpimg_/transhead.gif\"></a>
+<img src=\"_httpimg_/tranhead.gif\"></a>
 <center><p>
 <img src="_httpimg_/divb.gif"></strong><p>
@@ -1087 +1087 @@
  <img src="_httpimg_/core.gif" height=20>)  of phrases used in
  the main system and an "auxiliary" part (signaled by
- <img src="_httpimg_/auxiliary.gif" height=20>) that
+ <img src="_httpimg_/auxilry.gif" height=20>) that
  contains phrases in less-frequently-used subsystems (such as the
  Administration pages). Core phrases will be presented first; the

trunk/gsdl/src/recpt/documentaction.cpp

@@ -450 +450 @@
     disp.setmacro("usability","Global","_imageusab_");
     disp.setmacro("usabinterface","Global",("_usab"+(*usability).second+"_"));
+    disp.setmacro("usabilityscript", "Global", "_usabshowscript_");
   }
 }

trunk/gsdl/src/recpt/pageaction.cpp

@@ -547 +547 @@
     disp.setmacro("usability","Global","_imageusab_");
     disp.setmacro("usabinterface","Global",("_usab"+(*check).second+"_"));
+    disp.setmacro("usabilityscript", "Global", "_usabshowscript_");
       }