odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[CHG] Ashes to ashes, dashes to underscores. 

bzr revid: fme@openerp.com-20120627141249-o10e2htxqtio72l7
This commit is contained in:
Fabien Meghazi 2012-06-27 16:12:49 +02:00
parent f17b0eea00
commit ce7fb5bb37
26 changed files with 233 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
addons/web/static/src/css/base.css
View File

@ -20,7 +20,7 @@
font-style: normal; font-style: normal;
} }
.openerp.openerp-web-client-container { .openerp.openerp_webclient_container {
height: 100%; height: 100%;
position: relative; position: relative;
} }
@ -1184,7 +1184,7 @@
.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { .openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td {
padding-top: 8px; padding-top: 8px;
} }
.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { .openerp .oe_popup_form > .oe_formview > .oe_form_pager {
display: none !important; display: none !important;
} }
.openerp .oe_searchview { .openerp .oe_searchview {
@ -1963,7 +1963,7 @@
width: 45px; width: 45px;
height: 30px; height: 30px;
} }
.openerp .oe_hidden_input_file input.oe-binary-file { .openerp .oe_hidden_input_file input.oe_form_binary_file {
z-index: 0; z-index: 0;
line-height: 0; line-height: 0;
font-size: 12px; font-size: 12px;
@ -2004,7 +2004,7 @@
.openerp .oe_form_field_many2one td:first-child { .openerp .oe_form_field_many2one td:first-child {
position: relative; position: relative;
} }
.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button { .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
position: absolute; position: absolute;
top: 3px; top: 3px;
right: 2px; right: 2px;
@ -2012,7 +2012,7 @@
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none; display: none;
} }
.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save { .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save {
background-image: url(/web/static/src/img/iconset-b-remove.png); background-image: url(/web/static/src/img/iconset-b-remove.png);
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top {
@ -2033,28 +2033,28 @@
height: auto; height: auto;
line-height: 16px; line-height: 16px;
} }
.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page {
display: none; display: none;
} }
.openerp .oe-listview-content { .openerp .oe_list_content {
width: 100%; width: 100%;
} }
.openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after { .openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after {
border-width: 0; border-width: 0;
} }
.openerp .oe-listview-content > thead { .openerp .oe_list_content > thead {
border-bottom: 2px solid #cacaca; border-bottom: 2px solid #cacaca;
background: #eeeeee; background: #eeeeee;
vertical-align: top; vertical-align: top;
} }
.openerp .oe-listview-content > thead th { .openerp .oe_list_content > thead th {
position: relative; position: relative;
} }
.openerp .oe-listview-content td, .openerp .oe-listview-content th { .openerp .oe_list_content td, .openerp .oe_list_content th {
padding: 3px 6px; padding: 3px 6px;
line-height: 18px; line-height: 18px;
} }
.openerp .oe-listview-content th:after { .openerp .oe_list_content th:after {
position: absolute; position: absolute;
right: 6px; right: 6px;
content: ""; content: "";
@ -2064,12 +2064,12 @@
border-color: black transparent; border-color: black transparent;
visibility: hidden; visibility: hidden;
} }
.openerp .oe-listview-content th.sortup:after { .openerp .oe_list_content th.sortup:after {
visibility: visible; visibility: visible;
filter: alpha(opacity=60); filter: alpha(opacity=60);
opacity: 0.6; opacity: 0.6;
} }
.openerp .oe-listview-content th.sortdown:after { .openerp .oe_list_content th.sortdown:after {
border-bottom: none; border-bottom: none;
border-left: 4px solid transparent; border-left: 4px solid transparent;
border-right: 4px solid transparent; border-right: 4px solid transparent;
@ -2081,20 +2081,20 @@
filter: alpha(opacity=60); filter: alpha(opacity=60);
opacity: 0.6; opacity: 0.6;
} }
.openerp .oe-listview-content > tbody { .openerp .oe_list_content > tbody {
cursor: pointer; cursor: pointer;
background: white; background: white;
} }
.openerp .oe-listview-content > tbody > tr { .openerp .oe_list_content > tbody > tr {
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
} }
.openerp .oe-listview-content > tbody > tr > td.oe-field-cell { .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
padding: 3px 6px; padding: 3px 6px;
} }
.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th { .openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th {
line-height: 18px; line-height: 18px;
} }
.openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button { .openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
border: none; border: none;
background: transparent; background: transparent;
padding: 0; padding: 0;
@ -2102,16 +2102,16 @@
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child { .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child {
width: 17px; width: 17px;
} }
.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child:after { .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after {
border-width: 0; border-width: 0;
} }
.openerp .oe-listview-content > tbody > tr > td.oe_number { .openerp .oe_list_content > tbody > tr > td.oe_number {
text-align: right !important; text-align: right !important;
} }
.openerp .oe-listview-content > tbody > tr:nth-child(odd) { .openerp .oe_list_content > tbody > tr:nth-child(odd) {
background-color: #f0f0fa; background-color: #f0f0fa;
background-color: #f0f0fa; background-color: #f0f0fa;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
@ -2121,13 +2121,13 @@
background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
} }
.openerp .oe-listview-content > tfoot { .openerp .oe_list_content > tfoot {
border-top: 2px solid #cacaca; border-top: 2px solid #cacaca;
border-bottom: 1px solid #cacaca; border-bottom: 1px solid #cacaca;
background: #eeeeee; background: #eeeeee;
font-weight: bold; font-weight: bold;
} }
.openerp .oe-listview-content > tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { .openerp .oe_list_content > tbody tr:hover td, .openerp .oe_list_content tbody tr:hover th {
background-color: #eeeeee; background-color: #eeeeee;
background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede));
background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); background-image: -webkit-linear-gradient(top, #eeeeee, #dedede);
@ -2136,11 +2136,11 @@
background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: -o-linear-gradient(top, #eeeeee, #dedede);
background-image: linear-gradient(to bottom, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede);
} }
.openerp .oe-listview-content .numeric { .openerp .oe_list_content .numeric {
text-align: right; text-align: right;
width: 82px; width: 82px;
} }
.openerp .oe-listview-content .numeric input { .openerp .oe_list_content .numeric input {
text-align: right; text-align: right;
} }
.openerp .oe_trad_field.touched { .openerp .oe_trad_field.touched {

16
addons/web/static/src/css/base.sass
View File

@ -98,7 +98,7 @@ $colour4: #8a89ba
// }}} // }}}
.openerp.openerp-web-client-container .openerp.openerp_webclient_container
height: 100% height: 100%
position: relative position: relative
@ -927,7 +927,7 @@ $colour4: #8a89ba
padding-top: 8px padding-top: 8px
// }}} // }}}
// Viewmanager popup {{{ // Viewmanager popup {{{
.oe-select-create-popup-view-form > .oe_formview > .oe_form_pager .oe_popup_form > .oe_formview > .oe_form_pager
display: none !important display: none !important
// }}} // }}}
// SearchView {{{ // SearchView {{{
@ -1539,7 +1539,7 @@ $colour4: #8a89ba
display: inline-block display: inline-block
width: 45px width: 45px
height: 30px height: 30px
input.oe-binary-file input.oe_form_binary_file
z-index: 0 z-index: 0
line-height: 0 line-height: 0
font-size: 12px font-size: 12px
@ -1577,7 +1577,7 @@ $colour4: #8a89ba
.oe_form_field_many2one .oe_form_field_many2one
td:first-child td:first-child
position: relative position: relative
span.oe-m2o-drop-down-button span.oe_m2o_drop_down_button
position: absolute position: absolute
top: 3px top: 3px
right: 2px right: 2px
@ -1588,7 +1588,7 @@ $colour4: #8a89ba
display: none display: none
.oe_form_field_one2many .oe_form_field_one2many
// TODO: oe_form_field_one2many_list? // TODO: oe_form_field_one2many_list?
.oe-listview .oe-edit-row-save .oe_list .oe_list_edit_row_save
background-image: url(/web/static/src/img/iconset-b-remove.png) background-image: url(/web/static/src/img/iconset-b-remove.png)
&> .oe_view_manager &> .oe_view_manager
@ -1608,12 +1608,12 @@ $colour4: #8a89ba
line-height: 16px line-height: 16px
// }}} // }}}
// FormView.many2many {{{ // FormView.many2many {{{
.oe_form .oe_form_field_many2many > .oe-listview .oe_form .oe_form_field_many2many > .oe_list
.oe_list_pager_single_page .oe_list_pager_single_page
display: none display: none
// }}} // }}}
// ListView {{{ // ListView {{{
.oe-listview-content .oe_list_content
width: 100% width: 100%
td:first-child, th:first-child td:first-child, th:first-child
&:after &:after
@ -1652,7 +1652,7 @@ $colour4: #8a89ba
background: white background: white
> tr > tr
border-top: 1px solid #ddd border-top: 1px solid #ddd
> td.oe-field-cell > td.oe_list_field_cell
padding: 3px 6px padding: 3px 6px
> td, > th > td, > th
line-height: 18px line-height: 18px

2
addons/web/static/src/css/data_export.css
View File

@ -1,4 +1,4 @@
.openerp .oe-export { .openerp .oe_export {
width: 100%; width: 100%;
} }
.openerp .oe_export_row tr{ .openerp .oe_export_row tr{

12
addons/web/static/src/css/data_import.css vendored
View File

@ -12,22 +12,22 @@
border-bottom: 1px solid #E3E3E3; border-bottom: 1px solid #E3E3E3;
} }
.openerp .oe-import-no-result .oe-import-result { .openerp .oe_import_no_result .oe_import_result {
display: none; display: none;
} }
.openerp .oe-import fieldset { .openerp .oe_import fieldset {
cursor: pointer; cursor: pointer;
} }
.openerp .oe-import fieldset legend:before { .openerp .oe_import fieldset legend:before {
content: '\25BC '; content: '\25BC ';
} }
.openerp .oe-import fieldset.oe-closed legend:before { .openerp .oe_import fieldset.oe_closed legend:before {
content: '\25B6 '; content: '\25B6 ';
} }
.openerp .oe-import fieldset.oe-closed table { .openerp .oe_import fieldset.oe_closed table {
display: none; display: none;
} }
.openerp .oe-import .separator.horizontal { .openerp .oe_import .separator.horizontal {
font-weight: bold; font-weight: bold;
border-bottom-width: 1px; border-bottom-width: 1px;
margin: 6px 4px 6px 1px; margin: 6px 4px 6px 1px;

5
addons/web/static/src/js/chrome.js
View File

@ -855,12 +855,9 @@ instance.web.WebClient = instance.web.Widget.extend({
}, },
start: function() { start: function() {
var self = this; var self = this;
this.$element.addClass("openerp openerp-web-client-container"); this.$element.addClass("openerp openerp_webclient_container");
if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
$("body").addClass("kitten-mode-activated"); $("body").addClass("kitten-mode-activated");
self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
self.$element.toggleClass('clark-gable');
});
} }
this.session.session_bind().then(function() { this.session.session_bind().then(function() {
self.destroy_content(); self.destroy_content();

14
addons/web/static/src/js/data_import.js
View File

@ -68,7 +68,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
this.open({ this.open({
buttons: [ buttons: [
{text: _t("Close"), click: function() { self.destroy(); }}, {text: _t("Close"), click: function() { self.destroy(); }},
{text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe-dialog-import-button'} {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe_import_dialog_button'}
], ],
close: function(event, ui) { close: function(event, ui) {
self.destroy(); self.destroy();
@ -78,7 +78,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
this.$element.find('#csvfile').change(this.on_autodetect_data); this.$element.find('#csvfile').change(this.on_autodetect_data);
this.$element.find('fieldset').change(this.on_autodetect_data); this.$element.find('fieldset').change(this.on_autodetect_data);
this.$element.delegate('fieldset legend', 'click', function() { this.$element.delegate('fieldset legend', 'click', function() {
$(this).parent().toggleClass('oe-closed'); $(this).parent().toggleClass('oe_closed');
}); });
this.ready.push(new instance.web.DataSet(this, this.model).call( this.ready.push(new instance.web.DataSet(this, this.model).call(
'fields_get', [], function (fields) { 'fields_get', [], function (fields) {
@ -157,7 +157,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
}, },
toggle_import_button: function (newstate) { toggle_import_button: function (newstate) {
instance.web.dialog(this.$element, 'widget') instance.web.dialog(this.$element, 'widget')
.find('.oe-dialog-import-button') .find('.oe_import_dialog_button')
.button('option', 'disabled', !newstate); .button('option', 'disabled', !newstate);
}, },
do_import: function() { do_import: function() {
@ -202,7 +202,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
if (results['error']) { if (results['error']) {
result_node.append(QWeb.render('ImportView.error', { result_node.append(QWeb.render('ImportView.error', {
'error': results['error']})); 'error': results['error']}));
this.$element.find('fieldset').removeClass('oe-closed'); this.$element.find('fieldset').removeClass('oe_closed');
return; return;
} }
if (results['success']) { if (results['success']) {
@ -224,11 +224,11 @@ instance.web.DataImport = instance.web.Dialog.extend({
: with_headers ? results.records.slice(1) : with_headers ? results.records.slice(1)
: results.records : results.records
})); }));
this.$element.find('fieldset').addClass('oe-closed'); this.$element.find('fieldset').addClass('oe_closed');
} }
this.$element.find('form').removeClass('oe-import-no-result'); this.$element.find('form').removeClass('oe_import_no_result');
this.$element.delegate('.oe-m2o-drop-down-button', 'click', function () { this.$element.delegate('.oe_m2o_drop_down_button', 'click', function () {
$(this).prev('input').focus(); $(this).prev('input').focus();
}); });

2
addons/web/static/src/js/formats.js
View File

@ -309,7 +309,7 @@ instance.web.format_cell = function (row_data, column, options) {
'</button>', { '</button>', {
title: column.string || '', title: column.string || '',
additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ? additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
'disabled="disabled" class="oe-listview-button-disabled"' : '', 'disabled="disabled" class="oe_list_button_disabled"' : '',
prefix: instance.connection.prefix, prefix: instance.connection.prefix,
icon: column.icon, icon: column.icon,
alt: column.string || '' alt: column.string || ''

34
addons/web/static/src/js/view_form.js
View File

@ -2564,8 +2564,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
fade: true, fade: true,
}); });
this.$drop_down = this.$element.find(".oe-m2o-drop-down-button"); this.$drop_down = this.$element.find(".oe_m2o_drop_down_button");
this.$follow_button = $(".oe-m2o-cm-button", this.$element); this.$follow_button = $(".oe_m2o_cm_button", this.$element);
this.$follow_button.click(function() { this.$follow_button.click(function() {
if (!self.get('value')) { if (!self.get('value')) {
@ -3251,8 +3251,8 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
return this._super.apply(this, arguments).then(function () { return this._super.apply(this, arguments).then(function () {
// Replace the "Save Row" button with "Cancel Edition" // Replace the "Save Row" button with "Cancel Edition"
self.edition_form.$element self.edition_form.$element
.undelegate('button.oe-edit-row-save', 'click') .undelegate('button.oe_list_edit_row_save', 'click')
.delegate('button.oe-edit-row-save', 'click', function () { .delegate('button.oe_list_edit_row_save', 'click', function () {
self.cancel_pending_edition(); self.cancel_pending_edition();
}); });
@ -3852,7 +3852,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
if (this.options.alternative_form_view) { if (this.options.alternative_form_view) {
this.view_form.set_embedded_view(this.options.alternative_form_view); this.view_form.set_embedded_view(this.options.alternative_form_view);
} }
this.view_form.appendTo(this.$element.find(".oe-form-view-popup-form-placeholder")); this.view_form.appendTo(this.$element.find(".oe_popup_form"));
this.view_form.on_loaded.add_last(function() { this.view_form.on_loaded.add_last(function() {
var $buttons = self.view_form.$element.find(".oe_form_buttons"); var $buttons = self.view_form.$element.find(".oe_form_buttons");
var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; var multi_select = self.row_id === null && ! self.options.disable_multiple_selection;
@ -3983,7 +3983,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
'read_only': true, 'read_only': true,
}, self.options.list_view_options || {})); }, self.options.list_view_options || {}));
self.view_list.popup = self; self.view_list.popup = self;
self.view_list.appendTo($(".oe-select-create-popup-view-list", self.$element)).pipe(function() { self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() {
self.view_list.do_show(); self.view_list.do_show();
}).pipe(function() { }).pipe(function() {
self.searchview.do_search(); self.searchview.do_search();
@ -4005,7 +4005,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
}); });
}); });
}); });
this.searchview.appendTo($(".oe-select-create-popup-view-list", self.$element)); this.searchview.appendTo($(".oe_popup_list", self.$element));
}, },
do_search: function(domains, contexts, groupbys) { do_search: function(domains, contexts, groupbys) {
var self = this; var self = this;
@ -4167,9 +4167,9 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
this._super.apply(this, arguments); this._super.apply(this, arguments);
}, },
initialize_content: function() { initialize_content: function() {
this.$element.find('input.oe-binary-file').change(this.on_file_change); this.$element.find('input.oe_form_binary_file').change(this.on_file_change);
this.$element.find('button.oe_binary_file_save').click(this.on_save_as); this.$element.find('button.oe_form_binary_file_save').click(this.on_save_as);
this.$element.find('.oe-binary-file-clear').click(this.on_clear); this.$element.find('.oe_form_binary_file_clear').click(this.on_clear);
}, },
human_filesize : function(size) { human_filesize : function(size) {
var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
@ -4186,10 +4186,10 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
// http://deepliquid.com/projects/Jcrop/demos.php?demo=handler // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler
if ($(e.target).val() !== '') { if ($(e.target).val() !== '') {
this.$element.find('form.oe-binary-form input[name=session_id]').val(this.session.session_id); this.$element.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id);
this.$element.find('form.oe-binary-form').submit(); this.$element.find('form.oe_form_binary_form').submit();
this.$element.find('.oe-binary-progress').show(); this.$element.find('.oe_form_binary_progress').show();
this.$element.find('.oe-binary').hide(); this.$element.find('.oe_form_binary').hide();
} }
}, },
on_file_uploaded: function(size, name, content_type, file_base64) { on_file_uploaded: function(size, name, content_type, file_base64) {
@ -4201,8 +4201,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
this.filename = name; this.filename = name;
this.on_file_uploaded_and_valid.apply(this, arguments); this.on_file_uploaded_and_valid.apply(this, arguments);
} }
this.$element.find('.oe-binary-progress').hide(); this.$element.find('.oe_form_binary_progress').hide();
this.$element.find('.oe-binary').show(); this.$element.find('.oe_form_binary').show();
}, },
on_file_uploaded_and_valid: function(size, name, content_type, file_base64) { on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
}, },
@ -4212,7 +4212,7 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !")); this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !"));
ev.stopPropagation(); ev.stopPropagation();
} else if (this._dirty_flag) { } else if (this._dirty_flag) {
var link = this.$('.oe_binary_file_save_data')[0]; var link = this.$('.oe_form_binary_file_save_data')[0];
link.download = this.filename || "download.bin"; // Works on only on Google Chrome link.download = this.filename || "download.bin"; // Works on only on Google Chrome
//link.target = '_blank'; //link.target = '_blank';
link.href = "data:application/octet-stream;base64," + value; link.href = "data:application/octet-stream;base64," + value;

54
addons/web/static/src/js/view_list.js
View File

@ -140,13 +140,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
}); });
}, },
/** /**
* View startup method, the default behavior is to set the ``oe-listview`` * View startup method, the default behavior is to set the ``oe_listw``
* class on its root element and to perform an RPC load call. * class on its root element and to perform an RPC load call.
* *
* @returns {$.Deferred} loading promise * @returns {$.Deferred} loading promise
*/ */
start: function() { start: function() {
this.$element.addClass('oe-listview'); this.$element.addClass('oe_list');
return this.reload_view(null, null, true); return this.reload_view(null, null, true);
}, },
/** /**
@ -252,16 +252,16 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
this.$element.html(QWeb.render(this._template, this)); this.$element.html(QWeb.render(this._template, this));
// Head hook // Head hook
// Selecting records // Selecting records
this.$element.find('.all-record-selector').click(function(){ this.$element.find('.oe_list_record_selector').click(function(){
self.$element.find('.oe-record-selector input').prop('checked', self.$element.find('.oe_list_record_selector input').prop('checked',
self.$element.find('.all-record-selector').prop('checked') || false); self.$element.find('.oe_list_record_selector').prop('checked') || false);
var selection = self.groups.get_selection(); var selection = self.groups.get_selection();
$(self.groups).trigger( $(self.groups).trigger(
'selected', [selection.ids, selection.records]); 'selected', [selection.ids, selection.records]);
}); });
// Sorting columns // Sorting columns
this.$element.find('thead').delegate('th.oe-sortable[data-id]', 'click', function (e) { this.$element.find('thead').delegate('th.oe_sortable[data-id]', 'click', function (e) {
e.stopPropagation(); e.stopPropagation();
var $this = $(this); var $this = $(this);
self.dataset.sort($this.data('id')); self.dataset.sort($this.data('id'));
@ -270,7 +270,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
} else { } else {
$this.toggleClass("sortdown"); $this.toggleClass("sortdown");
} }
$this.siblings('.oe-sortable').removeClass("sortup sortdown"); $this.siblings('.oe_sortable').removeClass("sortup sortdown");
self.reload_content(); self.reload_content();
}); });
@ -322,7 +322,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
self.page = 0; self.page = 0;
} }
self.reload_content(); self.reload_content();
}).find('.oe-pager-state') }).find('.oe_list_pager_state')
.click(function (e) { .click(function (e) {
e.stopPropagation(); e.stopPropagation();
var $this = $(this); var $this = $(this);
@ -383,7 +383,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
spager = _.str.sprintf('%d-%d of %d', range_start, range_stop, total); spager = _.str.sprintf('%d-%d of %d', range_start, range_stop, total);
} }
this.$pager.find('.oe-pager-state').text(spager); this.$pager.find('.oe_list_pager_state').text(spager);
}, },
/** /**
* Sets up the listview's columns: merges view and fields data, move * Sets up the listview's columns: merges view and fields data, move
@ -533,10 +533,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
*/ */
reload_content: function () { reload_content: function () {
var self = this; var self = this;
self.$element.find('.all-record-selector').prop('checked', false); self.$element.find('.oe_list_record_selector').prop('checked', false);
this.records.reset(); this.records.reset();
var reloaded = $.Deferred(); var reloaded = $.Deferred();
this.$element.find('.oe-listview-content').append( this.$element.find('.oe_list_content').append(
this.groups.render(function () { this.groups.render(function () {
if (self.dataset.index == null) { if (self.dataset.index == null) {
var has_one = false; var has_one = false;
@ -788,7 +788,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
}, },
display_aggregates: function (aggregation) { display_aggregates: function (aggregation) {
var self = this; var self = this;
var $footer_cells = this.$element.find('.oe-list-footer'); var $footer_cells = this.$element.find('.oe_list_footer');
_(this.aggregate_columns).each(function (column) { _(this.aggregate_columns).each(function (column) {
if (!column['function']) { if (!column['function']) {
return; return;
@ -826,9 +826,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
} }
// Padding for column titles, footer and data rows // Padding for column titles, footer and data rows
var $rows = this.$element var $rows = this.$element
.find('.oe-listview-header-columns, tr:not(thead tr)') .find('.oe_list_header_columns, tr:not(thead tr)')
.not(options['except']); .not(options['except']);
var newcols = new Array(count+1).join('<td class="oe-listview-padding"></td>'); var newcols = new Array(count+1).join('<td class="oe_list_padding"></td>');
if (options.position === 'before') { if (options.position === 'before') {
$rows.prepend(newcols); $rows.prepend(newcols);
} else { } else {
@ -839,7 +839,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
* Removes all padding columns of the table * Removes all padding columns of the table
*/ */
unpad_columns: function () { unpad_columns: function () {
this.$element.find('.oe-listview-padding').remove(); this.$element.find('.oe_list_padding').remove();
if (this.previous_colspan) { if (this.previous_colspan) {
this.$element this.$element
.find('thead tr:first th') .find('thead tr:first th')
@ -939,18 +939,18 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
this.$_element = $('<tbody>') this.$_element = $('<tbody>')
.appendTo(document.body) .appendTo(document.body)
.delegate('th.oe-record-selector', 'click', function (e) { .delegate('th.oe_list_record_selector', 'click', function (e) {
e.stopPropagation(); e.stopPropagation();
var selection = self.get_selection(); var selection = self.get_selection();
$(self).trigger( $(self).trigger(
'selected', [selection.ids, selection.records]); 'selected', [selection.ids, selection.records]);
}) })
.delegate('td.oe-record-delete button', 'click', function (e) { .delegate('td.oe_list_record_delete button', 'click', function (e) {
e.stopPropagation(); e.stopPropagation();
var $row = $(e.target).closest('tr'); var $row = $(e.target).closest('tr');
$(self).trigger('deleted', [[self.row_id($row)]]); $(self).trigger('deleted', [[self.row_id($row)]]);
}) })
.delegate('td.oe-field-cell button', 'click', function (e) { .delegate('td.oe_list_field_cell button', 'click', function (e) {
e.stopPropagation(); e.stopPropagation();
var $target = $(e.currentTarget), var $target = $(e.currentTarget),
field = $target.closest('td').data('field'), field = $target.closest('td').data('field'),
@ -1048,20 +1048,20 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
} }
var cells = []; var cells = [];
if (this.options.selectable) { if (this.options.selectable) {
cells.push('<th class="oe-record-selector"></td>'); cells.push('<th class="oe_list_record_selector"></td>');
} }
_(this.columns).each(function(column) { _(this.columns).each(function(column) {
if (column.invisible === '1') { if (column.invisible === '1') {
return; return;
} }
if (column.tag === 'button') { if (column.tag === 'button') {
cells.push('<td class="oe-button" title="' + column.string + '">&nbsp;</td>'); cells.push('<td class="oe_button" title="' + column.string + '">&nbsp;</td>');
} else { } else {
cells.push('<td title="' + column.string + '">&nbsp;</td>'); cells.push('<td title="' + column.string + '">&nbsp;</td>');
} }
}); });
if (this.options.deletable) { if (this.options.deletable) {
cells.push('<td class="oe-record-delete"><button type="button" style="visibility: hidden"> </button></td>'); cells.push('<td class="oe_list_record_delete"><button type="button" style="visibility: hidden"> </button></td>');
} }
cells.unshift('<tr>'); cells.unshift('<tr>');
cells.push('</tr>'); cells.push('</tr>');
@ -1082,7 +1082,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
return result; return result;
} }
var records = this.records; var records = this.records;
this.$current.find('th.oe-record-selector input:checked') this.$current.find('th.oe_list_record_selector input:checked')
.closest('tr').each(function () { .closest('tr').each(function () {
var record = records.get($(this).data('id')); var record = records.get($(this).data('id'));
result.ids.push(record.get('id')); result.ids.push(record.get('id'));
@ -1249,7 +1249,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
}); });
this.$row.children().last() this.$row.children().last()
.append($prev) .append($prev)
.append('<span class="oe-pager-state"></span>') .append('<span class="oe_list_pager_state"></span>')
.append($next); .append($next);
}, },
open: function (point_insertion) { open: function (point_insertion) {
@ -1315,7 +1315,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
} }
placeholder.appendChild($row[0]); placeholder.appendChild($row[0]);
var $group_column = $('<th class="oe-group-name">').appendTo($row); var $group_column = $('<th class="oe_list_group_name">').appendTo($row);
// Don't fill this if group_by_no_leaf but no group_by // Don't fill this if group_by_no_leaf but no group_by
if (group.grouped_on) { if (group.grouped_on) {
var row_data = {}; var row_data = {};
@ -1365,7 +1365,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
} }
}); });
if (self.options.deletable) { if (self.options.deletable) {
$row.append('<td class="oe-group-pagination">'); $row.append('<td class="oe_list_group_pagination">');
} }
}); });
return placeholder; return placeholder;
@ -1416,11 +1416,11 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
} else { } else {
if (dataset.size() == records.length) { if (dataset.size() == records.length) {
// only one page // only one page
self.$row.find('td.oe-group-pagination').empty(); self.$row.find('td.oe_list_group_pagination').empty();
} else { } else {
var pages = Math.ceil(dataset.size() / limit); var pages = Math.ceil(dataset.size() / limit);
self.$row self.$row
.find('.oe-pager-state') .find('.oe_list_pager_state')
.text(_.str.sprintf(_t("%(page)d/%(page_count)d"), { .text(_.str.sprintf(_t("%(page)d/%(page_count)d"), {
page: page + 1, page: page + 1,
page_count: pages page_count: pages

4
addons/web/static/src/js/view_list_editable.js
View File

@ -210,7 +210,7 @@ openerp.web.list_editable = function (instance) {
click: function (e) {e.stopPropagation();} click: function (e) {e.stopPropagation();}
}) })
.addClass('oe_form oe_form_container') .addClass('oe_form oe_form_container')
.delegate('button.oe-edit-row-save', 'click', function () { .delegate('button.oe_list_edit_row_save', 'click', function () {
self.save_row(); self.save_row();
}) })
.delegate('button', 'keyup', function (e) { .delegate('button', 'keyup', function (e) {
@ -258,7 +258,7 @@ openerp.web.list_editable = function (instance) {
return $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () { return $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () {
$new_row.find('> td') $new_row.find('> td')
.end() .end()
.find('td:last').removeClass('oe-field-cell').end(); .find('td:last').removeClass('oe_list_field_cell').end();
// pad in case of groupby // pad in case of groupby
_(self.columns).each(function (column) { _(self.columns).each(function (column) {
if (column.meta) { if (column.meta) {

8
addons/web/static/src/js/view_tree.js
View File

@ -179,7 +179,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
} }
}); });
if (is_loaded === 0) { if (is_loaded === 0) {
if (!$this.parent().hasClass('oe-open')) { if (!$this.parent().hasClass('oe_open')) {
self.getdata(record_id, children_ids); self.getdata(record_id, children_ids);
} }
} else { } else {
@ -208,7 +208,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
}); });
if ($curr_node.length) { if ($curr_node.length) {
$curr_node.addClass('oe-open'); $curr_node.addClass('oe_open');
$curr_node.after(children_rows); $curr_node.after(children_rows);
} else { } else {
self.$element.find('tbody').html(children_rows); self.$element.find('tbody').html(children_rows);
@ -247,11 +247,11 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
// show & hide the contents // show & hide the contents
showcontent: function (record_id, show) { showcontent: function (record_id, show) {
this.$element.find('#treerow_' + record_id) this.$element.find('#treerow_' + record_id)
.toggleClass('oe-open', show); .toggleClass('oe_open', show);
_(this.records[record_id][this.children_field]).each(function (child_id) { _(this.records[record_id][this.children_field]).each(function (child_id) {
var $child_row = this.$element.find('#treerow_' + child_id); var $child_row = this.$element.find('#treerow_' + child_id);
if ($child_row.hasClass('oe-open')) { if ($child_row.hasClass('oe_open')) {
this.showcontent(child_id, false); this.showcontent(child_id, false);
} }
$child_row.toggle(show); $child_row.toggle(show);

4
addons/web/static/src/js/views.js
View File

@ -862,13 +862,13 @@ instance.web.Sidebar = instance.web.Widget.extend({
}); });
self.items['files'] = attachments; self.items['files'] = attachments;
self.redraw(); self.redraw();
this.$('.oe_sidebar_add_attachment .oe-binary-file').change(this.on_attachment_changed); this.$('.oe_sidebar_add_attachment .oe_form_binary_file').change(this.on_attachment_changed);
this.$element.find('.oe_sidebar_delete_item').click(this.on_attachment_delete); this.$element.find('.oe_sidebar_delete_item').click(this.on_attachment_delete);
}, },
on_attachment_changed: function(e) { on_attachment_changed: function(e) {
var $e = $(e.target); var $e = $(e.target);
if ($e.val() !== '') { if ($e.val() !== '') {
this.$element.find('form.oe-binary-form').submit(); this.$element.find('form.oe_form_binary_form').submit();
$e.parent().find('input[type=file]').prop('disabled', true); $e.parent().find('input[type=file]').prop('disabled', true);
$e.parent().find('button').prop('disabled', true).find('img, span').toggle(); $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
this.$('.oe_sidebar_add_attachment span').text(_t('Uploading...')); this.$('.oe_sidebar_add_attachment span').text(_t('Uploading...'));

76
addons/web/static/src/xml/base.xml
View File

@ -27,9 +27,9 @@
</t> </t>
<t t-name="CrashManager.warning"> <t t-name="CrashManager.warning">
<table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning"> <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
<tr> <tr>
<td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td> <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe_dialog_icon"/></td>
<td> <td>
<p> <p>
<t t-js="d"> <t t-js="d">
@ -537,7 +537,7 @@
<t t-name="TreeView"> <t t-name="TreeView">
<select t-if="toolbar" style="width: 30%"> <select t-if="toolbar" style="width: 30%">
</select> </select>
<table class="oe-treeview-table"> <table class="oe_tree_table">
<thead> <thead>
<tr> <tr>
<th t-foreach="fields_view" t-as="field" <th t-foreach="fields_view" t-as="field"
@ -557,7 +557,7 @@
t-att-data-id="record.id" t-att-data-level="level + 1"> t-att-data-id="record.id" t-att-data-level="level + 1">
<t t-set="children" t-value="record[children_field]"/> <t t-set="children" t-value="record[children_field]"/>
<t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/> <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
<t t-set="rank" t-value="'oe-treeview-first'"/> <t t-set="rank" t-value="'oe_tree_first'"/>
<t t-set="style" t-value="'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;'"/> <t t-set="style" t-value="'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;'"/>
<td t-foreach="fields_view" t-as="field" <td t-foreach="fields_view" t-as="field"
@ -576,7 +576,7 @@
</td> </td>
</tr> </tr>
<table t-name="ListView" class="oe-listview-content"> <table t-name="ListView" class="oe_list_content">
<t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/> <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
<thead> <thead>
<tr t-if="(!!options.action_buttons and !options.$buttons) or (!!options.pager and !options.$pager)"> <tr t-if="(!!options.action_buttons and !options.$buttons) or (!!options.pager and !options.$pager)">
@ -586,18 +586,18 @@
<div class="oe_list_pager"/> <div class="oe_list_pager"/>
</th> </th>
</tr> </tr>
<tr t-if="options.header" class="oe-listview-header-columns"> <tr t-if="options.header" class="oe_list_header_columns">
<t t-foreach="columns" t-as="column"> <t t-foreach="columns" t-as="column">
<th t-if="column.meta"> <th t-if="column.meta">
<t t-esc="column.string"/> <t t-esc="column.string"/>
</th> </th>
</t> </t>
<th t-if="options.selectable" width="1" > <th t-if="options.selectable" width="1" >
<input type="checkbox" class="all-record-selector"/> <input type="checkbox" class="oe_list_record_selector"/>
</th> </th>
<t t-foreach="columns" t-as="column"> <t t-foreach="columns" t-as="column">
<th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id" <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)"> t-att-class="((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)">
<t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t> <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
</th> </th>
</t> </t>
@ -607,7 +607,7 @@
<tfoot> <tfoot>
<tr> <tr>
<td t-if="options.selectable"/> <td t-if="options.selectable"/>
<td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe_number" <td t-foreach="aggregate_columns" t-as="column" class="oe_list_footer oe_number"
t-att-data-field="column.id" t-att-title="column.label"> t-att-data-field="column.id" t-att-title="column.label">
</td> </td>
<td t-if="options.deletable"/> <td t-if="options.deletable"/>
@ -625,7 +625,7 @@
<t t-name="ListView.pager"> <t t-name="ListView.pager">
<div class="oe_list_pager" t-att-colspan="widget.columns_count"> <div class="oe_list_pager" t-att-colspan="widget.columns_count">
<t t-if="!widget.no_leaf and widget.options.pager !== false" t-call="ViewPager"> <t t-if="!widget.no_leaf and widget.options.pager !== false" t-call="ViewPager">
<span class="oe-pager-state"> <span class="oe_list_pager_state">
</span> </span>
</t> </t>
</div> </div>
@ -644,7 +644,7 @@
</td> </td>
</t> </t>
<th t-if="options.selectable" class="oe-record-selector" width="1"> <th t-if="options.selectable" class="oe_list_record_selector" width="1">
<t t-set="checked" t-value="options.select_view_id == record.get('id') ? 'checked' : null"/> <t t-set="checked" t-value="options.select_view_id == record.get('id') ? 'checked' : null"/>
<input t-if="options.radio" type="radio" name="radiogroup" t-att-checked="checked"/> <input t-if="options.radio" type="radio" name="radiogroup" t-att-checked="checked"/>
<input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/> <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/>
@ -652,20 +652,20 @@
<t t-foreach="columns" t-as="column"> <t t-foreach="columns" t-as="column">
<t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/> <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/>
<td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
t-att-class="'oe-field-cell' + (align ? ' oe_number' : '') t-att-class="'oe_list_field_cell' + (align ? ' oe_number' : '')
+ (column.tag === 'button' ? ' oe-button' : '')" + (column.tag === 'button' ? ' oe_button' : '')"
t-att-data-field="column.id"> t-att-data-field="column.id">
<t t-raw="render_cell(record, column)"/> <t t-raw="render_cell(record, column)"/>
</td> </td>
</t> </t>
<td t-if="options.deletable" class='oe-record-delete' width="1"> <td t-if="options.deletable" class='oe_list_record_delete' width="1">
<button type="button" name="delete" class="oe_i">d</button> <button type="button" name="delete" class="oe_i">d</button>
</td> </td>
</tr> </tr>
<t t-name="ListView.row.save"> <t t-name="ListView.row.save">
<td> <td>
<button class='oe_i oe-edit-row-save' type='button' name='save'>S</button> <button class='oe_i oe_list_edit_row_save' type='button' name='save'>S</button>
</td> </td>
</t> </t>
@ -945,7 +945,7 @@
<span class="oe_form_field oe_form_field_many2one oe_form_field_with_button"> <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/> <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
<t t-if="!widget.get('effective_readonly')"> <t t-if="!widget.get('effective_readonly')">
<button class="oe_button oe-m2o-cm-button" title="Open Resource"> <button class="oe_button oe_m2o_cm_button" title="Open Resource">
<img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/> <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
</button> </button>
<div> <div>
@ -955,7 +955,7 @@
t-att-autofocus="widget.node.attrs.autofocus" t-att-autofocus="widget.node.attrs.autofocus"
t-att-placeholder="widget.node.attrs.placeholder" t-att-placeholder="widget.node.attrs.placeholder"
/> />
<span class="oe-m2o-drop-down-button"> <span class="oe_m2o_drop_down_button">
<img t-att-src='_s + "/web/static/src/img/down-arrow.png"'/> <img t-att-src='_s + "/web/static/src/img/down-arrow.png"'/>
</span> </span>
</div> </div>
@ -1026,10 +1026,10 @@
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
</button> </button>
</t> </t>
<button class="oe_button oe-binary-file-clear" type="button" title="Clear"> <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
</button> </button>
<div class="oe-binary-progress" style="display: none"> <div class="oe_form_binary_progress" style="display: none">
<img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
<b>Uploading ...</b> <b>Uploading ...</b>
</div> </div>
@ -1056,7 +1056,7 @@
class="field_binary" class="field_binary"
/> />
</td> </td>
<td class="oe-binary" nowrap="true"> <td class="oe_form_binary" nowrap="true">
<table cellspacing="0" cellpadding="0" border="0"> <table cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td> <td>
@ -1070,15 +1070,15 @@
</t> </t>
</td> </td>
<td> <td>
<a class="oe_binary_file_save_data"> <a class="oe_form_binary_file_save_data">
<button class="oe_button oe_binary_file_save" type="button" title="Save As"> <button class="oe_button oe_form_binary_file_save" type="button" title="Save As">
<img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/> <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
<span>Save As</span> <span>Save As</span>
</button> </button>
</a> </a>
</td> </td>
<td> <td>
<button class="oe_button oe-binary-file-clear" type="button" title="Clear"> <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
<span>Clear</span> <span>Clear</span>
</button> </button>
@ -1086,7 +1086,7 @@
</tr> </tr>
</table> </table>
</td> </td>
<td class="oe-binary-progress" style="display: none" nowrap="true"> <td class="oe_form_binary_progress" style="display: none" nowrap="true">
<img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
<b>Uploading ...</b> <b>Uploading ...</b>
</td> </td>
@ -1101,12 +1101,12 @@
</t> </t>
<t t-name="HiddenInputFile"> <t t-name="HiddenInputFile">
<div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style"> <div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style">
<form class="oe-binary-form" t-att-target="fileupload_id" <form class="oe_form_binary_form" t-att-target="fileupload_id"
method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'"> method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'">
<input type="hidden" name="session_id" value=""/> <input type="hidden" name="session_id" value=""/>
<input type="hidden" name="callback" t-att-value="fileupload_id"/> <input type="hidden" name="callback" t-att-value="fileupload_id"/>
<t t-raw="__content__"/> <t t-raw="__content__"/>
<input type="file" class="oe-binary-file" name="ufile"/> <input type="file" class="oe_form_binary_file" name="ufile"/>
</form> </form>
<iframe t-att-id="fileupload_id" t-att-name="fileupload_id" style="display: none"/> <iframe t-att-id="fileupload_id" t-att-name="fileupload_id" style="display: none"/>
</div> </div>
@ -1225,7 +1225,7 @@
</span> </span>
<t t-name="SearchView.managed-filters"> <t t-name="SearchView.managed-filters">
<option class="oe-filters-title" value="">Filters</option> <option class="oe_search_filters_title" value="">Filters</option>
<optgroup label="-- Filters --"> <optgroup label="-- Filters --">
<t t-foreach="filters" t-as="filter"> <t t-foreach="filters" t-as="filter">
<option t-attf-value="get:#{filter_index}" <option t-attf-value="get:#{filter_index}"
@ -1250,7 +1250,7 @@
</t> </t>
<t t-name="SearchView.render_lines"> <t t-name="SearchView.render_lines">
<table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0" <table class="oe_search_render_line" border="0" cellspacing="0" cellpadding="0"
t-foreach="lines" t-as="line"> t-foreach="lines" t-as="line">
<tr> <tr>
<td t-foreach="line" t-as="widget" class="oe_searchview_field"> <td t-foreach="line" t-as="widget" class="oe_searchview_field">
@ -1450,16 +1450,16 @@
<table style="width:100%"> <table style="width:100%">
<tr style="width:100%"> <tr style="width:100%">
<td style="width:100%"> <td style="width:100%">
<div class="oe-select-create-popup-view-search" style="width:100%"></div> <div class="oe_popup_search" style="width:100%"></div>
</td> </td>
</tr> </tr>
<tr style="width:100%"> <tr style="width:100%">
<td style="width:100%"> <td style="width:100%">
<div class="oe-select-create-popup-view-list" style="width:100%"></div> <div class="oe_popup_list" style="width:100%"></div>
</td> </td>
</tr> </tr>
</table> </table>
<div class="oe-form-view-popup-form-placeholder oe-select-create-popup-view-form" style="width:100%"></div> <div class="oe_popup_form" style="width:100%"></div>
</div> </div>
</t> </t>
<t t-name="SelectCreatePopup.search.buttons"> <t t-name="SelectCreatePopup.search.buttons">
@ -1482,7 +1482,7 @@
missing columns missing columns
--> -->
<t t-jquery="&gt; :last" t-operation="after"> <t t-jquery="&gt; :last" t-operation="after">
<td t-if="edited and !options.deletable" class="oe-listview-padding"/> <td t-if="edited and !options.deletable" class="oe_list_padding"/>
</t> </t>
</t> </t>
@ -1552,7 +1552,7 @@
<t t-name="ExportView"> <t t-name="ExportView">
<a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a> <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
</t> </t>
<table t-name="ExportTreeView" class="oe-export" <table t-name="ExportTreeView" class="oe_export"
style="background-color: #F3F3F3;"> style="background-color: #F3F3F3;">
<tr> <tr>
<td colspan="3"> <td colspan="3">
@ -1657,7 +1657,7 @@
</t> </t>
<t t-name="ImportDataView"> <t t-name="ImportDataView">
<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data" <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
class="oe-import oe-import-no-result"> class="oe_import oe_import_no_result">
<input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
<h2 class="separator horizontal">1. Import a .CSV file</h2> <h2 class="separator horizontal">1. Import a .CSV file</h2>
<p>Select a .CSV file to import. If you need a sample of file to import, <p>Select a .CSV file to import. If you need a sample of file to import,
@ -1667,9 +1667,9 @@
<label for="csvfile">CSV File:</label> <label for="csvfile">CSV File:</label>
<input type="file" id="csvfile" size="50" name="csvfile"/> <input type="file" id="csvfile" size="50" name="csvfile"/>
</p> </p>
<h2 class="separator horizontal oe-import-result">2. Check your file format</h2> <h2 class="separator horizontal oe_import_result">2. Check your file format</h2>
<div id="result" class="oe-import-result"></div> <div id="result" class="oe_import_result"></div>
<fieldset class="oe-closed oe-import-result"> <fieldset class="oe_closed oe_import_result">
<legend>Import Options</legend> <legend>Import Options</legend>
<table> <table>
<tr> <tr>
@ -1709,7 +1709,7 @@
</tr> </tr>
<tr> <tr>
<td t-foreach="records[0]" t-as="column"> <td t-foreach="records[0]" t-as="column">
<input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button"> <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe_m2o_drop_down_button">
<img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span> <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
</td> </td>
</tr> </tr>

131
addons/web_dashboard/static/src/css/dashboard.css
View File

@ -1,11 +1,11 @@
.openerp table.oe-dashboard { .openerp table.oe_dashboard {
width: 100%; width: 100%;
} }
.openerp .oe-dashboard-links { .openerp .oe_dashboard_links {
text-align: right; text-align: right;
margin: 0 4px 6px 0; margin: 0 4px 6px 0;
} }
.openerp .oe-dashboard-action { .openerp .oe_dashboard_action {
margin: 0 0.5em 0.5em 0; margin: 0 0.5em 0.5em 0;
padding: 0px; padding: 0px;
background-color: white; background-color: white;
@ -14,7 +14,7 @@
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
} }
.openerp .oe-dashboard-action .oe-dashboard-action-header { .openerp .oe_dashboard_action .oe_dashboard_action_header {
font-size: 85%; font-size: 85%;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
@ -24,7 +24,7 @@
background: white url("/web/static/src/img/box-a-header-a.gif") 0% 0% repeat-x; background: white url("/web/static/src/img/box-a-header-a.gif") 0% 0% repeat-x;
} }
.openerp h2.oe-dashboard-action-header { .openerp h2.oe_dashboard_action_header {
margin: 0; margin: 0;
padding:4px 4px; padding:4px 4px;
-moz-border-radius-topleft: 3px; -moz-border-radius-topleft: 3px;
@ -34,7 +34,7 @@
-webkit-border-top-right-radius: 3px; -webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px; border-top-right-radius: 3px;
} }
.openerp h2.oe-dashboard-action-header-empty { .openerp h2.oe_dashboard_action_header_empty {
padding-top: 0; padding-top: 0;
padding-bottom: 2px; padding-bottom: 2px;
} }
@ -45,103 +45,103 @@
height: 16px !important; height: 16px !important;
} }
.openerp a.oe-dashboard-action-rename { .openerp a.oe_dashboard_action_rename {
float: left; float: left;
padding-right: 4px; padding-right: 4px;
position: relative; position: relative;
top: 1px; top: 1px;
} }
.openerp .oe-dashboard-action-input { .openerp .oe_dashboard_action_input {
height: 16px; height: 16px;
position: relative; position: relative;
top: 2px; top: 2px;
} }
.openerp .oe-dashboard-action .oe-dashboard-action-header:hover { .openerp .oe_dashboard_action .oe_dashboard_action_header:hover {
cursor: move; cursor: move;
} }
.openerp .oe-dashboard-action .ui-icon { .openerp .oe_dashboard_action .ui-icon {
cursor: pointer; cursor: pointer;
} }
.openerp .oe-dashboard-action .ui-icon:hover { .openerp .oe_dashboard_action .ui-icon:hover {
background-color: #ccc; background-color: #ccc;
border-radius: 4px; border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
} }
.openerp .oe-dashboard-action .oe-dashboard-action-header .ui-icon { .openerp .oe_dashboard_action .oe_dashboard_action_header .ui-icon {
float: right; float: right;
} }
.openerp .oe-dashboard .ui-sortable-placeholder { .openerp .oe_dashboard .ui-sortable-placeholder {
border: 1px dotted black; border: 1px dotted black;
visibility: visible !important; visibility: visible !important;
height: 50px !important; height: 50px !important;
} }
.openerp .oe-dashboard .ui-sortable-placeholder * { .openerp .oe_dashboard .ui-sortable-placeholder * {
visibility: hidden; visibility: hidden;
} }
/* Base overwriting */ /* Base overwriting */
.openerp .oe-dashboard .oe-listview-content, .openerp .oe-dashboard .ui-widget-header { .openerp .oe_dashboard .oe_list_content, .openerp .oe_dashboard .ui-widget-header {
border-right:none !important; border-right:none !important;
padding:0 3px; padding:0 3px;
} }
/* Layouts */ /* Layouts */
.openerp .oe-dashboard-layout_1 .oe-dashboard-column.index_0 { .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
width: 100%; width: 100%;
} }
.openerp .oe-dashboard-layout_1 .oe-dashboard-column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1,
.openerp .oe-dashboard-layout_1 .oe-dashboard-column.index_2 { .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
display: none; display: none;
} }
.openerp .oe-dashboard-layout_1-1 .oe-dashboard-column { .openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
width: 50%; width: 50%;
} }
.openerp .oe-dashboard-layout_1-1 .oe-dashboard-column.index_2 { .openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
display: none; display: none;
} }
.openerp .oe-dashboard-layout_1-1-1 .oe-dashboard-column { .openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
width: 33%; width: 33%;
} }
.openerp .oe-dashboard-layout_2-1 .oe-dashboard-column.index_0 { .openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
width: 70%; width: 70%;
} }
.openerp .oe-dashboard-layout_2-1 .oe-dashboard-column.index_1 { .openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
width: 30%; width: 30%;
} }
.openerp .oe-dashboard-layout_2-1 .oe-dashboard-column.index_2 { .openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
display: none; display: none;
} }
.openerp .oe-dashboard-layout_1-2 .oe-dashboard-column.index_0 { .openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
width: 30%; width: 30%;
} }
.openerp .oe-dashboard-layout_1-2 .oe-dashboard-column.index_1 { .openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
width: 70%; width: 70%;
} }
.openerp .oe-dashboard-layout_1-2 .oe-dashboard-column.index_2 { .openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
display: none; display: none;
} }
.openerp .oe-dashboard-layout-selector { .openerp .oe_dashboard_layout_selector {
overflow: auto; overflow: auto;
padding: 10px; padding: 10px;
} }
.openerp .oe-dashboard-layout-selector ul { .openerp .oe_dashboard_layout_selector ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.openerp .oe-dashboard-layout-selector ul li { .openerp .oe_dashboard_layout_selector ul li {
position: relative; position: relative;
float: left; float: left;
height: 51px; height: 51px;
@ -152,16 +152,16 @@
cursor: pointer; cursor: pointer;
border: 1px solid white; border: 1px solid white;
} }
.openerp .oe-dashboard-layout-selector ul li:hover { .openerp .oe_dashboard_layout_selector ul li:hover {
border: 1px solid #090; border: 1px solid #090;
} }
.openerp .oe-dashboard-layout-selector ul li img.oe-selected-layout { .openerp .oe_dashboard_layout_selector ul li img.oe_dashboard_selected_layout {
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px; right: 0px;
} }
.openerp .oe-dashboard-home-tile { .openerp .oe_dashboard_home_tile {
text-align: center; text-align: center;
margin: 10px; margin: 10px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
@ -171,7 +171,7 @@
-moz-box-shadow: 3px 3px 5px 3px #DADDDD; -moz-box-shadow: 3px 3px 5px 3px #DADDDD;
box-shadow: 3px 3px 5px 3px #DADDDD; box-shadow: 3px 3px 5px 3px #DADDDD;
} }
.openerp .oe-dashboard-home-tile span { .openerp .oe_dashboard_home_tile span {
display: block; display: block;
padding: 0 0 15px; padding: 0 0 15px;
font-weight: bold; font-weight: bold;
@ -179,79 +179,36 @@
color: #555; color: #555;
white-space: nowrap; white-space: nowrap;
} }
.openerp .oe-dashboard-home-tile-icon { .openerp .oe_dashboard_home_tile_icon {
height: 100px; height: 100px;
} }
.openerp .oe-dashboard-home-tile-icon img { .openerp .oe_dashboard_home_tile_icon img {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
.openerp .oe-dashboard-home-tile-icon img.hover { .openerp .oe_dashboard_home_tile_icon img.hover {
display: none; display: none;
} }
.openerp .oe-dashboard-home-tile:hover { .openerp .oe_dashboard_home_tile:hover {
background-color: #fafafa; background-color: #fafafa;
-webkit-box-shadow: 3px 3px 5px 3px #979797; -webkit-box-shadow: 3px 3px 5px 3px #979797;
-moz-box-shadow: 3px 3px 5px 3px #979797; -moz-box-shadow: 3px 3px 5px 3px #979797;
box-shadow: 3px 3px 5px 3px #979797; box-shadow: 3px 3px 5px 3px #979797;
} }
.openerp .oe-dashboard-home-tile:hover img { .openerp .oe_dashboard_home_tile:hover img {
display: none; display: none;
} }
.openerp .oe-dashboard-home-tile:hover img.hover { .openerp .oe_dashboard_home_tile:hover img.hover {
display: block; display: block;
} }
.openerp .oe-dashboard-home-tile:hover span { .openerp .oe_dashboard_home_tile:hover span {
color: black; color: black;
} }
.openerp .oe-dashboard-action .view-manager-main-content { .openerp .oe_dashboard_action .view-manager-main-content {
padding: 2px; padding: 2px;
} }
.oe-static-home {
padding: 0.5em 0.5em;
text-align: center;
}
.oe-static-home h1 {
margin: 0 0 0.3em;
}
.oe-static-home-banner {
display: inline-block;
margin: auto 0;
padding: 0.5em 5em;
text-align: left;
}
.oe-static-home-banner li {
font-size: 150%;
font-weight: bold;
}
.oe-static-home address {
font-style: normal;
padding-left: 2em;
}
.oe-static-home-tiles {
text-align: left;
}
.oe-static-home-tiles td {
vertical-align: top;
}
.oe-static-home-tile {
margin: 0.5em;
padding: 0 1em;
}
.oe-static-home-tile-logo {
margin-right: 0.5em;
}
.oe-static-home-tile-text h2 {
margin-top: 0;
margin-bottom: 0.2em;
}
.oe-static-home-tile-text p {
margin: 0.5em 0;
}
.openerp .oe_app_tiles h1, .openerp .oe_app_tiles h3 { .openerp .oe_app_tiles h1, .openerp .oe_app_tiles h3 {
margin: 16px 24px; margin: 16px 24px;
} }
@ -306,11 +263,11 @@
} }
/* changing icon for the change layout button */ /* changing icon for the change layout button */
.openerp .oe-dashboard-link-change_layout, .openerp .oe-dashboard-link-reset { .openerp .oe_dashboard_link_change_layout, .openerp .oe_dashboard_link_reset {
padding-top: 1px; padding-top: 1px;
height: 22px; height: 22px;
} }
.openerp .oe-dashboard-link-change_layout > *, .openerp .oe-dashboard-link-reset > *{ .openerp .oe_dashboard_link_change_layout > *, .openerp .oe_dashboard_link_reset > *{
vertical-align: middle; vertical-align: middle;
} }

38
addons/web_dashboard/static/src/js/dashboard.js
View File

@ -18,18 +18,18 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
var self = this; var self = this;
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.$element.find('.oe-dashboard-column').sortable({ this.$element.find('.oe_dashboard_column').sortable({
connectWith: '.oe-dashboard-column', connectWith: '.oe_dashboard_column',
handle: '.oe-dashboard-action-header', handle: '.oe_dashboard_action_header',
scroll: false scroll: false
}).disableSelection().bind('sortstop', self.do_save_dashboard); }).disableSelection().bind('sortstop', self.do_save_dashboard);
// Events // Events
this.$element.find('.oe-dashboard-link-reset').click(this.on_reset); this.$element.find('.oe_dashboard_link_reset').click(this.on_reset);
this.$element.find('.oe-dashboard-link-change_layout').click(this.on_change_layout); this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
this.$element.delegate('.oe-dashboard-column .oe-dashboard-fold', 'click', this.on_fold_action); this.$element.delegate('.oe_dashboard_column .oe_dashboard_fold', 'click', this.on_fold_action);
this.$element.delegate('.oe-dashboard-column .ui-icon-closethick', 'click', this.on_close_action); this.$element.delegate('.oe_dashboard_column .ui-icon-closethick', 'click', this.on_close_action);
// Init actions // Init actions
_.each(this.node.children, function(column, column_index) { _.each(this.node.children, function(column, column_index) {
@ -54,7 +54,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
on_change_layout: function() { on_change_layout: function() {
var self = this; var self = this;
var qdict = { var qdict = {
current_layout : this.$element.find('.oe-dashboard').attr('data-layout') current_layout : this.$element.find('.oe_dashboard').attr('data-layout')
}; };
var $dialog = instance.web.dialog($('<div>'), { var $dialog = instance.web.dialog($('<div>'), {
modal: true, modal: true,
@ -69,7 +69,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
}); });
}, },
do_change_layout: function(new_layout) { do_change_layout: function(new_layout) {
var $dashboard = this.$element.find('.oe-dashboard'); var $dashboard = this.$element.find('.oe_dashboard');
var current_layout = $dashboard.attr('data-layout'); var current_layout = $dashboard.attr('data-layout');
if (current_layout != new_layout) { if (current_layout != new_layout) {
var clayout = current_layout.split('-').length, var clayout = current_layout.split('-').length,
@ -77,22 +77,22 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
column_diff = clayout - nlayout; column_diff = clayout - nlayout;
if (column_diff > 0) { if (column_diff > 0) {
var $last_column = $(); var $last_column = $();
$dashboard.find('.oe-dashboard-column').each(function(k, v) { $dashboard.find('.oe_dashboard_column').each(function(k, v) {
if (k >= nlayout) { if (k >= nlayout) {
$(v).find('.oe-dashboard-action').appendTo($last_column); $(v).find('.oe_dashboard_action').appendTo($last_column);
} else { } else {
$last_column = $(v); $last_column = $(v);
} }
}); });
} }
$dashboard.toggleClass('oe-dashboard-layout_' + current_layout + ' oe-dashboard-layout_' + new_layout); $dashboard.toggleClass('oe_dashboard_layout_' + current_layout + ' oe_dashboard_layout_' + new_layout);
$dashboard.attr('data-layout', new_layout); $dashboard.attr('data-layout', new_layout);
this.do_save_dashboard(); this.do_save_dashboard();
} }
}, },
on_fold_action: function(e) { on_fold_action: function(e) {
var $e = $(e.currentTarget), var $e = $(e.currentTarget),
$action = $e.parents('.oe-dashboard-action:first'), $action = $e.parents('.oe_dashboard_action:first'),
id = parseInt($action.attr('data-id'), 10); id = parseInt($action.attr('data-id'), 10);
if ($e.is('.ui-icon-minusthick')) { if ($e.is('.ui-icon-minusthick')) {
$action.data('action_attrs').fold = '1'; $action.data('action_attrs').fold = '1';
@ -100,12 +100,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
delete($action.data('action_attrs').fold); delete($action.data('action_attrs').fold);
} }
$e.toggleClass('ui-icon-minusthick ui-icon-plusthick'); $e.toggleClass('ui-icon-minusthick ui-icon-plusthick');
$action.find('.oe-dashboard-action-content').toggle(); $action.find('.oe_dashboard_action_content').toggle();
this.do_save_dashboard(); this.do_save_dashboard();
}, },
on_close_action: function(e) { on_close_action: function(e) {
if (confirm(_t("Are you sure you want to remove this item ?"))) { if (confirm(_t("Are you sure you want to remove this item ?"))) {
$(e.currentTarget).parents('.oe-dashboard-action:first').remove(); $(e.currentTarget).parents('.oe_dashboard_action:first').remove();
this.do_save_dashboard(); this.do_save_dashboard();
} }
}, },
@ -113,12 +113,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
var self = this; var self = this;
var board = { var board = {
form_title : this.view.fields_view.arch.attrs.string, form_title : this.view.fields_view.arch.attrs.string,
style : this.$element.find('.oe-dashboard').attr('data-layout'), style : this.$element.find('.oe_dashboard').attr('data-layout'),
columns : [] columns : []
}; };
this.$element.find('.oe-dashboard-column').each(function() { this.$element.find('.oe_dashboard_column').each(function() {
var actions = []; var actions = [];
$(this).find('.oe-dashboard-action').each(function() { $(this).find('.oe_dashboard_action').each(function() {
var action_id = $(this).attr('data-id'), var action_id = $(this).attr('data-id'),
new_attrs = _.clone($(this).data('action_attrs')); new_attrs = _.clone($(this).data('action_attrs'));
if (new_attrs.domain) { if (new_attrs.domain) {
@ -138,7 +138,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
view_id: this.view.fields_view.view_id, view_id: this.view.fields_view.view_id,
arch: arch arch: arch
}, function() { }, function() {
self.$element.find('.oe-dashboard-link-reset').show(); self.$element.find('.oe_dashboard_link_reset').show();
}); });
}, },
on_load_action: function(result, index, action_attrs) { on_load_action: function(result, index, action_attrs) {

26
addons/web_dashboard/static/src/xml/web_dashboard.xml
View File

@ -1,19 +1,19 @@
<template> <template>
<t t-name="DashBoard"> <t t-name="DashBoard">
<div class="oe-dashboard-links"> <div class="oe_dashboard_links">
<button type="button" class="button oe-dashboard-link-reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id ? null : 'display: none'"> <button type="button" class="button oe_dashboard_link_reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id ? null : 'display: none'">
<img src="/web_dashboard/static/src/img/layout_2-1.png" width="16" height="16"/> <img src="/web_dashboard/static/src/img/layout_2-1.png" width="16" height="16"/>
<span> Reset </span> <span> Reset </span>
</button> </button>
<button type="button" class="button oe-dashboard-link-change_layout" title="Change Layout.."> <button type="button" class="button oe_dashboard_link_change_layout" title="Change Layout..">
<img src="/web_dashboard/static/src/img/layout_1-1-1.png" width="16" height="16"/> <img src="/web_dashboard/static/src/img/layout_1-1-1.png" width="16" height="16"/>
<span> Change Layout </span> <span> Change Layout </span>
</button> </button>
</div> </div>
<table t-att-data-layout="node.attrs.style" t-attf-class="oe-dashboard oe-dashboard-layout_#{node.attrs.style}" cellspacing="0" cellpadding="0" border="0"> <table t-att-data-layout="node.attrs.style" t-attf-class="oe_dashboard oe_dashboard_layout_#{node.attrs.style}" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td t-foreach="node.children" t-as="column" t-if="column.tag == 'column'" <td t-foreach="node.children" t-as="column" t-if="column.tag == 'column'"
t-att-id="view.element_id + '_column_' + column_index" t-attf-class="oe-dashboard-column index_#{column_index}"> t-att-id="view.element_id + '_column_' + column_index" t-attf-class="oe_dashboard_column index_#{column_index}">
<t t-foreach="column.children" t-as="action" t-if="action.tag == 'action'" t-call="DashBoard.action"/> <t t-foreach="column.children" t-as="action" t-if="action.tag == 'action'" t-call="DashBoard.action"/>
</td> </td>
@ -21,20 +21,20 @@
</table> </table>
</t> </t>
<t t-name="DashBoard.action"> <t t-name="DashBoard.action">
<div t-att-data-id="action.attrs.name" class="oe-dashboard-action"> <div t-att-data-id="action.attrs.name" class="oe_dashboard_action">
<h2 t-attf-class="oe-dashboard-action-header #{action.attrs.string ? '' : 'oe-dashboard-action-header-empty'}"> <h2 t-attf-class="oe_dashboard_action_header #{action.attrs.string ? '' : 'oe_dashboard_action_header_empty'}">
<t t-esc="action.attrs.string"/> <t t-esc="action.attrs.string"/>
<t t-if="!action.attrs.string">&amp;nbsp;</t> <t t-if="!action.attrs.string">&amp;nbsp;</t>
<button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_dashboard_button_create">Create</button> <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_dashboard_button_create">Create</button>
<span class='ui-icon ui-icon-closethick'></span> <span class='ui-icon ui-icon-closethick'></span>
<span class='ui-icon ui-icon-minusthick oe-dashboard-fold' t-if="!action.attrs.fold"></span> <span class='ui-icon ui-icon-minusthick oe_dashboard_fold' t-if="!action.attrs.fold"></span>
<span class='ui-icon ui-icon-plusthick oe-dashboard-fold' t-if="action.attrs.fold"></span> <span class='ui-icon ui-icon-plusthick oe_dashboard_fold' t-if="action.attrs.fold"></span>
</h2> </h2>
<div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe-dashboard-action-content" t-att-style="action.attrs.fold ? 'display: none' : null"></div> <div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_dashboard_action_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
</div> </div>
</t> </t>
<t t-name="DashBoard.layouts"> <t t-name="DashBoard.layouts">
<div class="oe-dashboard-layout-selector"> <div class="oe_dashboard_layout_selector">
<p> <p>
<strong>Choose dashboard layout</strong> <strong>Choose dashboard layout</strong>
</p> </p>
@ -42,7 +42,7 @@
<li t-foreach="'1 1-1 1-1-1 1-2 2-1'.split(' ')" t-as="layout" t-att-data-layout="layout"> <li t-foreach="'1 1-1 1-1-1 1-2 2-1'.split(' ')" t-as="layout" t-att-data-layout="layout">
<img t-attf-src="/web_dashboard/static/src/img/layout_#{layout}.png"/> <img t-attf-src="/web_dashboard/static/src/img/layout_#{layout}.png"/>
<img t-if="layout == current_layout" <img t-if="layout == current_layout"
src="/web/static/src/img/icons/gtk-apply.png" width="16" height="16" class="oe-selected-layout"/> src="/web/static/src/img/icons/gtk-apply.png" width="16" height="16" class="oe_dashboard_selected_layout"/>
</li> </li>
</ul> </ul>
</div> </div>
@ -56,7 +56,7 @@
</board> </board>
</form> </form>
</t> </t>
<div t-name="HomeWidget" class="oe-dashboard-home-widget"/> <div t-name="HomeWidget" class="oe_dashboard_home_widget"/>
<t t-name="HomeWidget.content"> <t t-name="HomeWidget.content">
<h3><t t-esc="widget.title"/></h3> <h3><t t-esc="widget.title"/></h3>
<iframe width="100%" frameborder="0" t-att-src="url"/> <iframe width="100%" frameborder="0" t-att-src="url"/>

4
addons/web_gantt/static/src/css/gantt.css
View File

@ -1,9 +1,9 @@
.openerp .oe-gantt-view-view { .openerp .oe_gantt {
min-height: 500px; min-height: 500px;
} }
.openerp .oe-gantt-view-view .oe-gantt-view-create { .openerp .oe_gantt .oe_gantt_button_create {
position: absolute; position: absolute;
top: 5px; top: 5px;
} }

4
addons/web_gantt/static/src/js/gantt.js
View File

@ -68,7 +68,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
}, },
on_data_loaded_2: function(tasks, group_bys) { on_data_loaded_2: function(tasks, group_bys) {
var self = this; var self = this;
$(".oe-gantt-view-view", this.$element).html(""); $(".oe_gantt", this.$element).html("");
//prevent more that 1 group by //prevent more that 1 group by
if (group_bys.length > 0) { if (group_bys.length > 0) {
@ -187,7 +187,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
var td = $($("table td", self.$element)[0]); var td = $($("table td", self.$element)[0]);
var rendered = QWeb.render("GanttView-create-button"); var rendered = QWeb.render("GanttView-create-button");
$(rendered).prependTo(td); $(rendered).prependTo(td);
$(".oe-gantt-view-create", this.$element).click(this.on_task_create); $(".oe_gantt_button_create", this.$element).click(this.on_task_create);
}, },
on_task_changed: function(task_obj) { on_task_changed: function(task_obj) {
var self = this; var self = this;

4
addons/web_gantt/static/src/xml/web_gantt.xml
View File

@ -3,10 +3,10 @@
<templates> <templates>
<t t-name="GanttView"> <t t-name="GanttView">
<div> <div>
<div t-att-id="widget.chart_id" class="oe-gantt-view-view"/> <div t-att-id="widget.chart_id" class="oe_gantt"/>
</div> </div>
</t> </t>
<t t-name="GanttView-create-button"> <t t-name="GanttView-create-button">
<button class="oe_button oe-gantt-view-create">Create</button> <button class="oe_button oe_gantt_button_create">Create</button>
</t> </t>
</templates> </templates>

6
addons/web_kanban/static/src/js/kanban.js
View File

@ -8,7 +8,7 @@ instance.web.views.add('kanban', 'instance.web_kanban.KanbanView');
instance.web_kanban.KanbanView = instance.web.View.extend({ instance.web_kanban.KanbanView = instance.web.View.extend({
template: "KanbanView", template: "KanbanView",
display_name: _lt('Kanban'), display_name: _lt('Kanban'),
default_nr_columns: 3, default_nr_columns: 1,
view_type: "kanban", view_type: "kanban",
quick_create_class: "instance.web_kanban.QuickCreate", quick_create_class: "instance.web_kanban.QuickCreate",
number_of_color_schemes: 10, number_of_color_schemes: 10,
@ -798,10 +798,10 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
self.quick_add(); self.quick_add();
} }
}); });
$(".oe-kanban-quick_create_add", this.$element).click(function () { $(".oe_kanban_quick_create_add", this.$element).click(function () {
self.quick_add(); self.quick_add();
}); });
$(".oe-kanban-quick_create_close", this.$element).click(function () { $(".oe_kanban_quick_create_close", this.$element).click(function () {
self.trigger('close'); self.trigger('close');
}); });
self.$input.keyup(function(e) { self.$input.keyup(function(e) {

4
addons/web_kanban/static/src/xml/web_kanban.xml
View File

@ -68,8 +68,8 @@
<input t-att-placeholder="_t('Create a new record')"/> <input t-att-placeholder="_t('Create a new record')"/>
<t t-if="widget._buttons"> <t t-if="widget._buttons">
<div class="oe_kanban_quick_create_buttons"> <div class="oe_kanban_quick_create_buttons">
<button class="oe-kanban-quick_create_add">Add</button> <button class="oe_kanban_quick_create_add">Add</button>
or <a class="oe-kanban-quick_create_close">Cancel</a> or <a class="oe_kanban_quick_create_close">Cancel</a>
</div> </div>
</t> </t>
</div> </div>

2
addons/web_process/static/src/css/process.css
View File

@ -50,7 +50,7 @@ a.cta-a strong {
display: table-cell; display: table-cell;
} }
.oe-process-view { .oe_process {
height: 20px; height: 20px;
margin-top:8px; margin-top:8px;
padding: 0; padding: 0;

2
addons/web_process/static/src/js/process.js
View File

@ -14,7 +14,7 @@ openerp.web_process = function (instance) {
var self = this, var self = this,
grandparent = this.getParent() && this.getParent().getParent(), grandparent = this.getParent() && this.getParent().getParent(),
view = this.views[this.views_src[0].view_type], view = this.views[this.views_src[0].view_type],
$process_view = this.$element.find('.oe-process-view'); $process_view = this.$element.find('.oe_process');
if (!(grandparent instanceof instance.web.WebClient) || if (!(grandparent instanceof instance.web.WebClient) ||
!(view.view_type === this.views_src[0].view_type !(view.view_type === this.views_src[0].view_type
&& view.view_id === this.views_src[0].view_id)) { && view.view_id === this.views_src[0].view_id)) {

2
addons/web_process/static/src/xml/web_process.xml
View File

@ -3,7 +3,7 @@
--> -->
<t t-extend="ViewManager" t-name="ViewManagerAction"> <t t-extend="ViewManager" t-name="ViewManagerAction">
<t t-jquery=".oe-view-manager-header" t-operation="append"> <t t-jquery=".oe-view-manager-header" t-operation="append">
<a t-if="self.flags.display_title !== false" class="oe-process-view" title="Process View" href="javascript: void(0)"></a> <a t-if="self.flags.display_title !== false" class="oe_process" title="Process View" href="javascript: void(0)"></a>
</t> </t>
</t> </t>
<t t-name="ProcessView"> <t t-name="ProcessView">

2
addons/web_tests/static/src/css/web_tests.css
View File

@ -1,3 +1,3 @@
.oe-bunchaforms > div { .oe_bunchaforms > div {
float: left; float: left;
} }

2
addons/web_tests/static/src/js/web_tests.js
View File

@ -13,7 +13,7 @@ openerp.web_tests = function (instance) {
this.form.registry = instance.web.form.readonly; this.form.registry = instance.web.form.readonly;
}, },
render: function () { render: function () {
return '<div class="oe-bunchaforms"></div>'; return '<div class="oe_bunchaforms"></div>';
}, },
start: function () { start: function () {
$.when( $.when(