[open-ils-commits] r19757 - branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main (dbwells)

[svn at svn.open-ils.org]

Author: dbwells
Date: 2011-03-15 18:46:23 -0400 (Tue, 15 Mar 2011)
New Revision: 19757

Modified:
   branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js
   branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
Log:
Re-enable close button for staff client tabs

There is a different fix for this in trunk/2.1, but I thought a simple fix for this was worth adding for those sticking with 2.0 for a while.


Modified: branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2011-03-15 21:05:49 UTC (rev 19756)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2011-03-15 22:46:23 UTC (rev 19757)
@@ -1292,7 +1292,7 @@
         obj.controller.init( { 'window_knows_me_by' : 'g.menu.controller', 'control_map' : cmd_map } );
 
         obj.controller.view.tabbox = window.document.getElementById('main_tabbox');
-        obj.controller.view.tabs = obj.controller.view.tabbox.firstChild;
+        obj.controller.view.tabs = window.document.getElementById('main_tabs');
         obj.controller.view.panels = obj.controller.view.tabbox.lastChild;
 
         obj.new_tab(null,{'focus':true},null);

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul	2011-03-15 21:05:49 UTC (rev 19756)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul	2011-03-15 22:46:23 UTC (rev 19757)
@@ -4,6 +4,8 @@
 <!--
 <?xul-overlay href="/xul/server/main/menu_frame_menus.xul"?>
 -->
+<!-- we need this stylesheet for the 'tabs-right' class -->
+<?xml-stylesheet href="chrome://global/skin/tabbox.css" type="text/css"?>
 <overlay id="menu_frame_overlay" 
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -16,17 +18,23 @@
 <box id="menu_frame_main" flex="1" orient="vertical">
     <toolbox id="main_toolbox"/>
     <tabbox id="main_tabbox" flex="1" eventnode="window" handleCtrlTab="true">
-        <tabs id="main_tabs" closebutton="true" onclosetab="g.menu.close_tab()">
-            <tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
-            <tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
-            <tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
-            <tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
-            <tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
-            <tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
-            <tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
-            <tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
-            <tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
-        </tabs>
+        <hbox>
+            <arrowscrollbox orient="horizontal" id="main_tabs_scrollbox" flex="1">
+                <tabs id="main_tabs">
+                    <tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
+                    <tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
+                    <tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
+                    <tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
+                    <tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
+                    <tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
+                    <tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
+                    <tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
+                    <tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
+                </tabs>
+                <spacer flex="1" class="tabs-right" />
+            </arrowscrollbox>
+            <toolbarbutton id="main_tabs_closebutton" class="tabs-closebutton close-button tabs-right" oncommand="g.menu.close_tab()" />
+        </hbox>
         <tabpanels id="main_panels" flex="1">
             <tabpanel id="panel_1"><label value="panel_1"/></tabpanel>
             <tabpanel id="panel_2"><label value="panel_2"/></tabpanel>