[MERGE] merged with main web

bzr revid: bde@tinyerp.com-20140304053849-wpvxs1ojl5jyjokt

1 files changed, 104 insertions, 36 deletions

diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
index e2e316b22d9..4522fd2504f 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,41 +1,109 @@
-<template>
-    <div t-name="GraphView" id="element-chart" class="oe_semantic_html_override editor-render" style="position:relative; width: 300px;">
-        <a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&amp;iacute;</a>
-        <div class="graph_header_legend">
+<templates>
+    <div t-name="GraphWidget" class="graph_widget">
+    	<div class="graph_header">
+
+      <div class="btn-toolbar hidden-print" role="toolbar">
+
+        <div class="btn-group graph_mode_selection" data-toggle="buttons">
+            <label class="btn btn-default" data-mode="pivot" title="Table Mode">
+                <input type="radio" name="modes"/><span class="fa fa-table"></span>
+            </label>
+            <label class="btn btn-default" data-mode="bar" title="Bar Chart">
+                <input type="radio" name="modes"/><span class="fa fa-bar-chart-o"></span>
+            </label>
+            <label class="btn btn-default" data-mode="line" title="Line Chart">
+                <input type="radio" name="modes"/><span class="fa fa-check-square"></span>
+            </label>
+            <label class="btn btn-default" data-mode="pie" title="Pie Chart">
+                <input type="radio" name="modes"/><span class="fa fa-adjust"></span>
+            </label>
+        </div>
+
+        <div class="btn-group graph_heatmap" data-toggle="buttons" >
+            <label class="btn btn-default" data-mode="both" title="Heat Map">
+                <input type="radio" name="heatmap"/><span class="fa fa-th"></span>
+            </label>
+            <label class="btn btn-default" data-mode="row" title="Heat Map (rows)">
+                <input type="radio" name="heatmap"/><span class="fa fa-bars"></span>
+            </label>
+            <label class="btn btn-default" data-mode="col" title="Heat Map (columns)">
+                <input type="radio" name="heatmap"/><span class="fa fa-bars fa-rotate-90"></span>
+            </label>
         </div>
-        <div class="graph-dropdown">
-            <h3 class="menu-section">
-                Graph Mode
-            </h3>
-            <ul class="graph-menu oe_graph_options">
-                <li><a href="#" data-mode="pie">Pie</a></li>
-                <li><a href="#" data-mode="bar" data-legend="top" data-stacked="true">Bars</a>
-                </li>
-                <li><a href="#" data-mode="line">Lines</a></li>
-                <li><a href="#" data-mode="area" data-legend="top" data-stacked="true">Areas</a>
-                </li>
-                <li><a href="#" data-mode="radar" data-legend="inside"
-                        data-orientation="0">Radar</a></li>
-            </ul>
-            <h3 class="menu-section">
-                Legend
-            </h3>
-            <ul class="graph-menu oe_graph_options">
-                <li><a href="#" data-legend="no">Hidden</a></li>
-                <li><a href="#" data-legend="inside">Inside</a></li>
-                <li><a href="#" data-legend="top">Top</a></li>
-            </ul>
-            <h3 class="menu-section">
-                Actions
-            </h3>
-            <ul class="graph-menu">
-                <li><a href="#" id="graph_switch">Switch Axis</a></li>
-                <li><a href="#" id="graph_show_data">Show Data</a></li>
-                <li><a href="#" id="graph_download">Download as PNG</a></li>
-            </ul>
+
+        <div class="btn-group graph_options_selection">
+            <label class="btn btn-default" data-choice="swap_axis" title="Swap Axis">
+                <span class="fa fa-expand"></span>
+            </label>
+            <label class="btn btn-default" data-choice="update_values" title="Reload Data">
+                <span class="fa fa-refresh"></span>
+            </label>
+            <label class="btn btn-default" data-choice="export_data" title="Export Data" style="display:none">
+                <span class="fa fa-download"></span>
+            </label>
         </div>
-        <div id="editor-render-body">
+        <div class="btn-group">
+            <label class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                Measures <span class="caret"></span>
+            </label>
+                <ul class="dropdown-menu graph_measure_selection" role="menu">
+                </ul>
         </div>
     </div>
+	</div>
+    	<div class="graph_main_content"></div>
+    </div>
 
-</template>
+	<div t-name="field_selection" class="btn-group">
+		<span class="btn btn-default field-selection dropdown-toggle" data-toggle="dropdown"></span>
+        <ul class="dropdown-menu" 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)'"/>
+                        </a>
+                    </li>
+                </t>
+
+                 <t t-if="(field.type !== 'date') &amp;&amp; (field.type !== 'datetime')">
+                    <li>
+                        <a class="field-selection" t-att-data-field-id="field.id" t-att-data-id="header_id" href="#">
+                            <t t-esc="field.value"/>
+                        </a>
+                    </li>
+                </t>
+	        </t>
+        </ul>
+    </div>
+
+    <div t-name="graph_no_data" class="oe_view_nocontent" >
+        <div class="oe_empty_custom_dashboard">
+            <p><b>No data to display.</b></p>
+            <p>
+                    No data available for this graph.  Try to add some records, or make sure
+                    that there is at least one measure and no active filter in the search bar.
+            </p>
+        </div>
+    </div>
+</templates>