From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 1 May 2012 15:43:38 +0000 (-0400)
Subject: Restore the "Local Administration" link to the splash page
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2c87f171922cd5a929ecdd6d2fa2aa0009711978;p=contrib%2FConifer.git

Restore the "Local Administration" link to the splash page

From Local Admin we can get to Library Hours, and thence satisfaction.

Also fix a problem with new XUL; fallback to the CGI param for session
rather than the cookie, which new XUL doesn't play nicely with.

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Conflicts:
	Open-ILS/xul/staff_client/server/index.xhtml

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/xul/staff_client/server/admin/hours.xhtml b/Open-ILS/xul/staff_client/server/admin/hours.xhtml
index 4891bc6a2d..a59e61bbb2 100644
--- a/Open-ILS/xul/staff_client/server/admin/hours.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hours.xhtml
@@ -36,6 +36,7 @@
 <script type='text/javascript'>
 
 dojo.require('dojo.cookie');
+dojo.require('openils.CGI');
 dojo.require('openils.User');
 dojo.require('openils.PermaCrud');
 dojo.require('dijit.form.Button');
@@ -48,6 +49,9 @@ var myOuid;
 function initPage(){
 
     myToken = dojo.cookie('ses');    //need to catch if this goes wrong
+    if (!myToken) {
+        myToken = new openils.CGI.param('ses');
+    }
     var user = new openils.User({authtoken:myToken});
     myOuid =  user.user.ws_ou();
 
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index b0ddccd4b6..7edd4d7831 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -125,7 +125,10 @@
                                 xulG.set_tab(loc, params, {}); 
                 }
                 function local_admin(newtab) {
-                        var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_LOCAL_ADMIN + '?ses=' + window.escape(ses()) + '&session=' + window.escape(ses())); 
+                        // var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_LOCAL_ADMIN + '?ses=' + window.escape(ses()) + '&session=' + window.escape(ses())); 
+                        // Crude hack - but works, whereas the previous does not
+                        var loc = '/xul/server/admin' + '?ses=' + window.escape(ses()) + '&session=' + window.escape(ses());
+
                         var params = {'tab_name':'Local Administration', 'browser' : true };
                         var content_params = { 'no_xulG' : false, 'show_nav_buttons' : true, 'show_print_button' : true };
                         
@@ -559,6 +562,15 @@
               <td><a href="#"
               onclick="try { toggle_tpac(); } catch(E) { alert(E); }; return false;">&staff.client.portal.toggle_tpac;</a></td>
             </tr>
+            <tr>
+              <td height="50"></td>
+
+              <td><img class="newtabimg" src="skin/media/images/portal/newtab2.PNG" alt="Open in a new tab"
+              onclick="try { local_admin(); } catch(E) { alert(E); }" /> <a href=
+              "#" onclick=
+              "try { local_admin(); } catch(E) { alert(E); }; return false;">Local administration</a></td>
+            </tr>
+
           </table>
         </div>
         <span style="display:none" id="tpac_toggled_on">&staff.client.portal.toggle_tpac.message_on;</span>