[Fmsystem-commits] [12199] bkbooking: stavanger bugfix login/logout minid

[Kjell Arne Espedal]

Revision: 12199
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12199
Author:   kjell
Date:     2014-10-17 08:26:50 +0000 (Fri, 17 Oct 2014)
Log Message:
-----------
bkbooking: stavanger bugfix login/logout minid

Modified Paths:
--------------
    branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl
    branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2014-10-17 00:02:54 UTC (rev 12198)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2014-10-17 08:26:50 UTC (rev 12199)
@@ -39,21 +39,28 @@
                oElement.setAttribute('onclick', 'orgbox();');
        }
 }
+function clearCookie() {
+    setCookie('orgbox',0);
+    var oElement = document.getElementById("login");
+    oElement.removeAttribute('onclick');
+}
 function init() {
-       if ('{organization_json}' != 'null' && '{organization_json}' != '') {
+    if ('{organization_json}' != 'null' && '{organization_json}' != '') {
                var oElement = document.getElementById("change");
                oElement.innerHTML = '<i class="fa fa-users"></i>';
                oElement.setAttribute('onclick', 'orgbox();');
                oElement.style.color='black';
                oElement.style.padding='6px 0px 0px 5px';
                oElement.style.cursor='pointer';
+        var oElement = document.getElementById("login");
+        oElement.setAttribute('onclick', 'clearCookie();');
 
                var cookie = getCookie('orgbox');
                if (cookie != 1) {
                        orgbox();
                        var oList = document.getElementById("orglist");
                        oList.innerHTML += '<div style="padding-top: 10px">PS: 
Du kan bruke <i class="fa fa-users"></i> ikonet for å bytte 
organisasjon.</div>';                        
-                       setCookie('orgbox','default',1);
+                       setCookie('orgbox',1);
                }
        }
 }

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl     
2014-10-17 00:02:54 UTC (rev 12198)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl     
2014-10-17 08:26:50 UTC (rev 12199)
@@ -33,7 +33,7 @@
     <div id="wrapper">
     <div id="header">
        <div id="login-bar">
-               <a href="{manual_url}">{manual_text}</a> <a 
href="{help_url}">{help_text}</a> <a href="{org_url}">{login_text_org}</a><a 
href="{login_url}">{login_text}</a> <span id="change"></span>
+               <a href="{manual_url}">{manual_text}</a> <a 
href="{help_url}">{help_text}</a> <a href="{org_url}">{login_text_org}</a><a 
id="login" href="{login_url}">{login_text}</a> <span id="change"></span>
        </div>
         <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div 
id="logo"></div></a>
         <div id="centerimage"></div>