From 195fa931685a5f32a638246160a21647ba501431 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 27 Jun 2014 11:03:34 +0200 Subject: [PATCH] [MERGE] backend front end integration Render the top-menu (backend menu or frontend editbar) server-side. Use Fontawesome icons (mail, timezone, chat). Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize. --- .../static/src/css/attendance.css | 3 + .../hr_attendance/static/src/css/slider.css | 33 ---- .../static/src/img/emp-in-disable32.png | Bin 1135 -> 0 bytes .../hr_attendance/static/src/img/emp-in32.png | Bin 2153 -> 0 bytes .../static/src/img/emp-out-disable32.png | Bin 1110 -> 0 bytes .../static/src/img/emp-out32.png | Bin 2062 -> 0 bytes .../hr_attendance/static/src/js/attendance.js | 11 +- .../static/src/xml/attendance.xml | 14 +- addons/hr_attendance/views/hr_attendance.xml | 2 +- addons/im/static/src/css/im.css | 6 +- addons/im/static/src/js/im.js | 7 +- addons/im/static/src/xml/im.xml | 8 +- addons/mail/static/src/css/mail.css | 26 +-- addons/mail/static/src/js/announcement.js | 4 +- addons/mail/static/src/js/mail.js | 6 +- addons/mail/static/src/xml/announcement.xml | 22 ++- addons/mail/static/src/xml/mail.xml | 8 +- addons/web/controllers/main.py | 70 +------- .../static/lib/cleditor/jquery.cleditor.js | 1 - addons/web/static/src/css/base.css | 120 ++++--------- addons/web/static/src/css/base.sass | 90 +++------- addons/web/static/src/js/chrome.js | 139 ++++++++------- addons/web/static/src/js/views.js | 2 +- addons/web/static/src/xml/base.xml | 94 +--------- addons/web/tests/__init__.py | 2 +- addons/web/tests/test_menu.py | 22 +-- addons/web/views/database_manager.html | 44 ++++- addons/web/views/webclient_templates.xml | 88 +++++++++- addons/website/__openerp__.py | 1 + addons/website/models/ir_ui_view.py | 1 + addons/website/models/website.py | 3 + .../static/{src/js => lib}/jQuery.transfo.js | 0 addons/website/static/src/css/editor.css | 40 ++++- addons/website/static/src/css/editor.sass | 31 +++- addons/website/static/src/css/snippets.css | 2 + addons/website/static/src/css/snippets.sass | 2 + addons/website/static/src/css/website.css | 21 ++- addons/website/static/src/css/website.sass | 11 ++ addons/website/static/src/js/website.ace.js | 25 ++- ...website.menu.js => website.contentMenu.js} | 71 ++++++-- .../website/static/src/js/website.editor.js | 164 +++++++++--------- .../static/src/js/website.editor.newpage.js | 58 ------- addons/website/static/src/js/website.js | 20 ++- .../website/static/src/js/website.mobile.js | 20 +-- addons/website/static/src/js/website.seo.js | 16 +- .../static/src/js/website.tour.banner.js | 2 +- addons/website/static/src/js/website.tour.js | 6 +- .../static/src/js/website.translator.js | 19 +- ...bsite.menu.xml => website.contentMenu.xml} | 10 +- .../website/static/src/xml/website.editor.xml | 23 +-- addons/website/static/src/xml/website.seo.xml | 5 + .../static/src/xml/website.snippets.xml | 4 +- .../static/src/xml/website.translator.xml | 3 +- addons/website/static/src/xml/website.xml | 48 ----- addons/website/tests/test_ui.py | 1 + .../website/views/website_backend_navbar.xml | 85 +++++++++ addons/website/views/website_templates.xml | 39 +---- .../static/src/js/website_blog.editor.js | 39 ++--- .../static/src/xml/website_blog.xml | 7 - .../views/website_blog_templates.xml | 6 + .../static/src/js/website_event.editor.js | 32 ++-- .../static/src/xml/website_event.xml | 7 - addons/website_event/views/website_event.xml | 7 + .../static/src/js/website_forum.editor.js | 32 ++-- .../static/src/xml/website_forum.xml | 7 - addons/website_forum/views/website_forum.xml | 7 + .../controllers/main.py | 2 +- .../src/js/website_hr_recruitment.editor.js | 14 -- .../static/src/xml/website_hr_recruitment.xml | 7 - .../views/templates.xml | 13 +- addons/website_report/views/layouts.xml | 3 +- .../static/src/js/website.tour.shop.js | 2 +- .../static/src/js/website_sale.editor.js | 32 ++-- .../static/src/xml/website_sale.xml | 7 - addons/website_sale/views/templates.xml | 7 + openerp/addons/base/ir/ir_ui_menu.py | 59 +++++++ 76 files changed, 903 insertions(+), 940 deletions(-) create mode 100644 addons/hr_attendance/static/src/css/attendance.css delete mode 100644 addons/hr_attendance/static/src/css/slider.css delete mode 100644 addons/hr_attendance/static/src/img/emp-in-disable32.png delete mode 100644 addons/hr_attendance/static/src/img/emp-in32.png delete mode 100644 addons/hr_attendance/static/src/img/emp-out-disable32.png delete mode 100644 addons/hr_attendance/static/src/img/emp-out32.png rename addons/website/static/{src/js => lib}/jQuery.transfo.js (100%) rename addons/website/static/src/js/{website.menu.js => website.contentMenu.js} (73%) delete mode 100644 addons/website/static/src/js/website.editor.newpage.js rename addons/website/static/src/xml/{website.menu.xml => website.contentMenu.xml} (87%) create mode 100644 addons/website/views/website_backend_navbar.xml delete mode 100644 addons/website_blog/static/src/xml/website_blog.xml delete mode 100644 addons/website_event/static/src/xml/website_event.xml delete mode 100644 addons/website_forum/static/src/xml/website_forum.xml delete mode 100644 addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js delete mode 100644 addons/website_hr_recruitment/static/src/xml/website_hr_recruitment.xml delete mode 100644 addons/website_sale/static/src/xml/website_sale.xml diff --git a/addons/hr_attendance/static/src/css/attendance.css b/addons/hr_attendance/static/src/css/attendance.css new file mode 100644 index 00000000000..2346e2b3a2d --- /dev/null +++ b/addons/hr_attendance/static/src/css/attendance.css @@ -0,0 +1,3 @@ +.oe_systray #oe_attendance_sign_in_out_icon { + font-color: white; +} \ No newline at end of file diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css deleted file mode 100644 index 849cd33a894..00000000000 --- a/addons/hr_attendance/static/src/css/slider.css +++ /dev/null @@ -1,33 +0,0 @@ - -.openerp .oe_attendance_status { - height: 32px; - width: 32px; - display: inline-block; -} -.openerp .oe_attendance_signin { - float: right; - height: 32px; - width: 32px; - background: url(/hr_attendance/static/src/img/emp-out32.png); - cursor: pointer; -} -.openerp .oe_attendance_signin:hover { - background: url(/hr_attendance/static/src/img/emp-out-disable32.png); -} -.openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin { - display: none; -} - -.openerp .oe_attendance_signout { - float:right; - height: 32px; - width: 32px; - background: url(/hr_attendance/static/src/img/emp-in32.png); - cursor: pointer; -} -.openerp .oe_attendance_signout:hover { - background: url(/hr_attendance/static/src/img/emp-in-disable32.png); -} -.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout { - display: none; -} diff --git a/addons/hr_attendance/static/src/img/emp-in-disable32.png b/addons/hr_attendance/static/src/img/emp-in-disable32.png deleted file mode 100644 index 1968e0de46434949ddb12393f4f21895270a334c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1135 zcmV-#1d#iQP)kdg00001b5ch_0Itp) z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sa_Q z3&GR?00Z+$L_t(Y$BmR*Y*b|s$A5Fq>Dk@ZQkF#u6eyrrg9t^agh&iZ;K55`)F3_( zUwsf`AjlK77^_l~#=GH35^rGS#XuiSj3(Zt2oDqqAxgypEiK({yW8Ef=ljNoJ-yh{ zmYJO7!vitH6I{_{Z0XG;RM}XoG zqXLHvedJKJl0I2zEPl7Y@GM`9HSv44eXyfpI1-OfCFPV;Nfk+wWVuK;Llg)kz^(C~ zh*hsXc_>#l{t9inUX8dojC`Pga*1|=(l%fL2gR}G^Q*fKrXvPlvhwLI+Ytw_xCkH! z4nmrCvXMGd)MFUHQ5sry#e=M40ftZv)^m57 zg`-lA&k<3s<70493?LW+x+C&Q9$+!;v@wK>i=*CM+&>DC@3lDm!&(%J0~iD$OBThD zU=vFTFl@#nPX~R1_@z^*C4p0tz@1%o+jkT7TL| zEh!9cB;gVRmpm7^M#%4Mz;cRS;)D#4#A>F0L4f@}AN4GM0_FCn#`XyC_=%|A*$OVKrAy=tl5y~*LsnmoN{Xo(e+r}0} zNYuoibgE;TkP5AmBq>cvMR4ieLro{L#RZAZ;Jo`002ovPDHLkV1o9X B3oQTu diff --git a/addons/hr_attendance/static/src/img/emp-in32.png b/addons/hr_attendance/static/src/img/emp-in32.png deleted file mode 100644 index 26e3c01556b290949b104240e73fe43dc27b1229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2153 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 diff --git a/addons/hr_attendance/static/src/img/emp-out32.png b/addons/hr_attendance/static/src/img/emp-out32.png deleted file mode 100644 index d2a6cbb50137c404d3f188151bb64024c082b75a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2062 zcmV+p2=VucP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb& z2ssF4I&?Mw00)jqL_t(o!?l)aY+c0_$A2^T-nTjNvtws-UhLR01rq`#aY8|rT1WsD zXe*J3N=T?dNG+9sR?rj?NaL6Uw?wj9K2+ip5fBz*q^c4~h`nMfS#U+-gecD9=LF(4 zes_t}ntkOg(5(Y+eYob#XmIsbD8E^usV-!l2X^~u&nk8j=Fy!EeJ>nGOQ z+S)G2o_(PJ>>!xCdCSJXU()!4U(K$XO(L13Saf;u8VV z70oLIl#0b1Y}>(cqOXV$1U^CF<9R+{WY_LpYWHV*uFZ{&e)5+s+so<~2 zCbu^)Z^rk1rIa8NO=AROLPShyEjkkfp<2GInHgne+rP{Cd4*u>6RizRO-tIUtExq7 zrIgY{Q=ybXL>2A?pdym$s4ZEf}U?%n&05m6$BFr2!%?+0fj;dB<1LUkY5w`0Q}AIpF5N?5;W zQ6XPEeb*IBmg4)~WDO9RP{q^~5mKo#-gxs3o_&7Ds{XI~^WUoyZrt?9udi8o?e_AS zY3bhoxw>)nO?aMHqM6BB0HC!d7K`)tJ8v<6-U8X%{rSGSnX|9Tjt!ZIAKq}`0RFsb z!~M74zV@m5MGa)LS&kp?W8eOLT;6mUjf)#6dH`B$j4|{a?qUCd{VcuWDi+q)OV#W- zY=7>V;}8ArfrS^$z{ZvhxBTL^U%uA3xKYB;DBt(#@9$@1WQ1&AmVtqjIF5}Ii{pD9 zz8^4W-hAdbacYhnq59Av;zy4NMVEtPxxVC)qxW7pGV=O40kpKVPzcAJmCLRvuDX7; z_B0x<815SB4*fuy0%C=FKg$5M_0YimCgRS+hPaNlG-&qHiEn9xC>lS2!p(w{9om-Yg zMMVV_6_ru)X~obBFS0NQU}y-H&x7lN)<{zm96N>pCNic@dY(>e{m*@gMD46%@#HiB z9UUF)>;CWBOE0|)*Y%WbTP1l3T014#sZu8dtrfWwUo!X8Pmy#wD$ApzFf;@=-;BEJ zE())|j=OFhp$H)$pbi@oTjIL^m=9~Fh2V}m?jSJX)w3$A1O%lNCr|bh0TGO0Qu|>T zB0%ugo5cG1P=^mgPY?9=A_D`^*@*-J$vf{P@yaU%O5p>3$=3<3Z~q{jPJbf@l8MAD zrBEWmz`!7}m_rzbr4X3OPA6grL~uU-7>*o4CT0+z90yY@;@x*202OQ2Fu$XNLJ5Qb z*DYR5CX;FY27qGG9h}g1Z*MQ@bb7MJPrQ64TCQ(GVuyN=zCP5kW5_MHpk8|odH;R% z?%l*YI}xqH7^>Hs0q8%dbY=l2c_4lKH%q#ji`7WEQ`PxSA9!&ocBuS zOWC^GMO0Q+5Rb>PEDNPnq<5u(C<&G0P`v*E{O5OIl_V1Y9^eAA)~_e?+ zojZ|O3}xF$c{%&P{POCrH=`I(W7%5$^e5M^C@V{eh^VOEPe_qc6ai!K%2H(Zd`4>K zOcLodGty~hRaP?ho_na+wr!eoY#Ze`h-HbJOb*s`bv^X;91y^~^g_qKp5O88hpy+V z88c>1zJj9I2h*lnxsub18;Cm&sbrE=B0=1?(P4-T4`e^x?<5`i^H$g(kd2L=r{}w&UP?0e%qRdp@ok_5Q(zdaD2PDQbLN6es~ycQ@+k zr%_*h6*+dC2t*>mIDA;ObLVe2ouwHifH}ZiAO(1JbqnVL%#eB6l=M1j_kQ>_u(7L`h=F=IYDc;LY5dBtKOQz)FZ8#+L;loRTF-VG>a zev?kmYt3ZZDsB6=SV?}^HWG_bwC%x>@$n}X?Ai0TV~K>+6^rNhAi0?F9Hf8T)YM#_ sOxA?p4h|0=y!`0VE`UwI<}>#G5B|MNh_viC#{d8T07*qoM6N<$f(9txod5s; diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js index 143e3dd163d..692fdc33f50 100644 --- a/addons/hr_attendance/static/src/js/attendance.js +++ b/addons/hr_attendance/static/src/js/attendance.js @@ -14,15 +14,14 @@ openerp.hr_attendance = function (instance) { start: function() { var self = this; var tmp = function() { - this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in")); - this.$el.toggleClass("oe_attendance_signed", this.get("signed_in")); + var $sign_in_out_icon = this.$('#oe_attendance_sign_in_out_icon'); + $sign_in_out_icon.toggleClass("fa-sign-in", ! this.get("signed_in")); + $sign_in_out_icon.toggleClass("fa-sign-out", this.get("signed_in")); }; this.on("change:signed_in", this, tmp); _.bind(tmp, this)(); - this.$(".oe_attendance_signin").click(function() { - self.do_update_attendance(); - }); - this.$(".oe_attendance_signout").click(function() { + this.$(".oe_attendance_sign_in_out").click(function(ev) { + ev.preventDefault(); self.do_update_attendance(); }); this.$el.tooltip({ diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml index 2e71e1195aa..bed10677d2c 100644 --- a/addons/hr_attendance/static/src/xml/attendance.xml +++ b/addons/hr_attendance/static/src/xml/attendance.xml @@ -1,13 +1,9 @@ - - - - - diff --git a/addons/hr_attendance/views/hr_attendance.xml b/addons/hr_attendance/views/hr_attendance.xml index f481ec29053..9f229b92abb 100644 --- a/addons/hr_attendance/views/hr_attendance.xml +++ b/addons/hr_attendance/views/hr_attendance.xml @@ -5,8 +5,8 @@ diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css index b869bdddb44..b17b4dfaa70 100644 --- a/addons/im/static/src/css/im.css +++ b/addons/im/static/src/css/im.css @@ -11,11 +11,9 @@ visibility: hidden; } } - /* button */ - -.openerp .oe_topbar_imbutton { - cursor: pointer; +.oe_systray #oe_topbar_im_icon { + color: white; } .openerp .oe_topbar_item.oe_topbar_imbutton .oe_e { position: relative; diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index 95f29bc5c49..3731c8e80d7 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -25,7 +25,7 @@ im.appendTo(instance.client.$el); var button = new instance.im.ImTopButton(this); button.on("clicked", im, im.switch_display); - button.appendTo(instance.webclient.$el.find('.oe_systray')); + button.appendTo(window.$('.oe_systray')); }); return this._super.apply(this, arguments); }, @@ -36,7 +36,8 @@ events: { "click": "clicked", }, - clicked: function() { + clicked: function(ev) { + ev.preventDefault(); this.trigger("clicked"); }, }); @@ -80,7 +81,7 @@ }); }, calc_box: function() { - var $topbar = instance.client.$(".navbar"); // .oe_topbar is replaced with .navbar of bootstrap3 + var $topbar = window.$('#oe_main_menu_navbar'); // .oe_topbar is replaced with .navbar of bootstrap3 var top = $topbar.offset().top + $topbar.height(); top = Math.max(top - $(window).scrollTop(), 0); this.$el.css("top", top); diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml index 1acb538db4f..0c5e61824e2 100644 --- a/addons/im/static/src/xml/im.xml +++ b/addons/im/static/src/xml/im.xml @@ -14,9 +14,11 @@ -
- + -
+
  • + + + +
    • diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 0abd8ab1b4e..ff446310d77 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -1,29 +1,7 @@ /* ------------ TOPBAR MAIL BUTTON --------------- */ - -/* FIXME this css is not very pretty because it uses a - * 'button' element wich comes with a lot of inappropriate - * styling. Entypo is also a headache to center properly - * */ - -.openerp .oe_topbar_item.oe_topbar_compose_full_email{ - padding: 0px; - width: 32px; - height: 32px; -} -.openerp .oe_topbar_item.oe_topbar_compose_full_email button{ - position: relative; - top: -3px; /* centering entypo ... urgh */ - box-sizing: border-box; - border: none; - box-shadow: none; +.oe_systray #oe_topbar_compose_full_email_icon { color: white; - background: none; - text-shadow: 0px 1px 2px black; - width: 32px; - height: 32px; - padding: 0px; - margin: 0px; - border-radius: 0px; + margin-right: 15px; } /* ---- GENERIC FOR MAIL-RELATED STUFF ---- */ diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index 0dd438d13af..95d4dc6e1ff 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -12,7 +12,9 @@ openerp_announcement = function(instance) { } var self = this; var config_parameter = new instance.web.Model('ir.config_parameter'); - var $bar = this.$el.find('.announcement_bar'); + $(openerp.qweb.render('WebClient.announcement_bar')).prependTo($('body')); + var $bar = $('#announcement_bar_table'); + return config_parameter.call('get_param', ['database.uuid', false]).then(function(dbuuid) { if (!dbuuid) { return; diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 04e99f5de0e..dbe7d54aade 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1996,11 +1996,12 @@ openerp.mail = function (session) { template:'mail.ComposeMessageTopButton', start: function () { - this.$('button').on('click', this.on_compose_message ); + this.$el.on('click', this.on_compose_message); this._super(); }, on_compose_message: function (event) { + event.preventDefault(); event.stopPropagation(); var action = { type: 'ir.actions.act_window', @@ -2021,7 +2022,8 @@ openerp.mail = function (session) { this._super.apply(this, arguments); this.update_promise.then(function() { var mail_button = new session.web.ComposeMessageTopButton(); - mail_button.appendTo(session.webclient.$el.find('.oe_systray')); + mail_button.appendTo(session.webclient.$el.parents().find('.oe_systray')); + openerp.web.bus.trigger('resize'); // Re-trigger the reflow logic }); }, }); diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml index 84dfa426796..46397861992 100644 --- a/addons/mail/static/src/xml/announcement.xml +++ b/addons/mail/static/src/xml/announcement.xml @@ -1,12 +1,18 @@ - - - - - - - + +
    + + + + +
    + + + + + +
    +
    -     diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 62ecdcd89d6..c79b95224b1 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -340,9 +340,11 @@ render of the button on the user bar for open wizard compose message --> -
    - -
    +
  • + + + +
    • -
    - - - -     - -
      -
    • - - - -
      • -
    -     - - - - - - - -