Changeset 23523 for main/branches/64_bit_Greenstone/greenstone2/macros/nav_css.dm

Timestamp:

2011-01-05T09:18:04+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest trunk changes into this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• macros/nav_css.dm (modified) (2 diffs)

main/branches/64_bit_Greenstone/greenstone2/macros/nav_css.dm

@@ -14 +14 @@
 #######################################################################
 
-_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink_}
-_homelink_ {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
-_helplink_ {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
-_preflink_ {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
+_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink__optloginlink_}
+_homelink_  {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
+_helplink_  {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
+_preflink_  {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
+
+_optloginlink_ {
+  _If_("_activateweb20_" >= "1",_If_("x_cgiargun__cgiarguan_" ne "x1",_loginlink_))
+}
+
+_loginlink_ {
+
+    _If_(_cgiargun_,
+      _navtablogoutorig_(_linktextLOGOUT_,_textdescrlogout_) _linktextLOGGEDIN_
+      <script type="text/javascript">
+        appendUsernameArgs("logout","uan=&un=")
+      </script>
+    ,
+      _navtabloginorig_(_linktextLOGIN_,_textdescrlogin_)
+      <script type="text/javascript">
+        appendUsernameArgs("login","uan=1")
+      </script>
+    )
+}
 
 
@@ -41 +60 @@
 # 4. optional "selected" or not if it is the current tab
 _navtaborig_ {<a _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink" href="_1_" title="_3_">_2_)</a>}
+
+# same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page)
+_navtabloginorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="login" href="" title="_2_">_1_)</a>}
+
+# same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page)
+_navtablogoutorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="logout" href="" title="_2_">_1_)</a>}
 
 # parameters are