[MERGE] backend front end integration
authorSimon Lejeune <sle@openerp.com>
Fri, 27 Jun 2014 09:03:34 +0000 (11:03 +0200)
committerAntony Lesuisse <al@openerp.com>
Fri, 27 Jun 2014 09:03:34 +0000 (11:03 +0200)
commit195fa931685a5f32a638246160a21647ba501431
tree01a42d72533d1b13875acfce63aabd9ce29fc2e2
parent864e94a1dc7ecea23bd5a8b47da3055afc278cee
[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.
79 files changed:
addons/hr_attendance/static/src/css/attendance.css [new file with mode: 0644]
addons/hr_attendance/static/src/css/slider.css [deleted file]
addons/hr_attendance/static/src/img/emp-in-disable32.png [deleted file]
addons/hr_attendance/static/src/img/emp-in32.png [deleted file]
addons/hr_attendance/static/src/img/emp-out-disable32.png [deleted file]
addons/hr_attendance/static/src/img/emp-out32.png [deleted file]
addons/hr_attendance/static/src/js/attendance.js
addons/hr_attendance/static/src/xml/attendance.xml
addons/hr_attendance/views/hr_attendance.xml
addons/im/static/src/css/im.css
addons/im/static/src/js/im.js
addons/im/static/src/xml/im.xml
addons/mail/static/src/css/mail.css
addons/mail/static/src/js/announcement.js
addons/mail/static/src/js/mail.js
addons/mail/static/src/xml/announcement.xml
addons/mail/static/src/xml/mail.xml
addons/web/controllers/main.py
addons/web/static/lib/cleditor/jquery.cleditor.js
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml
addons/web/tests/__init__.py
addons/web/tests/test_menu.py
addons/web/views/database_manager.html
addons/web/views/webclient_templates.xml
addons/website/__openerp__.py
addons/website/models/ir_ui_view.py
addons/website/models/website.py
addons/website/static/lib/jQuery.transfo.js [new file with mode: 0644]
addons/website/static/src/css/editor.css
addons/website/static/src/css/editor.sass
addons/website/static/src/css/snippets.css
addons/website/static/src/css/snippets.sass
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/jQuery.transfo.js [deleted file]
addons/website/static/src/js/website.ace.js
addons/website/static/src/js/website.contentMenu.js [new file with mode: 0644]
addons/website/static/src/js/website.editor.js
addons/website/static/src/js/website.editor.newpage.js [deleted file]
addons/website/static/src/js/website.js
addons/website/static/src/js/website.menu.js [deleted file]
addons/website/static/src/js/website.mobile.js
addons/website/static/src/js/website.seo.js
addons/website/static/src/js/website.tour.banner.js
addons/website/static/src/js/website.tour.js
addons/website/static/src/js/website.translator.js
addons/website/static/src/xml/website.contentMenu.xml [new file with mode: 0644]
addons/website/static/src/xml/website.editor.xml
addons/website/static/src/xml/website.menu.xml [deleted file]
addons/website/static/src/xml/website.seo.xml
addons/website/static/src/xml/website.snippets.xml
addons/website/static/src/xml/website.translator.xml
addons/website/static/src/xml/website.xml
addons/website/tests/test_ui.py
addons/website/views/website_backend_navbar.xml [new file with mode: 0644]
addons/website/views/website_templates.xml
addons/website_blog/static/src/js/website_blog.editor.js
addons/website_blog/static/src/xml/website_blog.xml [deleted file]
addons/website_blog/views/website_blog_templates.xml
addons/website_event/static/src/js/website_event.editor.js
addons/website_event/static/src/xml/website_event.xml [deleted file]
addons/website_event/views/website_event.xml
addons/website_forum/static/src/js/website_forum.editor.js
addons/website_forum/static/src/xml/website_forum.xml [deleted file]
addons/website_forum/views/website_forum.xml
addons/website_hr_recruitment/controllers/main.py
addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js [deleted file]
addons/website_hr_recruitment/static/src/xml/website_hr_recruitment.xml [deleted file]
addons/website_hr_recruitment/views/templates.xml
addons/website_report/views/layouts.xml
addons/website_sale/static/src/js/website.tour.shop.js
addons/website_sale/static/src/js/website_sale.editor.js
addons/website_sale/static/src/xml/website_sale.xml [deleted file]
addons/website_sale/views/templates.xml
openerp/addons/base/ir/ir_ui_menu.py