diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1e59897cd86..ac04fb4d1e1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2474,27 +2474,6 @@ .openerp .oe_trad_field.touched { border: 1px solid green !important; } -.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_layout_debugging .oe_form_group { outline: 2px dashed green; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3bb52497454..2698787c5a3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1929,25 +1929,6 @@ $sheet-max-width: 860px .oe_trad_field.touched border: 1px solid green !important // }}} - // View Editor {{{ - .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 - // }}} // Debugging stuff {{{ .oe_layout_debugging .oe_form_group diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index c1b1b984abe..844dd88a0ac 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -48,7 +48,7 @@ * OpenERP Web web module split *---------------------------------------------------------*/ openerp.web = function(session) { - var files = ["corelib","coresetup","dates","formats","chrome","data","views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import","view_editor"]; + var files = ["corelib","coresetup","dates","formats","chrome","data","views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; for(var i=0; i - - - -
- - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Export diff --git a/addons/web_view_editor/__init__.py b/addons/web_view_editor/__init__.py new file mode 100644 index 00000000000..40a96afc6ff --- /dev/null +++ b/addons/web_view_editor/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/addons/web_view_editor/__openerp__.py b/addons/web_view_editor/__openerp__.py new file mode 100644 index 00000000000..317a6cbc367 --- /dev/null +++ b/addons/web_view_editor/__openerp__.py @@ -0,0 +1,14 @@ +{ + "name": "View Editor", + "category": "Hidden", + "description": + """ + OpenERP Web to edit views. + """, + "version": "2.0", + "depends":['web'], + "js": ["static/src/js/view_editor.js"], + "css": ['static/src/css/view_editor.css'], + "qweb": ['static/src/xml/view_editor.xml'], + 'auto_install': True, +} diff --git a/addons/web_view_editor/i18n/web_view_editor.pot b/addons/web_view_editor/i18n/web_view_editor.pot new file mode 100644 index 00000000000..fa48d3e6909 --- /dev/null +++ b/addons/web_view_editor/i18n/web_view_editor.pot @@ -0,0 +1,19 @@ +# Translations template for PROJECT. +# Copyright (C) 2012 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2012. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2012-07-30 14:37+0530\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css new file mode 100644 index 00000000000..e80e15a4c17 --- /dev/null +++ b/addons/web_view_editor/static/src/css/view_editor.css @@ -0,0 +1,21 @@ +.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; +} diff --git a/addons/web/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js similarity index 97% rename from addons/web/static/src/js/view_editor.js rename to addons/web_view_editor/static/src/js/view_editor.js index 6df78679ecb..519f6bce3ee 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -1,7 +1,7 @@ -openerp.web.view_editor = function(instance) { +openerp.web_view_editor = function(instance) { var _t = instance.web._t; var QWeb = instance.web.qweb; -instance.web.ViewEditor = instance.web.OldWidget.extend({ +instance.web_view_editor.ViewEditor = instance.web.OldWidget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id; @@ -9,7 +9,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null), this.model = dataset.model; this.xml_element_id = 0; - this.property = instance.web.ViewEditor.property_widget; + this.property = instance.web_view_editor.ViewEditor.property_widget; this.one_object = false; }, start: function() { @@ -434,7 +434,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ break; } if (view_find.attr('level') < min_level) { - min_level = parseInt(view_find.attr('level')); + min_level = parseInt(view_find.attr('level')); } } var val = _.detect(obj.att_list, function(val) {return val[0] == "name";}); @@ -1013,7 +1013,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ }); } }); -instance.web.ViewEditor.Field = instance.web.Class.extend({ +instance.web_view_editor.ViewEditor.Field = instance.web.Class.extend({ init: function(view, widget) { this.$element = view.$element; this.dirty = false; @@ -1049,7 +1049,7 @@ instance.web.ViewEditor.Field = instance.web.Class.extend({ return _.str.sprintf("%s", this.name, QWeb.render(this.template, {widget: this})) } }); -instance.web.ViewEditor.FieldBoolean = instance.web.ViewEditor.Field.extend({ +instance.web_view_editor.ViewEditor.FieldBoolean = instance.web_view_editor.ViewEditor.Field.extend({ template : "vieweditor_boolean", start: function() { var self = this; @@ -1067,7 +1067,7 @@ instance.web.ViewEditor.FieldBoolean = instance.web.ViewEditor.Field.extend({ return this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null; } }); -instance.web.ViewEditor.FieldChar = instance.web.ViewEditor.Field.extend({ +instance.web_view_editor.ViewEditor.FieldChar = instance.web_view_editor.ViewEditor.Field.extend({ template : "vieweditor_char", start: function () { var self = this; @@ -1083,7 +1083,7 @@ instance.web.ViewEditor.FieldChar = instance.web.ViewEditor.Field.extend({ return this.$element.find("input[id=" + this.name + "]").val(); } }); -instance.web.ViewEditor.FieldSelect = instance.web.ViewEditor.Field.extend({ +instance.web_view_editor.ViewEditor.FieldSelect = instance.web_view_editor.ViewEditor.Field.extend({ template : "vieweditor_selection", start: function () { var self = this; @@ -1113,7 +1113,7 @@ instance.web.ViewEditor.FieldSelect = instance.web.ViewEditor.Field.extend({ return this.$element.find("select[id=" + this.name + "]").val(); } }); -instance.web.ViewEditor.FieldSelectMulti = instance.web.ViewEditor.FieldSelect.extend({ +instance.web_view_editor.ViewEditor.FieldSelectMulti = instance.web_view_editor.ViewEditor.FieldSelect.extend({ start: function () { this._super(); this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true); @@ -1129,7 +1129,7 @@ instance.web.ViewEditor.FieldSelectMulti = instance.web.ViewEditor.FieldSelect.e }); } }); -instance.web.ViewEditor.FieldFloat = instance.web.ViewEditor.FieldChar.extend({ +instance.web_view_editor.ViewEditor.FieldFloat = instance.web_view_editor.ViewEditor.FieldChar.extend({ }); var _PROPERTIES = { @@ -1202,11 +1202,11 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', 'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner', 'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph' ]; -instance.web.ViewEditor.property_widget = new instance.web.Registry({ - 'boolean' : 'instance.web.ViewEditor.FieldBoolean', - 'selection_multi' : 'instance.web.ViewEditor.FieldSelectMulti', - 'selection' : 'instance.web.ViewEditor.FieldSelect', - 'char' : 'instance.web.ViewEditor.FieldChar', - 'float' : 'instance.web.ViewEditor.FieldFloat' +instance.web_view_editor.ViewEditor.property_widget = new instance.web.Registry({ + 'boolean' : 'instance.web_view_editor.ViewEditor.FieldBoolean', + 'selection_multi' : 'instance.web_view_editor.ViewEditor.FieldSelectMulti', + 'selection' : 'instance.web_view_editor.ViewEditor.FieldSelect', + 'char' : 'instance.web_view_editor.ViewEditor.FieldChar', + 'float' : 'instance.web_view_editor.ViewEditor.FieldFloat' }); }; diff --git a/addons/web_view_editor/static/src/xml/view_editor.xml b/addons/web_view_editor/static/src/xml/view_editor.xml new file mode 100644 index 00000000000..e93fb3bd3ff --- /dev/null +++ b/addons/web_view_editor/static/src/xml/view_editor.xml @@ -0,0 +1,66 @@ + +