summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-05-22 18:54:57 +0530
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-05-22 18:54:57 +0530
commitc46209b48708edc04a3a472254a401b918ddde4c (patch)
treebb069153637a35d7b0c201602aeecfc664d9943c /addons/web/static/src
parentd89a2335e8a22baf132ecbd01fbf19faa3bc4f5e (diff)
[IMP]implement base.sass
bzr revid: vme@tinyerp.com-20120522132457-12iwcjve88icd4tc
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css22
-rw-r--r--addons/web/static/src/css/base.sass19
-rw-r--r--addons/web/static/src/js/view_editor.js3
3 files changed, 43 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4a426e13e39..5ebe3b83cda 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2087,6 +2087,28 @@
color: #333333;
}
+.openerp .oe_view_editor {
+ width: 100%;
+ border-collapse: collapse;
+ margin-left: -12px;
+ width: 100%;
+ background-color: white;
+ border-spacing: 0;
+}
+.openerp .oe_view_editor td {
+ text-align: center;
+ white-space: nowrap;
+ border: 1px solid #d8d8d8;
+ cursor: pointer;
+ font-size: 90%;
+}
+.openerp .oe_view_editor_field td {
+ border: 0px !important;
+}
+.openerp .oe_view_editor tr:hover {
+ background-color: #ecebf2;
+}
+
.openerp .oe_form_field_many2one td:first-child {
position: relative;
}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f128d93c4c1..136673ff215 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1725,6 +1725,25 @@ $colour4: #8a89ba
float: right
color: #333
// }}}
+//view editor
+.openerp
+ .oe_view_editor
+ width: 100%
+ border-collapse: collapse
+ margin-left: -12px
+ width: 100%
+ background-color: white
+ border-spacing: 0
+ td
+ text-align: center
+ white-space: nowrap
+ border: 1px solid #D8D8D8
+ cursor: pointer
+ font-size: 90%
+ .oe_view_editor_field td
+ border: 0px !important
+ .oe_view_editor tr:hover
+ background-color: #ecebf2
// Transitional overrides for old styles {{{
.openerp
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f169887cc54..ae6be998275 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -52,10 +52,11 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
this.main_view_id = this.parent.fields_view.view_id;
this.action_manager = new instance.web.ActionManager(this);
- this.action_manager.appendTo(this.view_edit_dialog);
$.when(this.action_manager.do_action(action)).then(function() {
var viewmanager = self.action_manager.inner_viewmanager,
controller = viewmanager.views[viewmanager.active_view].controller;
+ self.action_manager.appendTo(self.view_edit_dialog.$element);
+ self.action_manager.renderElement(self.view_edit_dialog);
controller.on_loaded.add_last(function(){
$(controller.groups).bind({
'selected': function(e, ids, records) {