From 6f888ccb5e62753465fb2c04cc2ab16cf1824dbc Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 6 Sep 2012 15:14:04 +0530 Subject: [PATCH 1/6] [IMP]Set title again which is replace by on_record_loaded method. bzr revid: vme@tinyerp.com-20120906094404-ufxfcls2f6vntnob --- addons/board/static/src/js/dashboard.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 0333690aa57..cdb5193c712 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -24,6 +24,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ scroll: false }).bind('sortstop', self.do_save_dashboard); + var old_title = this.__parentedParent.get('title'); + this.__parentedParent.on_record_loaded.add_last(function(){ + self.__parentedParent.set({ 'title' : old_title}); + }); // Events this.$el.find('.oe_dashboard_link_reset').click(this.on_reset); this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout); From cd0be77ffac765ed3160a2a812bef9ca5b91d8a4 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 7 Sep 2012 18:24:53 +0530 Subject: [PATCH 2/6] [IMP]implement CSs bzr revid: vme@tinyerp.com-20120907125453-rowm6tydm09rxpfm --- addons/board/static/src/css/dashboard.css | 33 ++++++++++++++++++++++ addons/board/static/src/css/dashboard.sass | 26 +++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index 6907b4271a0..095893b2c97 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -1,3 +1,36 @@ +.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 { + width: 100%; +} +.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 { + display: none; +} +.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column { + width: 50%; +} +.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 { + display: none; +} +.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column { + width: 33%; +} +.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 { + width: 70%; +} +.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 { + width: 30%; +} +.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 { + display: none; +} +.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 { + width: 30%; +} +.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 { + width: 70%; +} +.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 { + display: none; +} .openerp .oe_dashboard_links { text-align: right; margin: 0 4px 6px 0; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index 4bacc7bd892..b97f7831cd6 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -9,6 +9,31 @@ box-shadow: $bsval .openerp + .oe_dashboard_layout_1 .oe_dashboard_column + &.index_0 + width: 100% + &.index_1, &.index_2 + display: none + .oe_dashboard_layout_1-1 .oe_dashboard_column + width: 50% + &.index_2 + display: none + .oe_dashboard_layout_1-1-1 .oe_dashboard_column + width: 33% + .oe_dashboard_layout_2-1 .oe_dashboard_column + &.index_0 + width: 70% + &.index_1 + width: 30% + &.index_2 + display: none + .oe_dashboard_layout_1-2 .oe_dashboard_column + &.index_0 + width: 30% + &.index_1 + width: 70% + &.index_2 + display: none .oe_dashboard_links text-align: right margin: 0 4px 6px 0 @@ -86,3 +111,4 @@ > tbody tr:nth-child(odd) background: transparent + From 4fc67d7a5d7d8bbd6180cc717c0f267c5ec0e1c1 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 7 Sep 2012 18:41:49 +0530 Subject: [PATCH 3/6] [IMP]show reset button on debug mode. bzr revid: vme@tinyerp.com-20120907131149-4z5vjfha0bfi8rb7 --- addons/board/static/src/js/dashboard.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index cdb5193c712..8da4f6cf7b5 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -17,7 +17,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ start: function() { var self = this; this._super.apply(this, arguments); - + + if(!this.session.debug) + this.$el.find(".oe_dashboard_links button:first").css("display", "none"); + this.$el.find('.oe_dashboard_column').sortable({ connectWith: '.oe_dashboard_column', handle: '.oe_header', From 891dcd2a4327118ead320d27c55113355ef06c88 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Sep 2012 11:54:37 +0530 Subject: [PATCH 4/6] [IMP]show reset button when debug mode is on. bzr revid: vme@tinyerp.com-20120913062437-5vcscpnk19u441m5 --- addons/board/static/src/js/dashboard.js | 2 -- addons/board/static/src/xml/board.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 193224ada3b..4e67c1e7618 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -172,8 +172,6 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.rpc('/web/view/add_custom', { view_id: this.view.fields_view.view_id, arch: arch - }, function() { - self.$el.find('.oe_dashboard_link_reset').show(); }); }, on_load_action: function(result, index, action_attrs) { diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index e13fa707776..03ede793036 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -1,7 +1,7 @@