From afb19c59ee523c5150802a7591e7d92b8343cc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Fri, 25 Jul 2014 14:35:42 +0200
Subject: [IMP] improve graph view layout and groupbys

* add a 'total' foldable button to allow the user to control the column
in pivot table view
* in the dropdown menu, add all fields from the model instead of only
those from the search view groupbys
---
 addons/web_graph/static/src/xml/web_graph.xml | 37 +++++++++------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

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

diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
index 81804e5a9b1..6a2032b0f8f 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -57,35 +57,22 @@
     	<div class="graph_main_content"></div>
     </div>
 
-	<div t-name="field_selection" class="btn-group">
+	<div t-name="field_selection" class="dropdown">
 		<span class="btn btn-default field-selection dropdown-toggle" data-toggle="dropdown"></span>
-        <ul class="dropdown-menu" role="menu">
+        <ul class="dropdown-menu multi-level" role="menu">
 	    	<t t-foreach="fields" t-as="field">
                 <t t-if="(field.type === 'date') || (field.type === 'datetime')">
-                    <li>
-                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-interval="'day'" t-att-data-id="header_id" href="#">
-                            <t t-esc="field.value + ' (day)'"/>
-                        </a>
-                    </li>
-                    <li>
-                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-interval="'week'" t-att-data-id="header_id" href="#">
-                            <t t-esc="field.value + ' (week)'"/>
-                        </a>
-                    </li>
-                    <li>
-                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-interval="'month'" t-att-data-id="header_id" href="#">
-                            <t t-esc="field.value + ' (month)'"/>
-                        </a>
-                    </li>
-                    <li>
-                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-interval="'quarter'" t-att-data-id="header_id" href="#">
-                            <t t-esc="field.value + ' (quarter)'"/>
-                        </a>
-                    </li>
-                    <li>
-                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-interval="'year'" t-att-data-id="header_id" href="#">
-                            <t t-esc="field.value + ' (year)'"/>
+                    <li class="dropdown-submenu">
+                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'month'" href="#">
+                            <t t-esc="field.value"/>
                         </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'day'">Day</a></li>
+                            <li><a href="#" class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'week'">Week</a></li>
+                            <li><a href="#" class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'month'">Month</a></li>
+                            <li><a href="#" class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'quarter'">Quarter</a></li>
+                            <li><a href="#" class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'year'">Year</a></li>
+                        </ul>
                     </li>
                 </t>
 
-- 
cgit v1.2.3


From 08d957c264532db41e08385ac7f8b42b09865836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Wed, 30 Jul 2014 09:42:00 +0200
Subject: [FIX] addon web: prefix css dropdown-submenu

to prevent possible future conflicts
---
 addons/web_graph/static/src/xml/web_graph.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
index 6a2032b0f8f..828d184dc24 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -62,7 +62,7 @@
         <ul class="dropdown-menu multi-level" role="menu">
 	    	<t t-foreach="fields" t-as="field">
                 <t t-if="(field.type === 'date') || (field.type === 'datetime')">
-                    <li class="dropdown-submenu">
+                    <li class="graph-dropdown-submenu">
                         <a class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" t-att-data-interval="'month'" href="#">
                             <t t-esc="field.value"/>
                         </a>
-- 
cgit v1.2.3