From 50a043d979b126c0ac87b2f3111f2c8293cd5c04 Mon Sep 17 00:00:00 2001 From: Darshan Kalola Date: Fri, 15 May 2015 10:18:04 +0200 Subject: [PATCH] [IMP] website, website_sale, crm, web_planner : add planner for website modules This commit impact crm, website, website_sale and web_planner modules because it - add planner for website and website_sale - improve planner notebook by setting texterea and input size to 100% and using col-md-* class - split js code into common part (used in backend and frontend) and backend part (only for backend) - adapt some tour, since every page will have the planner modal in its DOM, the tour selectors msut be more accurate - introduce some style fixes and adaptations - ... --- addons/crm/static/src/js/web_planner_crm.js | 2 +- .../crm/static/src/less/web_planner_crm.less | 12 - addons/crm/web_planner_data.xml | 56 +- .../static/src/js/web_planner_backend.js | 97 ++ .../{web_planner.js => web_planner_common.js} | 126 +- ...b_planner.less => web_planner_common.less} | 6 + .../views/web_planner_templates.xml | 11 +- addons/website/__openerp__.py | 3 +- addons/website/data/web_planner_data.xml | 1190 +++++++++++++++++ addons/website/models/__init__.py | 1 + addons/website/models/web_planner.py | 14 + .../static/src/img/website_planner_clean.png | Bin 0 -> 591647 bytes .../static/src/img/website_planner_footer.png | Bin 0 -> 16057 bytes .../static/src/img/website_planner_menu.png | Bin 0 -> 8951 bytes .../static/src/js/web_planner_website.js | 65 + addons/website/views/website_templates.xml | 3 +- .../static/src/js/website.tour.event.js | 2 +- addons/website_sale/__openerp__.py | 1 + addons/website_sale/data/web_planner_data.xml | 441 ++++++ .../static/src/js/website_sale_tour_shop.js | 2 +- .../src/js/website_version.tour.versioning.js | 8 +- 21 files changed, 1896 insertions(+), 144 deletions(-) create mode 100644 addons/web_planner/static/src/js/web_planner_backend.js rename addons/web_planner/static/src/js/{web_planner.js => web_planner_common.js} (68%) rename addons/web_planner/static/src/less/{web_planner.less => web_planner_common.less} (99%) create mode 100644 addons/website/data/web_planner_data.xml create mode 100644 addons/website/models/web_planner.py create mode 100644 addons/website/static/src/img/website_planner_clean.png create mode 100644 addons/website/static/src/img/website_planner_footer.png create mode 100644 addons/website/static/src/img/website_planner_menu.png create mode 100644 addons/website/static/src/js/web_planner_website.js create mode 100644 addons/website_sale/data/web_planner_data.xml diff --git a/addons/crm/static/src/js/web_planner_crm.js b/addons/crm/static/src/js/web_planner_crm.js index 0af294e89fa..0330c8eb29b 100644 --- a/addons/crm/static/src/js/web_planner_crm.js +++ b/addons/crm/static/src/js/web_planner_crm.js @@ -1,7 +1,7 @@ odoo.define('planner_crm.planner', function (require) { "use strict"; -var planner = require('web.planner'); +var planner = require('web.planner.common'); planner.PlannerDialog.include({ prepare_planner_event: function() { diff --git a/addons/crm/static/src/less/web_planner_crm.less b/addons/crm/static/src/less/web_planner_crm.less index 440c67926c8..67dae6e2c44 100644 --- a/addons/crm/static/src/less/web_planner_crm.less +++ b/addons/crm/static/src/less/web_planner_crm.less @@ -1,17 +1,5 @@ #PlannerModal { - #planner_page2, #planner_page3 { - textarea{ - width: 100%; - max-width: 100%; - } - } - #planner_page4 { - textarea { - width: 58%; - max-width: 58%; - } - } #planner_page5, #planner_page7, #planner_page8, #planner_page10, #planner_page11 { .container-fluid { .col-xs-12 { diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml index edc05703a60..681c244476c 100644 --- a/addons/crm/web_planner_data.xml +++ b/addons/crm/web_planner_data.xml @@ -307,38 +307,66 @@
Stages from the initial contact to won deals:
  • #1 - -