From d306c2edbbc171d5345b3378bd76ed5b69984316 Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <>
Date: Wed, 11 Aug 2004 20:53:43 +0000
Subject: Bug 241903: Add Environment Variable Authentication for apache auth
 and SSO patch by erik r=joel a=justdave

---
 template/en/default/global/useful-links.html.tmpl | 8 ++++++--
 template/en/default/index.html.tmpl               | 4 +++-
 template/en/default/sidebar.xul.tmpl              | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index c04b60dd6..7e568372c 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -52,8 +52,12 @@
         [% IF user.login %] 
             [% ' | <a href="sanitycheck.cgi">Sanity&nbsp;check</a>' 
                                                   IF user.groups.tweakparams %]
-            | <a href="relogin.cgi">Log&nbsp;out</a>&nbsp;
-              [% user.login FILTER html %]
+            [% IF user.get_flag('can_logout') %]
+              | <a href="relogin.cgi">Log&nbsp;out</a>&nbsp;
+            [% ELSE %]
+              | Logged&nbsp;in&nbsp;as&nbsp;
+            [% END %]
+            [% user.login FILTER html %]
         [% ELSE %]
             [% IF Param('createemailregexp') %]
               | <a href="createaccount.cgi">New&nbsp;Account</a>
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 5422061fd..d31a51d89 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -66,7 +66,9 @@ function addSidebar() {
   </p><p>
 [% IF user.id %]
   <a href="userprefs.cgi">Change password or user preferences</a><br>
-  <a href="relogin.cgi">Logout [% user.login FILTER html %]</a><br>
+  [% IF user.get_flag('can_logout') %]
+    <a href="relogin.cgi">Logout [% user.login FILTER html %]</a><br>
+  [% END %]
 [% ELSE %]
   <a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a><br>
   [% IF Param('createemailregexp') %]
diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index 60ae33dbd..802fd9f23 100644
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -95,7 +95,9 @@ function normal_keypress_handler( aEvent ) {
   [%- IF user.groups.tweakparams %]
       <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
   [%- END %]
+  [%- IF user.get_flag('can_logout') %]
       <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="logout [% user.login FILTER html %]"/>
+  [%- END %]
       <separator class="thin"/>
   [%- IF user.showmybugslink %]
       [% filtered_username = user.login FILTER url_quote %]
-- 
cgit v1.2.3-24-g4f1b