[MERGE] trunk

bzr revid: al@openerp.com-20120608165932-qp494qy31xa6oi6t

2 files changed, 113 insertions, 0 deletions

diff --git a/addons/web_graph/static/src/css/flotr2.css b/addons/web_graph/static/src/css/flotr2.css
new file mode 100644
index 00000000000..fae7b033811
--- /dev/null
+++ b/addons/web_graph/static/src/css/flotr2.css
@@ -0,0 +1,69 @@
+/* Flotr Styles */
+
+.flotr-datagrid-container {
+  border: 1px solid #999;
+  border-bottom: none;
+  background: #fff;
+}
+.flotr-datagrid {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.flotr-datagrid td, .flotr-datagrid th {
+  border: 1px solid #ccc;
+  padding: 1px 3px;
+  min-width: 2em;
+}
+.flotr-datagrid tr:hover, .flotr-datagrid col.hover {
+  background: #f3f3f3;
+}
+.flotr-datagrid tr:hover th, .flotr-datagrid th.hover {
+  background: #999;
+  color: #fff;
+}
+.flotr-datagrid th {
+  text-align: left;
+  background: #e3e3e3;
+  border: 2px outset #fff;
+}
+.flotr-datagrid-toolbar {
+	padding: 1px;
+  border-bottom: 1px solid #ccc;
+  background: #f9f9f9;
+}
+.flotr-datagrid td:hover {
+  background: #ccc;
+}
+.flotr-datagrid .first-row th {
+  text-align: center;
+}
+.flotr-canvas {
+  margin-bottom: -3px;
+  padding-bottom: 1px;
+}
+.flotr-tabs-group {
+	border-top: 1px solid #999;
+}
+.flotr-tab {
+  border: 1px solid #666;
+  border-top: none;
+  margin: 0 3px;
+  padding: 1px 4px;
+  cursor: pointer;
+  -moz-border-radius: 0 0 4px 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-radius: 0 0 4px 4px;
+  opacity: 0.5;
+  -moz-opacity: 0.5;
+}
+.flotr-tab.selected {
+  background: #ddd;
+  opacity: 1;
+  -moz-opacity: 1;
+}
+.flotr-tab:hover {
+  background: #ccc;
+}
+
+
diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css
new file mode 100644
index 00000000000..7e01346cc3a
--- /dev/null
+++ b/addons/web_graph/static/src/css/graph.css
@@ -0,0 +1,44 @@
+.dropdown-menu-icon {
+    z-index: 5000;
+    position: absolute;
+    right: 0px;
+}
+
+.editor-render {
+    position: relative;
+}
+#editor-render-body {
+    position: relative;
+    width: 650px;
+    height: 350px;
+}
+.graph-dropdown {
+    padding: 5px;
+    width: 200px;
+    border: 1px #333 solid;
+    display: none;
+    position: absolute;
+    right: 0px;
+    background: #fafaf5;
+    z-index: 100;
+}
+.open .graph-dropdown {
+    display: block;
+}
+.graph-menu {
+    padding: 3px;
+}
+.graph-menu .active {
+    background: #aaaaff;
+}
+li {
+    padding: 2px;
+    margin-left: 10px;
+}
+a .graph-menu-options {
+    color: white;
+}
+div .graph-menu-options {
+    float: right;
+    top: 0px;
+}