From dd6de9b2006cfe5bc7be28d70addc321691d2746 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 7 May 2012 10:19:08 +0200
Subject: [IMP] replacing by flotr2, initial commit

bzr revid: fp@tinyerp.com-20120507081908-j0sfm5f84f0t32yg
---
 addons/web_graph/static/src/xml/web_graph.xml | 51 +++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 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 90349623946..710036d40d3 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,4 +1,49 @@
 <template>
-    <div t-name="GraphView" t-att-id="element_id+'-'+chart+'chart'"
-         style="height:300px;position:relative;"/>
-</template>
\ No newline at end of file
+	<div t-name="GraphView" id="element_id-chart" class="editor-render" style="height:300px; width:300px; position:relative;">
+		<div class="graph_header_legend">
+		</div>
+		<a href="#" class="i dropdown-menu-icon" data-toggle="dropdown">B</a>
+		<div class="graph-dropdown">
+			<div class="menu-section">
+				Graph Mode:
+			</div>
+			<ul class="graph-menu">
+				<li><a href="#" id="graph_pie">Pie</a></li>
+				<li>
+					<a href="#" id="graph_bar">Bars</a>
+					<div class="i graph-menu-options">
+						<a href="#" id="graph_bar_stacked">w</a>
+						<a href="#" id="graph_bar_not_stacked">O</a>
+					</div>
+				</li>
+				<li><a href="#" id="graph_line">Lines</a></li>
+				<li><a href="#" id="graph_area">Areas</a>
+					<div class="i graph-menu-options">
+						<a href="#" id="graph_area_stacked">w</a>
+						<a href="#" id="graph_area_not_stacked">O</a>
+					</div>
+				</li>
+				<li><a href="#" id="graph_radar">Radar</a></li>
+			</ul>
+			<div class="menu-section">
+				Legend:
+			</div>
+			<ul class="graph-menu">
+				<li><a href="#" id="graph_legend_no">Hide</a></li>
+				<li><a href="#" id="graph_legend_inside">Inside</a></li>
+				<li><a href="#" id="graph_legend_top">Top</a></li>
+			</ul>
+			<div class="menu-section">
+				Actions:
+			</div>
+			<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>
+		<div id="editor-render-body">
+		</div>
+	</div>
+
+</template>
-- 
cgit v1.2.3


From 76b1514392a4dee3fd07ec89a7aa5de3ef88ca16 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 7 May 2012 11:40:59 +0200
Subject: [IMP] code for graph lib

bzr revid: fp@tinyerp.com-20120507094059-y0ogjwcocp71hfue
---
 addons/web_graph/static/src/xml/web_graph.xml | 93 ++++++++++++++-------------
 1 file changed, 47 insertions(+), 46 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 710036d40d3..c11525ba353 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,49 +1,50 @@
 <template>
-	<div t-name="GraphView" id="element_id-chart" class="editor-render" style="height:300px; width:300px; position:relative;">
-		<div class="graph_header_legend">
-		</div>
-		<a href="#" class="i dropdown-menu-icon" data-toggle="dropdown">B</a>
-		<div class="graph-dropdown">
-			<div class="menu-section">
-				Graph Mode:
-			</div>
-			<ul class="graph-menu">
-				<li><a href="#" id="graph_pie">Pie</a></li>
-				<li>
-					<a href="#" id="graph_bar">Bars</a>
-					<div class="i graph-menu-options">
-						<a href="#" id="graph_bar_stacked">w</a>
-						<a href="#" id="graph_bar_not_stacked">O</a>
-					</div>
-				</li>
-				<li><a href="#" id="graph_line">Lines</a></li>
-				<li><a href="#" id="graph_area">Areas</a>
-					<div class="i graph-menu-options">
-						<a href="#" id="graph_area_stacked">w</a>
-						<a href="#" id="graph_area_not_stacked">O</a>
-					</div>
-				</li>
-				<li><a href="#" id="graph_radar">Radar</a></li>
-			</ul>
-			<div class="menu-section">
-				Legend:
-			</div>
-			<ul class="graph-menu">
-				<li><a href="#" id="graph_legend_no">Hide</a></li>
-				<li><a href="#" id="graph_legend_inside">Inside</a></li>
-				<li><a href="#" id="graph_legend_top">Top</a></li>
-			</ul>
-			<div class="menu-section">
-				Actions:
-			</div>
-			<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>
-		<div id="editor-render-body">
-		</div>
-	</div>
+    <div t-name="GraphView" id="element_id-chart" class="editor-render" style="height:300px; width:300px; position:relative;">
+        <h1>This is a test</h1>
+        <div class="graph_header_legend">
+        </div>
+        <a href="#" class="i dropdown-menu-icon" data-toggle="dropdown">B</a>
+        <div class="graph-dropdown">
+            <div class="menu-section">
+                Graph Mode:
+            </div>
+            <ul class="graph-menu">
+                <li><a href="#" id="graph_pie">Pie</a></li>
+                <li>
+                    <a href="#" id="graph_bar">Bars</a>
+                    <div class="i graph-menu-options">
+                        <a href="#" id="graph_bar_stacked">w</a>
+                        <a href="#" id="graph_bar_not_stacked">O</a>
+                    </div>
+                </li>
+                <li><a href="#" id="graph_line">Lines</a></li>
+                <li><a href="#" id="graph_area">Areas</a>
+                    <div class="i graph-menu-options">
+                        <a href="#" id="graph_area_stacked">w</a>
+                        <a href="#" id="graph_area_not_stacked">O</a>
+                    </div>
+                </li>
+                <li><a href="#" id="graph_radar">Radar</a></li>
+            </ul>
+            <div class="menu-section">
+                Legend:
+            </div>
+            <ul class="graph-menu">
+                <li><a href="#" id="graph_legend_no">Hide</a></li>
+                <li><a href="#" id="graph_legend_inside">Inside</a></li>
+                <li><a href="#" id="graph_legend_top">Top</a></li>
+            </ul>
+            <div class="menu-section">
+                Actions:
+            </div>
+            <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>
+        <div id="editor-render-body">
+        </div>
+    </div>
 
 </template>
-- 
cgit v1.2.3


From 22fb74570078646915791118d2869f0818a8526c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 7 May 2012 15:38:21 +0200
Subject: [IMP] working version of graphs, remaining: size & fetch

bzr revid: fp@tinyerp.com-20120507133821-7mmwxo81vfjpq3e5
---
 addons/web_graph/static/src/xml/web_graph.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 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 c11525ba353..dbc19880ff2 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,9 +1,8 @@
 <template>
     <div t-name="GraphView" id="element_id-chart" class="editor-render" style="height:300px; width:300px; position:relative;">
-        <h1>This is a test</h1>
         <div class="graph_header_legend">
         </div>
-        <a href="#" class="i dropdown-menu-icon" data-toggle="dropdown">B</a>
+        <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown">B</a>
         <div class="graph-dropdown">
             <div class="menu-section">
                 Graph Mode:
@@ -12,14 +11,14 @@
                 <li><a href="#" id="graph_pie">Pie</a></li>
                 <li>
                     <a href="#" id="graph_bar">Bars</a>
-                    <div class="i graph-menu-options">
+                    <div class="oe_i graph-menu-options">
                         <a href="#" id="graph_bar_stacked">w</a>
                         <a href="#" id="graph_bar_not_stacked">O</a>
                     </div>
                 </li>
                 <li><a href="#" id="graph_line">Lines</a></li>
                 <li><a href="#" id="graph_area">Areas</a>
-                    <div class="i graph-menu-options">
+                    <div class="oe_i graph-menu-options">
                         <a href="#" id="graph_area_stacked">w</a>
                         <a href="#" id="graph_area_not_stacked">O</a>
                     </div>
-- 
cgit v1.2.3


From 3a214057e4dbb559a14100c9003d2c2d23df1e76 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 7 May 2012 17:04:50 +0200
Subject: [IMP] Graphs

bzr revid: fp@tinyerp.com-20120507150450-v319vxug5d6a74mf
---
 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 dbc19880ff2..5b022a681ed 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,5 +1,5 @@
 <template>
-    <div t-name="GraphView" id="element_id-chart" class="editor-render" style="height:300px; width:300px; position:relative;">
+    <div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
         <div class="graph_header_legend">
         </div>
         <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown">B</a>
-- 
cgit v1.2.3


From eb9a03cdd3f15aaf059d37f361d54ca5b01f1cbd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 8 May 2012 01:26:16 +0200
Subject: [IMP] tooltips

bzr revid: fp@openerp.com-20120507232616-yhlznjh2zdbiykb6
---
 addons/web_graph/static/src/xml/web_graph.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 5b022a681ed..1830f2447d9 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -2,7 +2,7 @@
     <div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
         <div class="graph_header_legend">
         </div>
-        <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown">B</a>
+        <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">B</a>
         <div class="graph-dropdown">
             <div class="menu-section">
                 Graph Mode:
@@ -12,15 +12,15 @@
                 <li>
                     <a href="#" id="graph_bar">Bars</a>
                     <div class="oe_i graph-menu-options">
-                        <a href="#" id="graph_bar_stacked">w</a>
-                        <a href="#" id="graph_bar_not_stacked">O</a>
+                        <a href="#" id="graph_bar_stacked" title="Stacked Bars">w</a>
+                        <a href="#" id="graph_bar_not_stacked" title="Multiple Bars">O</a>
                     </div>
                 </li>
                 <li><a href="#" id="graph_line">Lines</a></li>
                 <li><a href="#" id="graph_area">Areas</a>
                     <div class="oe_i graph-menu-options">
-                        <a href="#" id="graph_area_stacked">w</a>
-                        <a href="#" id="graph_area_not_stacked">O</a>
+                        <a href="#" id="graph_area_stacked" title="Stacked Areas">w</a>
+                        <a href="#" id="graph_area_not_stacked" title="Multiple Areas">O</a>
                     </div>
                 </li>
                 <li><a href="#" id="graph_radar">Radar</a></li>
-- 
cgit v1.2.3


From 656ce51ae4f8bcf17b46bae5a5da352f9f64fa23 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 7 Jun 2012 17:46:45 +0200
Subject: [IMP] encode behavior of menu items directly in their markup as data
 attributes

bzr revid: xmo@openerp.com-20120607154645-3ghi8fnuqqrhr40z
---
 addons/web_graph/static/src/xml/web_graph.xml | 35 ++++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 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 1830f2447d9..5cdd0d46ee1 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -7,31 +7,38 @@
             <div class="menu-section">
                 Graph Mode:
             </div>
-            <ul class="graph-menu">
-                <li><a href="#" id="graph_pie">Pie</a></li>
+            <ul class="graph-menu oe_graph_options">
+                <li><a href="#" data-mode="pie">Pie</a></li>
                 <li>
-                    <a href="#" id="graph_bar">Bars</a>
+                    <a href="#" data-mode="bar" data-legend="top"
+                       data-stacked="true">Bars</a>
                     <div class="oe_i graph-menu-options">
-                        <a href="#" id="graph_bar_stacked" title="Stacked Bars">w</a>
-                        <a href="#" id="graph_bar_not_stacked" title="Multiple Bars">O</a>
+                        <a href="#" data-mode="bar" data-legend="top"
+                           data-stacked="true" title="Stacked Bars">w</a>
+                        <a href="#" data-mode="bar" data-legend="top"
+                           data-stacked="false" title="Multiple Bars">O</a>
                     </div>
                 </li>
-                <li><a href="#" id="graph_line">Lines</a></li>
-                <li><a href="#" id="graph_area">Areas</a>
+                <li><a href="#" data-mode="line">Lines</a></li>
+                <li><a href="#" data-mode="area" data-legend="top"
+                        data-stacked="true">Areas</a>
                     <div class="oe_i graph-menu-options">
-                        <a href="#" id="graph_area_stacked" title="Stacked Areas">w</a>
-                        <a href="#" id="graph_area_not_stacked" title="Multiple Areas">O</a>
+                        <a href="#" data-mode="area" data-legend="top"
+                            data-stacked="true" title="Stacked Areas">w</a>
+                        <a href="#" data-mode="area" data-legend="top"
+                            data-stacked="false" title="Multiple Areas">O</a>
                     </div>
                 </li>
-                <li><a href="#" id="graph_radar">Radar</a></li>
+                <li><a href="#" data-mode="radar" data-legend="inside"
+                        data-orientation="0">Radar</a></li>
             </ul>
             <div class="menu-section">
                 Legend:
             </div>
-            <ul class="graph-menu">
-                <li><a href="#" id="graph_legend_no">Hide</a></li>
-                <li><a href="#" id="graph_legend_inside">Inside</a></li>
-                <li><a href="#" id="graph_legend_top">Top</a></li>
+            <ul class="graph-menu oe_graph_options">
+                <li><a href="#" data-legend="no">Hide</a></li>
+                <li><a href="#" data-legend="inside">Inside</a></li>
+                <li><a href="#" data-legend="top">Top</a></li>
             </ul>
             <div class="menu-section">
                 Actions:
-- 
cgit v1.2.3