From 94dc3b73c84f7ef6248d548baf2b36bdb1bee4ee Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 4 Sep 2007 14:59:16 +0000
Subject: [PATCH] Monotone-Parent: 087e158aafe04993604b5cf99cdb4ebb52e6405e
 Monotone-Revision: d013a98ba61610c7cc9fbecdb189cfec0dd40527

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-04T14:59:16
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/generic.css |  6 ++++++
 UI/WebServerResources/generic.js  | 28 +++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index d399878ba..65ea6e83a 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -155,6 +155,12 @@ DIV.linkbanner A
 DIV.linkbanner A:hover
 { color: #dd5; }
 
+DIV.linkbanner A#logoff
+{ float: right;
+  margin: 0px;
+  padding: 0px;
+  padding-right: .5em; }
+
 .linkbannerlinks
 { vertical-align: bottom;
   text-align: left; }
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 0e5d7587f..a8b01e994 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -309,19 +309,27 @@ function triggerAjaxRequest(url, callback, userdata) {
   return http;
 }
 
+function startAnimation(parent, nextNode) {
+  var anim = document.createElement("img");
+  anim = $(anim);
+  anim.id = "progressIndicator";
+  anim.src = ResourcesURL + "/busy.gif";
+  anim.setStyle({ visibility: "hidden" });
+  if (nextNode)
+    parent.insertBefore(anim, nextNode);
+  else
+    parent.appendChild(anim);
+  anim.setStyle({ visibility: "visible" });
+
+  return anim;
+}
+
 function checkAjaxRequestsState() {
   var toolbar = document.getElementById("toolbar");
   if (toolbar) {
     if (activeAjaxRequests > 0
         && !document.busyAnim) {
-      var anim = document.createElement("img");
-      anim = $(anim);
-      document.busyAnim = anim;
-      anim.id = "progressIndicator";
-      anim.src = ResourcesURL + "/busy.gif";
-      anim.setStyle({ visibility: "hidden" });
-      toolbar.appendChild(anim);
-      anim.setStyle({ visibility: "visible" });
+      document.busyAnim = startAnimation(toolbar);
     }
     else if (activeAjaxRequests == 0
 	     && document.busyAnim
@@ -1252,7 +1260,9 @@ function loadPreferences() {
 }
 
 function onLoadHandler(event) {
-   loadPreferences();
+   if (!document.body.hasClassName("loginPage")) {
+     loadPreferences();
+   }
    queryParameters = parseQueryParameters('' + window.location);
    if (!$(document.body).hasClassName("popup")) {
       initLogConsole();