From f8ca9dc08a56e9d5772975cfa46dd1b444c72901 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 21 Dec 2011 14:24:38 +0100 Subject: [PATCH 01/14] [imp] Modifying welcome message & slightly changing footer bzr revid: ahu@openerp.com-20111221132438-2dyuxuhea67ovk72 --- addons/web/static/src/xml/base.xml | 2 +- addons/web_dashboard/static/src/css/dashboard.css | 4 +++- addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ef7437c888b..c454d3613ba 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -56,7 +56,7 @@ diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css index ea8d26c2ad2..8ac560e1758 100644 --- a/addons/web_dashboard/static/src/css/dashboard.css +++ b/addons/web_dashboard/static/src/css/dashboard.css @@ -369,4 +369,6 @@ box-shadow: 0 1px 2px #bbb; } - +.openerp .welcome_message { + display:none; +} diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index e40d056b314..29e8a4e286b 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -106,7 +106,7 @@
-

Welcome to OpenERP

+

Welcome to OpenERP

 From cb5b8451c63a9a2d6c8964a876d4b06db7bdb114 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 21 Dec 2011 15:58:37 +0100 Subject: [PATCH 02/14] [imp] Modifying welcome message about first module to install bzr revid: ahu@openerp.com-20111221145837-lewf0oh30tqu0ca5 --- .../static/src/css/dashboard.css | 33 +++++++++++++++++++ .../static/src/xml/web_dashboard.xml | 13 ++++---- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css index 8ac560e1758..d434ee1ee80 100644 --- a/addons/web_dashboard/static/src/css/dashboard.css +++ b/addons/web_dashboard/static/src/css/dashboard.css @@ -372,3 +372,36 @@ .openerp .welcome_message { display:none; } +.openerp .initial_welcome_message { + width:30%; + text-align:center; + margin:10px 35% 0 35%; + padding: 5px 10px; + border: 1px solid #ccc; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + background: #eeeded; + box-shadow: 0 1px 0 #fff; + -moz-box-shadow: 0 1px 0 #fff; + -webkit-box-shadow: 0 1px 0 #fff; + color: #8c8c8c; + font-size: 90%; + text-transform: uppercase; + font-weight: bold; + text-shadow: #fff 0 1px 0; +} + +.openerp .initial_welcome_message ul{ + padding:10px 0 0 0; + margin:0; + list-style-type: none; + padding: 7px 0 5px 5px; + background-position: 0 50%; + background-repeat: no-repeat; + cursor: pointer; +} +.openerp .initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus { + color:#222; + text-decoration:none; +} diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 29e8a4e286b..ed44325fe5a 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -111,12 +111,13 @@
-
    -
  • Remember to bookmark this page.
    • -
  • Remember your login:
    • -
  • Choose the first OpenERP Application you want to install..
    • -
-

Please choose the first application to install.

+
+
    +
  • Remember to bookmark this page.
    • +
  • Remember your login:
    • +
+

Please choose the first application to install.

+
From aac18d717618e4db53cd9a5fce4180640876e044 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 21 Dec 2011 16:21:52 +0100 Subject: [PATCH 03/14] [imp] adding space between Save/Cancel buttons between buttons and form in view form bzr revid: ahu@openerp.com-20111221152152-bedulmyg14pnrt0q --- addons/web/static/src/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ea47e0877ee..f2059992555 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1078,6 +1078,7 @@ label.error { } .openerp .oe_form_buttons, .openerp .oe_list_buttons { float: left; + margin-bottom:5px; } .openerp .oe_form_pager, .openerp .oe_list_pager { float: right; From cb1cae8b20520ef5f31347bc9c53d316850861bc Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Wed, 21 Dec 2011 16:46:25 +0100 Subject: [PATCH 04/14] [imp] Moving the blockquote in the center of the screen / moving right pannel to top bzr revid: ahu@openerp.com-20111221154625-zyj0f1dnadrugxv9 --- addons/web/static/src/xml/base.xml | 36 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c454d3613ba..fe7b511e1cc 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -415,6 +415,23 @@ + + + + - +
+
+

+
+ + +
+
+ 		+ +
@@ -435,11 +452,7 @@
- -
@@ -447,18 +460,7 @@ - - -
-

-
- - -
-
- - + Date: Thu, 22 Dec 2011 10:50:28 +0100 Subject: [PATCH 05/14] [imp] Bottom pager same padding as top pager bzr revid: ahu@openerp.com-20111222095028-68ohzgepg9yx3q0x --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/js/view_list.js | 12 +++++++++--- addons/web/static/src/xml/base.xml | 5 +++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f2059992555..981edfdc077 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -912,6 +912,9 @@ label.error { font-weight: bold; vertical-align: middle; } +.openerp tfoot .oe-list-pager { + padding:0 6px 8px 0; +} .openerp .oe_button.oe_button_pager, .openerp .oe_button.oe_button_pager:disabled { padding: 0 3px 0 3px; @@ -1396,6 +1399,10 @@ label.error { background-color: white; } +.openerp tfoot.ui-widget-header { /* adding some space to the footer */ + padding-bottom: 10px; +} + /* Sidebar */ .openerp .view-manager-main-table { margin: 0; diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 73f9beb38aa..04f381b47c3 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -215,7 +215,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $(self.groups).trigger( 'selected', [selection.ids, selection.records]); }); - this.$element.find('.oe-list-add') .click(this.do_add_record) .attr('disabled', grouped && this.options.editable); @@ -234,8 +233,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $this.append('') .siblings('.oe-sortable').find('span').remove(); } - + self.reload_content(); + }); this.$element.find('.oe-list-pager') @@ -274,7 +274,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# self.reload_content(); }) .val(self._limit || 'NaN'); - }); + }) + if (!this.sidebar && this.options.sidebar && this.options.sidebar_id) { this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id); this.sidebar.start(); @@ -314,6 +315,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# .end() .find('button[data-pager-action=last], button[data-pager-action=next]') .attr('disabled', last === total); + + /* if(this.dataset.ids.length < this.limit()) { + this.$element.find('.oe-list-pager').css('display','none'); + } */ }, /** * Sets up the listview's columns: merges view and fields data, move @@ -469,6 +474,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# page: this.page, limit: this._limit }); + return reloaded.promise(); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fe7b511e1cc..781ec6ad98e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -427,7 +427,7 @@ - +