From 9ad05c699bf634ca6ee0800ac96638529433aae0 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 8 Aug 2011 16:46:16 +0530
Subject: [IMP]Implement shortcut functionality.

bzr revid: vme@tinyerp.com-20110808111616-2qi3d6hfebix0uho
---
 addons/base/static/src/xml/base.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 8442d3fa7e4..00fb9db39bd 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -360,6 +360,15 @@
         </div>
 
     </div>
+	<div id="shortcuts" class="header_title">
+	</div>
+</t>
+<t t-name="Shortcuts">
+    <ul class="first">
+            <li t-foreach="shortcuts_pass" t-as="sc" t-att-id="sc.res_id"  t-att-shortcut-id = "sc.id" >
+                <a><t t-esc="sc.name"/></a>
+            </li>
+    </ul>
 </t>
 <t t-name="Menu">
     <table align="center">
@@ -867,7 +876,7 @@
     </button>
 </t>
 <t t-name="SearchView">
-    <h2 class="oe_view_title"><t t-esc="view.attrs['string']"/></h2>
+    <h2 class="oe_view_title"> <a id = "shortcut_add_remove" title="Add / Remove Shortcut..."> </a><t t-esc="view.attrs['string']"/></h2>
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
         <div class="oe_search-view-buttons" style="text-align: right;">
-- 
cgit v1.2.3


From f17f4bbd481ec40b66a122a8c694675994e19603 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 12 Aug 2011 12:42:48 +0530
Subject: [IMP]checked that shortcut are from either ir.ui.menu or it is tree
 view

bzr revid: vme@tinyerp.com-20110812071248-y9oqa8t1wx61xciu
---
 addons/base/static/src/xml/base.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 00fb9db39bd..3004e9ef408 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -366,10 +366,11 @@
 <t t-name="Shortcuts">
     <ul class="first">
             <li t-foreach="shortcuts_pass" t-as="sc" t-att-id="sc.res_id"  t-att-shortcut-id = "sc.id" >
-                <a><t t-esc="sc.name"/></a>
+                <a ><t t-esc="sc.name"/></a>
             </li>
     </ul>
 </t>
+
 <t t-name="Menu">
     <table align="center">
         <tr>
@@ -419,6 +420,9 @@
     <tr>
         <td class="view-manager-main-content">
             <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
+            <t t-if="view.view_type != form" t-foreach="views" t-as="view">
+                <a id = "shortcut_add_remove" title="Add / Remove Shortcut..." href="javascript: void(0)"> </a>
+            </t>
             <div class="oe_vm_switch">
                 <t t-if="views.length != 1" t-foreach="views" t-as="view">
                     <button type="button" t-att-data-view-type="view.view_type">
@@ -876,7 +880,7 @@
     </button>
 </t>
 <t t-name="SearchView">
-    <h2 class="oe_view_title"> <a id = "shortcut_add_remove" title="Add / Remove Shortcut..."> </a><t t-esc="view.attrs['string']"/></h2>
+    <h2 class="oe_view_title"> <t t-esc="view.attrs['string']"/></h2>
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
         <div class="oe_search-view-buttons" style="text-align: right;">
-- 
cgit v1.2.3


From b1e8671583108397dc95c185bb281b69947f4295 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 16 Aug 2011 12:26:20 +0200
Subject: [IMP] remove some dead code, simplify shortcuts template, replace
 shortcut id by class

bzr revid: xmo@openerp.com-20110816102620-b7zodiqoi91rz0m1
---
 addons/base/static/src/xml/base.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3004e9ef408..c41952785de 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -360,16 +360,14 @@
         </div>
 
     </div>
-	<div id="shortcuts" class="header_title">
-	</div>
-</t>
-<t t-name="Shortcuts">
-    <ul class="first">
-            <li t-foreach="shortcuts_pass" t-as="sc" t-att-id="sc.res_id"  t-att-shortcut-id = "sc.id" >
-                <a ><t t-esc="sc.name"/></a>
-            </li>
-    </ul>
-</t>
+    <div class="oe-shortcuts"> </div>
+</t>
+<ul t-name="Shortcuts">
+    <li t-foreach="shortcuts" t-as="shortcut"
+            t-att-id="shortcut.res_id"
+            t-att-data-shortcut-id="shortcut.id"
+        ><t t-esc="shortcut.name"/></li>
+</ul>
 
 <t t-name="Menu">
     <table align="center">
-- 
cgit v1.2.3


From 1d5f8506c8aa1677a13b89509a5f0d4903db085a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 16 Aug 2011 14:35:10 +0200
Subject: [IMP] cleanup shortcuts toggle code

bzr revid: xmo@openerp.com-20110816123510-gcx0dk8b2sgox5oi
---
 addons/base/static/src/xml/base.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index c41952785de..c35080644ff 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -417,10 +417,8 @@
     <table class="view-manager-main-table">
     <tr>
         <td class="view-manager-main-content">
-            <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-            <t t-if="view.view_type != form" t-foreach="views" t-as="view">
-                <a id = "shortcut_add_remove" title="Add / Remove Shortcut..." href="javascript: void(0)"> </a>
-            </t>
+            <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+               href="javascript: void(0)"> </a>
             <div class="oe_vm_switch">
                 <t t-if="views.length != 1" t-foreach="views" t-as="view">
                     <button type="button" t-att-data-view-type="view.view_type">
-- 
cgit v1.2.3


From e74e30708067e4626c7e096dfe6ea765d1b4aca2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 16 Aug 2011 14:37:24 +0200
Subject: [IMP] numerical id => move to data-id, from @id. Also fixes active_id
 as string which failed to match the numerical id stored, and did not mark the
 toggler as 'to remove' when opening an action from the corresponding shortcut

bzr revid: xmo@openerp.com-20110816123724-2ti43xqeue3esx3x
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index c35080644ff..2111ba11c54 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -364,7 +364,7 @@
 </t>
 <ul t-name="Shortcuts">
     <li t-foreach="shortcuts" t-as="shortcut"
-            t-att-id="shortcut.res_id"
+            t-att-data-id="shortcut.res_id"
             t-att-data-shortcut-id="shortcut.id"
         ><t t-esc="shortcut.name"/></li>
 </ul>
-- 
cgit v1.2.3