')
- .append($('![]()
', { src: '/web/static/src/img/list_empty_arrow.png' }))
- .append($('
').html(this.options.action.help)));
+ this.$element.find('table:first').hide();
+ this.$element.prepend(
+ $('
')
+ .append($('![]()
', { src: '/web/static/src/img/view_empty_arrow.png' }))
+ .append($('
').html(this.options.action.help))
+ );
}
});
instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
@@ -931,11 +947,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
if (!self.dataset.select_id(row_id)) {
throw "Could not find id in dataset"
}
- var view;
- if ($(e.target).is('.oe-record-edit-link-img')) {
- view = 'form';
- }
- self.row_clicked(e, view);
+ self.row_clicked(e);
}
});
},
@@ -1010,9 +1022,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
if (this.options.selectable) {
cells.push('');
}
- if (this.options.isClarkGable) {
- cells.push(' ');
- }
_(this.columns).each(function(column) {
if (column.invisible === '1') {
return;
@@ -1321,9 +1330,6 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
if (self.options.selectable) {
$row.append(' ');
}
- if (self.options.isClarkGable) {
- $row.append(' ');
- }
_(self.columns).chain()
.filter(function (column) {return !column.invisible;})
.each(function (column) {
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index ff76f333ea9..c918012e60d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -70,6 +70,8 @@ openerp.web.list_editable = function (instance) {
*/
do_add_record: function () {
if (this.options.editable) {
+ this.$element.find('table:first').show();
+ this.$element.find('.oe_view_nocontent').remove();
this.groups.new_record();
} else {
this._super();
@@ -202,7 +204,7 @@ openerp.web.list_editable = function (instance) {
var $new_row = $(' ', {
id: _.uniqueId('oe-editable-row-'),
'data-id': record_id,
- 'class': row ? $(row).attr('class') : '' + ' oe_forms',
+ 'class': (row ? $(row).attr('class') : '') + ' oe_form',
click: function (e) {e.stopPropagation();}
})
.delegate('button.oe-edit-row-save', 'click', function () {
@@ -398,8 +400,6 @@ openerp.web.list_editable = function (instance) {
if (this.view.editable_list.options.selectable)
$("").appendTo($element);
- if (this.view.editable_list.options.isClarkGable)
- $(" ").appendTo($element);
$xml.children().each(function(i, el) {
var modifiers = JSON.parse($(el).attr("modifiers") || "{}");
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 798c5bb1493..d2387c1ba3f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -237,7 +237,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
var self = this;
this.$element.find('.oe_view_manager_switch a').click(function() {
self.on_mode_switch($(this).data('view-type'));
- });
+ }).tipsy();
var views_ids = {};
_.each(this.views_src, function(view) {
self.views[view.view_type] = $.extend({}, view, {
@@ -636,8 +636,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
var self = this;
return $.when(this._super(view_type, no_store)).then(function () {
- self.shortcut_check(self.views[view_type]);
-
var controller = self.views[self.active_view].controller,
fvg = controller.fields_view,
view_id = (fvg && fvg.view_id) || '--';
@@ -649,15 +647,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
self.$element.find('.oe_view_title_text').text(fvg.arch.attrs.string || fvg.name);
}
- var $title = self.$element.find('.oe_view_title_text'),
- $search_prefix = $title.find('span.oe_searchable_view');
- if (controller.searchable !== false && self.flags.search_view !== false) {
- if (!$search_prefix.length) {
- $title.prepend('' + _t("Search: ") + '');
- }
- } else {
- $search_prefix.remove();
- }
});
},
do_push_state: function(state) {
@@ -681,44 +670,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
self.views[self.active_view].controller.do_load_state(state, warm);
});
},
- shortcut_check : function(view) {
- var self = this;
- var grandparent = this.getParent() && this.getParent().getParent();
- // display shortcuts if on the first view for the action
- var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
- if (!this.action.name ||
- !(view.view_type === this.views_src[0].view_type
- && view.view_id === this.views_src[0].view_id)) {
- $shortcut_toggle.hide();
- return;
- }
- $shortcut_toggle.removeClass('oe-shortcut-remove').show();
- if (_(this.session.shortcuts).detect(function (shortcut) {
- return shortcut.res_id === self.session.active_id; })) {
- $shortcut_toggle.addClass("oe-shortcut-remove");
- }
- this.shortcut_add_remove();
- },
- shortcut_add_remove: function() {
- var self = this;
- var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
- $shortcut_toggle
- .unbind("click")
- .click(function() {
- if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
- $(self.session.shortcuts.binding).trigger('remove-current');
- $shortcut_toggle.removeClass("oe-shortcut-remove");
- } else {
- $(self.session.shortcuts.binding).trigger('add', {
- 'user_id': self.session.uid,
- 'res_id': self.session.active_id,
- 'resource': 'ir.ui.menu',
- 'name': self.action.name
- });
- $shortcut_toggle.addClass("oe-shortcut-remove");
- }
- });
- },
display_title: function () {
return this.action.name;
}
@@ -777,25 +728,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
self.$element.html(QWeb.render('Sidebar', {widget: self}));
this.$element.find('ul').hide();
},
- add_section: function() {
- var self = this;
- },
- add_toolbar: function(toolbar) {
- var self = this;
- _.each(['print','action','relate'], function(type) {
- var items = toolbar[type];
- if (items) {
- for (var i = 0; i < items.length; i++) {
- items[i] = {
- label: items[i]['name'],
- action: items[i],
- classname: 'oe_sidebar_' + type
- }
- }
- self.add_items(type=='print' ? 'print' : 'other', items);
- }
- });
- },
/**
* For each item added to the section:
*
@@ -828,6 +760,22 @@ instance.web.Sidebar = instance.web.Widget.extend({
this.redraw();
}
},
+ add_toolbar: function(toolbar) {
+ var self = this;
+ _.each(['print','action','relate'], function(type) {
+ var items = toolbar[type];
+ if (items) {
+ for (var i = 0; i < items.length; i++) {
+ items[i] = {
+ label: items[i]['name'],
+ action: items[i],
+ classname: 'oe_sidebar_' + type
+ }
+ }
+ self.add_items(type=='print' ? 'print' : 'other', items);
+ }
+ });
+ },
on_item_action_clicked: function(item) {
var self = this;
self.getParent().sidebar_context().then(function (context) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3a24bebf924..c0c86af2780 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -125,7 +125,7 @@
Password
Back to Login
-
-
-
-
-