From 9b447c025d4939d61e69acf1597191ce7af4f405 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 31 May 2012 19:02:28 +0200 Subject: [PATCH 01/12] search, shared filters bzr revid: mit@openerp.com-20120531170228-sbzxghl9vndntf4k --- addons/web/static/src/css/base.css | 25 ++++++++++++++++++++----- addons/web/static/src/css/base.sass | 25 +++++++++++++++++++++---- addons/web/static/src/js/search.js | 2 +- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e2879011a72..5fec2078ef7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1485,14 +1485,12 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_opened form { display: block; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { - position: absolute; - left: 4px; - top: 3px; -} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop { + display: inline-block; width: 12px; height: 12px; + line-height: 12px; + padding: 1px; color: #8786b7; line-height: 8px; text-align: center; @@ -1508,6 +1506,23 @@ -webkit-border-radius: 2px; border-radius: 2px; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { + display: none; + position: absolute; + bottom: 1px; + right: 4px; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_private:hover .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:hover .oe_searchview_custom_delete { + display: inline-block; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:after { + content: ","; + font-family: "entypoRegular" !important; + font-size: 22px; + font-weight: 300 !important; + margin: 0 0 0 4px; + padding: 0; +} .openerp .oe_view_nocontent > img { float: left; margin: 1.5em; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eda410aa6ca..3dd7c342f2f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1172,13 +1172,12 @@ $colour4: #8a89ba display: block // delete buttons - .oe_searchview_custom_delete - position: absolute - left: 4px - top: 3px .oe_searchview_custom_delete, .searchview_extended_delete_prop + display: inline-block width: 12px height: 12px + line-height: 12px + padding: 1px color: #8786b7 line-height: 8px text-align: center @@ -1190,6 +1189,24 @@ $colour4: #8a89ba background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) @include radius(2px) + .oe_searchview_custom_delete + display: none + position: absolute + bottom: 1px + right: 4px + .oe_searchview_custom_private, .oe_searchview_custom_public + &:hover + .oe_searchview_custom_delete + display: inline-block + .oe_searchview_custom_public:after + content: "," + font-family: "entypoRegular" !important + font-size: 22px + font-weight: 300 !important + margin: 0 0 0 4px + padding: 0 + + // }}} // Views Common {{{ .oe_view_nocontent diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index f9e737471ae..85521a14651 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1571,7 +1571,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ $filter.remove(); }); }) - .prependTo($filter); + .appendTo($filter); } $filter.unbind('click').click(function () { From 26818cf502d5c85e1799991cd643a46ae41c2d6b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 5 Jun 2012 14:46:16 +0200 Subject: [PATCH 02/12] Improved style for autocomplete view bzr revid: mit@openerp.com-20120605124616-le1piwrkadlkwpvk --- .../css/custom-theme/jquery-ui-1.8.16.custom.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css b/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css index f77de26ed99..31d7546bf2e 100644 --- a/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css +++ b/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css @@ -57,7 +57,10 @@ /* Component containers ----------------------------------*/ -.ui-widget { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; } +.ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + font-size: 13px +} .ui-widget .ui-widget { font-size: 1em; } /*.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; }*/ .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #404040; } @@ -484,12 +487,11 @@ margin-top: -3px; } .ui-menu .ui-menu-item { - margin:0; - padding: 0; + margin:0 8px 0 0; + padding: 0 0 0 12px; zoom: 1; float: left; clear: left; - width: 100%; } .ui-menu .ui-menu-item a { text-decoration:none; @@ -501,11 +503,9 @@ .ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; - background:#0064CD; - color:#fff + background:#f0f0fa; } - /* * jQuery UI Button 1.8.16 * From 1a8d51c329a708bced4161c3b143c4597c4b5090 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 5 Jun 2012 17:51:09 +0200 Subject: [PATCH 03/12] restyling of the wall bzr revid: mit@openerp.com-20120605155109-360quzvpn3g7s92g --- addons/mail/static/src/css/mail.css | 58 ++++++++++++++--------------- addons/mail/static/src/xml/mail.xml | 31 ++++++++------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 895ca575f08..1907e8e1935 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -42,12 +42,21 @@ } .openerp div.oe_mail_thread_subthread img { - width: 30px; - height: 30px; + width: 28px; + height: 28px; +} + +.openerp div.oe_mail_msg_content { + width: 486px; +} + +.openerp div.oe_mail_msg_content li{ + float: left; + margin-right: 3px; } .openerp div.oe_mail_thread_subthread div.oe_mail_msg_content { - margin-left: 40px; + width: 440px; } .openerp div.oe_mail_wall_more { @@ -141,8 +150,11 @@ } .openerp div.oe_mail_thread_subthread { - margin-top: 8px; - padding-left: 5%; + margin-left: 66px; +} + +.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child { + margin-bottom: 8px; } .openerp div.oe_mail_thread_more { @@ -150,10 +162,6 @@ border-bottom: 1px solid #D2D9E7; } -.openerp li.oe_mail_thread_msg { - padding: 1px; -} - .openerp li.oe_mail_thread_msg:after { content: ""; display: block; @@ -167,23 +175,15 @@ } .openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email { - padding: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -o-border-radius: 4px; - -ms-border-radius: 4px; - border-radius: 4px; + padding: 8px; } -.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment { - background: #eee; +.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment, .openerp .oe_mail_msg_notification { + background: white; + border-top: 1px solid #ccc } .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment { - background: white; -} - -.openerp .oe_mail_msg_notification { background: #eee; } @@ -194,7 +194,7 @@ } .openerp .oe_mail_msg_content { - margin-left: 60px; + float: left; } .openerp .oe_mail_msg_content:after { @@ -204,9 +204,8 @@ } .openerp img.oe_mail_msg_image { - margin-right: 8px; - width: 45px; - height: 45px; + width: 50px; + height: 50px; text-align: center; overflow: hidden; -moz-border-radius: 4px; @@ -240,7 +239,6 @@ .openerp li.oe_mail { list-style-type: none; - margin-bottom: 2px; } .openerp input.oe_mail, textarea.oe_mail { @@ -282,7 +280,7 @@ font-weight: bold; } -.openerp .oe_mail_oe_space { - margin-left: 15px; - margin-right: 4px; -} +/*.openerp .oe_mail_oe_space:after {*/ + /*content: " · ";*/ + /*margin-right: 2px;*/ +/*}*/ diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 874cd406852..9e5089f3ab2 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -70,23 +70,28 @@

+ - -
- - - on - - Reply - - Delete - - - Hide - +
+

From ee8b7f6329706e82c7ef2bfa2a908185078cc027 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 5 Jun 2012 18:12:04 +0200 Subject: [PATCH 04/12] Updated sizes in the chatter bzr revid: mit@openerp.com-20120605161204-titw88efs9vfzmoh --- addons/mail/static/src/css/mail.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 1907e8e1935..f1c14fbb284 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -82,10 +82,16 @@ margin-bottom: 8px; } +.openerp div.oe_mail_recthread_followers img.oe_mail_msg_image { + width: 28px; + height: 28px; + margin: 4px; +} + /* RecordThread: 2 columns view */ .openerp div.oe_mail_recthread_left { float: left; - width: 55%; + width: 560px; } .openerp div.oe_mail_recthread_right { From 339fa680fac02beb266548512a6f3112b7c9ad8d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 5 Jun 2012 19:39:53 +0200 Subject: [PATCH 05/12] Some tweaks to chatter bzr revid: mit@openerp.com-20120605173953-7i7wag4ceo2q6qde --- addons/mail/static/src/css/mail.css | 2 +- addons/mail/static/src/xml/mail.xml | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index f1c14fbb284..d35d3039ea3 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -275,7 +275,7 @@ .openerp p.oe_mail_msg { padding: 0; - margin: 0; + margin: 0 0 4px 0; } .openerp a.oe_mail_oe_intlink { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 9e5089f3ab2..995c7aa70ab 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -70,7 +70,6 @@

- @@ -78,19 +77,23 @@

@@ -113,7 +116,7 @@ Delete - Hide + Hide

From 019fd39215a6b78ba08ae7f7ff7c725e9093cc4e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 7 Jun 2012 19:51:47 +0200 Subject: [PATCH 06/12] tweak to avatar corner bzr revid: mit@openerp.com-20120607175147-gqwtfw6oorwyedey --- addons/web/static/src/css/base.css | 12 +++++++++--- addons/web/static/src/css/base.sass | 6 +++++- addons/web_kanban/static/src/css/kanban.css | 9 ++++----- addons/web_kanban/static/src/css/kanban.sass | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5fec2078ef7..f8764df0743 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -104,6 +104,12 @@ -webkit-border-radius: 3px; border-radius: 3px; } +.openerp img { + vertical-align: middle; +} +.openerp h4 { + margin: 4px 0; +} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; @@ -495,9 +501,9 @@ width: 24px; height: 24px; margin: -2px 2px 0 0; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3dd7c342f2f..468580d156d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -142,6 +142,10 @@ $colour4: #8a89ba input, textarea border: 1px solid #ccc @include radius(3px) + img + vertical-align: middle + h4 + margin: 4px 0 // }}} // Generic classes {{{ @@ -415,7 +419,7 @@ $colour4: #8a89ba width: 24px height: 24px margin: -2px 2px 0 0 - @include radius(4px) + @include radius(3px) .oe_topbar_avatar vertical-align: top .oe_dropdown_toggle:after diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index dd376ef44e5..a48d65a33b5 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .openerp .oe_kanban_view { position: absolute; top: 118px; @@ -96,7 +95,7 @@ background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat; } .openerp .oe_kanban_view .oe_kanban_quick_create { - overflow: visible; + overflow: hidden; } .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create { width: 200px; @@ -332,9 +331,9 @@ margin: 0 4px 0 0; } .openerp .oe_kanban_view .oe_kanban_avatar { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index cad7b2e228d..0651f0c7e62 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -280,7 +280,7 @@ position: inline-block margin: 0 4px 0 0 .oe_kanban_avatar - @include radius(4px) + @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) //.oe_kanban_footer_left // float: left From d74734ddee499577351618bc6250304c63095a3e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 7 Jun 2012 19:53:28 +0200 Subject: [PATCH 07/12] Improvements to chatter bzr revid: mit@openerp.com-20120607175328-u3ob9w2xi6jvr4e4 --- addons/mail/static/src/css/mail.css | 52 +++++++++++++--------- addons/mail/static/src/img/email_icon.png | Bin 2772 -> 924 bytes addons/mail/static/src/js/mail.js | 8 ++-- addons/mail/static/src/xml/mail.xml | 38 +++++++++------- 4 files changed, 58 insertions(+), 40 deletions(-) mode change 100644 => 100755 addons/mail/static/src/img/email_icon.png diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index d35d3039ea3..d37a85de73f 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -8,6 +8,12 @@ background: white; } +.openerp div.oe_mail_wall_act { + padding: 8px; + background: #eee; + border: 1px solid #ccc; +} + .openerp div.oe_mail_wall_act:after { content: ""; display: block; @@ -31,14 +37,16 @@ } .openerp textarea.oe_mail_wall_action_textarea { - width: 550px; + width: 474px; height: 60px; - padding: 5px; + padding: 4px; + margin-bottom: 8px; + float: right; } .openerp div.oe_mail_wall_threads textarea { - height: 20px; - padding: 2px; + height: 40px; + padding: 4px; } .openerp div.oe_mail_thread_subthread img { @@ -50,6 +58,10 @@ width: 486px; } +.openerp div.oe_mail_msg_content p { + margin: 4px 0; +} + .openerp div.oe_mail_msg_content li{ float: left; margin-right: 3px; @@ -141,8 +153,9 @@ .openerp div.oe_mail_thread_act { white-space: normal; - margin-bottom: 5px; - padding: 4px; + padding: 8px; + background: #eee; + border-top: 1px solid #ccc } .openerp div.oe_mail_thread_act:after { @@ -184,11 +197,16 @@ padding: 8px; } -.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment, .openerp .oe_mail_msg_notification { +.openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email, .openerp .oe_mail_msg_notification { background: white; border-top: 1px solid #ccc } +.openerp .oe_email_icon { + width: 50px; + height: 50px; +} + .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment { background: #eee; } @@ -214,11 +232,11 @@ height: 50px; text-align: center; overflow: hidden; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -o-border-radius: 4px; - -ms-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -o-border-radius: 3px; + -ms-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); @@ -226,14 +244,6 @@ clip: rect(5px, 40px, 45px, 0px); } -.openerp p.oe_mail_msg_p_email_header { - border-bottom: 1px solid #D2D9E7; -} - -.openerp span.oe_mail_msg_body a.reduce, .openerp span.oe_mail_msg_body_short a.expand { - color: #4E43E7; -} - /* ------------------------------ */ /* Styling (should be openerp) */ /* ------------------------------ */ @@ -248,7 +258,7 @@ } .openerp input.oe_mail, textarea.oe_mail { - width: 100%; + width: 432px; padding: 4px; font-size: 12px; border: 1px solid #cccccc; diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png old mode 100644 new mode 100755 index 6390d9e6e696cb65d48530ad4e4bdbe0b86fb751..78c131c0ff2bf69fc04e537076ecc408c020cbb6 GIT binary patch literal 924 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').html('Followers (' + records.length + ')').appendTo(sub_node); + var user_list = this.$element.find('ul.oe_mail_followers_display').empty(); + this.$element.find('div.oe_mail_recthread_followers h4').html('Followers (' + records.length + ')'); _(records).each(function (record) { if (record.id == self.session.uid) { self.is_subscriber = true; } var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id); - $('' + record.name + '').appendTo(sub_node); + $('
  • ' + + '' + record.name + '
    • ').appendTo(user_list); }); if (self.is_subscriber) { self.$element.find('button.oe_mail_button_follow').hide(); diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 995c7aa70ab..a34e362960b 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -10,6 +10,7 @@
    + User img