From ab1b4cab313439f536cfab2d7cedf3c43ad186e8 Mon Sep 17 00:00:00 2001 From: dka-odoo Date: Wed, 22 Apr 2015 14:56:22 +0200 Subject: [PATCH] [IMP] web_planner : planner as data module Planner is like web Tips : a data in a module. - Rename planner.planner to web.planner - Rename files according to guidelines - Remove planner_crm module - Make CRM depends on web_planner, and add its planner as crm data - Remove duplicate less style - Add 'active' boolean field on planner (to disabled them), and create planner backend views --- addons/crm/__init__.py | 1 + addons/crm/__openerp__.py | 1 + .../static/src/js/web_planner_crm.js} | 2 +- .../crm/static/src/less/web_planner_crm.less | 91 ++++++ addons/crm/views/crm.xml | 6 + .../planner_crm.py => crm/web_planner.py} | 5 +- .../web_planner_data.xml} | 106 +++--- addons/planner/security/ir.model.access.csv | 4 - addons/planner_crm/__init__.py | 22 -- addons/planner_crm/__openerp__.py | 16 - addons/planner_crm/models/__init__.py | 3 - .../planner_crm/static/description/icon.png | Bin 3886 -> 0 bytes .../planner_crm/static/src/img/linkedin.png | Bin 1359 -> 0 bytes .../static/src/less/planner_crm.less | 301 ------------------ addons/planner_crm/views/planner_crm.xml | 10 - addons/{planner => web_planner}/__init__.py | 0 .../{planner => web_planner}/__openerp__.py | 8 +- .../models/__init__.py | 2 +- .../models/web_planner.py} | 9 +- .../web_planner/security/ir.model.access.csv | 4 + .../security/web_planner_security.xml} | 4 +- .../static/description/icon.png | Bin .../src/fonts/Simple-Line-Icons.dev.svg | 0 .../static/src/fonts/Simple-Line-Icons.eot | Bin .../static/src/fonts/Simple-Line-Icons.svg | 0 .../static/src/fonts/Simple-Line-Icons.ttf | Bin .../static/src/fonts/Simple-Line-Icons.woff | Bin .../static/src/img/fabien_pinckaers.jpg | Bin .../static/src/img/fabien_signature.png | Bin .../static/src/img/odoo_logo.png | Bin .../static/src/img/shadow.png | Bin .../static/src/js/web_planner.js} | 8 +- .../static/src/less/web_planner.less} | 213 ++++++++++--- .../static/src/xml/web_planner.xml} | 0 .../views/web_planner_templates.xml} | 4 +- .../web_planner/views/web_planner_views.xml | 46 +++ 36 files changed, 393 insertions(+), 473 deletions(-) rename addons/{planner_crm/static/src/js/planner_crm.js => crm/static/src/js/web_planner_crm.js} (98%) create mode 100644 addons/crm/static/src/less/web_planner_crm.less rename addons/{planner_crm/models/planner_crm.py => crm/web_planner.py} (73%) rename addons/{planner_crm/data/planner_data.xml => crm/web_planner_data.xml} (95%) delete mode 100644 addons/planner/security/ir.model.access.csv delete mode 100644 addons/planner_crm/__init__.py delete mode 100644 addons/planner_crm/__openerp__.py delete mode 100644 addons/planner_crm/models/__init__.py delete mode 100644 addons/planner_crm/static/description/icon.png delete mode 100644 addons/planner_crm/static/src/img/linkedin.png delete mode 100644 addons/planner_crm/static/src/less/planner_crm.less delete mode 100644 addons/planner_crm/views/planner_crm.xml rename addons/{planner => web_planner}/__init__.py (100%) rename addons/{planner => web_planner}/__openerp__.py (66%) rename addons/{planner => web_planner}/models/__init__.py (55%) rename addons/{planner/models/planner.py => web_planner/models/web_planner.py} (84%) create mode 100644 addons/web_planner/security/ir.model.access.csv rename addons/{planner/security/planner_security.xml => web_planner/security/web_planner_security.xml} (77%) rename addons/{planner => web_planner}/static/description/icon.png (100%) rename addons/{planner => web_planner}/static/src/fonts/Simple-Line-Icons.dev.svg (100%) rename addons/{planner => web_planner}/static/src/fonts/Simple-Line-Icons.eot (100%) rename addons/{planner => web_planner}/static/src/fonts/Simple-Line-Icons.svg (100%) rename addons/{planner => web_planner}/static/src/fonts/Simple-Line-Icons.ttf (100%) rename addons/{planner => web_planner}/static/src/fonts/Simple-Line-Icons.woff (100%) rename addons/{planner => web_planner}/static/src/img/fabien_pinckaers.jpg (100%) rename addons/{planner => web_planner}/static/src/img/fabien_signature.png (100%) rename addons/{planner => web_planner}/static/src/img/odoo_logo.png (100%) rename addons/{planner => web_planner}/static/src/img/shadow.png (100%) rename addons/{planner/static/src/js/planner.js => web_planner/static/src/js/web_planner.js} (96%) rename addons/{planner/static/src/less/planner.less => web_planner/static/src/less/web_planner.less} (70%) rename addons/{planner/static/src/xml/planner.xml => web_planner/static/src/xml/web_planner.xml} (100%) rename addons/{planner/views/planner.xml => web_planner/views/web_planner_templates.xml} (53%) create mode 100644 addons/web_planner/views/web_planner_views.xml diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 23dc489f427..d4866d9a9ba 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -29,3 +29,4 @@ import wizard import res_partner import res_config import base_partner_merge +import web_planner diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index c6013764022..b737d316cf7 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -96,6 +96,7 @@ Dashboard for CRM will include: 'sales_team_view.xml', 'views/crm.xml', + 'web_planner_data.xml', ], 'demo': [ 'crm_demo.xml', diff --git a/addons/planner_crm/static/src/js/planner_crm.js b/addons/crm/static/src/js/web_planner_crm.js similarity index 98% rename from addons/planner_crm/static/src/js/planner_crm.js rename to addons/crm/static/src/js/web_planner_crm.js index e03f726ce3c..0af294e89fa 100644 --- a/addons/planner_crm/static/src/js/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('planner.planner'); +var planner = require('web.planner'); 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 new file mode 100644 index 00000000000..746ff4db5fd --- /dev/null +++ b/addons/crm/static/src/less/web_planner_crm.less @@ -0,0 +1,91 @@ + +#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 { + padding: 5px; + &:first-child { + padding-left: 0; + } + &:last-child { + padding-right: 0; + } + } + } + } + #planner_page11 { + .container-fluid { + .col-xs-12 .panel-heading { + min-height: 200px; + padding: 0; + font-size: 1.1em; + color: #407241; + a { + display: block; + padding: 20px; + height: 100%; + width: 100%; + position: absolute; + padding-top: 40px; + padding-left: 10px; + } + } + } + } +} + +// XS size +@media screen and (max-width: 768px) { + #PlannerModal .pages { + margin-top: 0px; + } + #PlannerModal .counter { + padding: 6px 0 0 5px; + } +} + +// SM size +@media screen and (min-width: 769px) { + #PlannerModal .paragraphs { + div.col-md-10 { + margin-top:1em; + } + .icon { + text-align: center; + font-size: 2em; + margin: 1em auto .5em; + } + span { + transform: translateX(-8px); + position: relative; + display: block; + } + } +} + +// MD size +@media screen and (min-width: 992px) { + #PlannerModal .paragraphs .icon { + text-align: center; + font-size: 4em; + margin: 0.3em auto .5em; + span{ + transform: translateX(0px); + position: relative; + display: block; + } + } +} diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm.xml index bdff3333846..ab9f7b301bf 100644 --- a/addons/crm/views/crm.xml +++ b/addons/crm/views/crm.xml @@ -6,5 +6,11 @@ + diff --git a/addons/planner_crm/models/planner_crm.py b/addons/crm/web_planner.py similarity index 73% rename from addons/planner_crm/models/planner_crm.py rename to addons/crm/web_planner.py index c6aa575a292..a01c7c7c5bc 100644 --- a/addons/planner_crm/models/planner_crm.py +++ b/addons/crm/web_planner.py @@ -4,7 +4,7 @@ from openerp import api, models class PlannerCrm(models.Model): - _inherit = 'planner.planner' + _inherit = 'web.planner' @api.model def _get_planner_application(self): @@ -15,11 +15,8 @@ class PlannerCrm(models.Model): @api.model def _prepare_planner_crm_data(self): sales_team = self.env.ref('sales_team.team_sales_department') - company_data = self.env['res.users'].browse(self._uid).company_id values = { - 'prepare_backend_url': self.prepare_backend_url, 'alias_domain': sales_team.alias_domain, 'alias_name': sales_team.alias_name, - 'company_data': company_data, } return values diff --git a/addons/planner_crm/data/planner_data.xml b/addons/crm/web_planner_data.xml similarity index 95% rename from addons/planner_crm/data/planner_data.xml rename to addons/crm/web_planner_data.xml index d96e7f4c49b..186a066c667 100644 --- a/addons/planner_crm/data/planner_data.xml +++ b/addons/crm/web_planner_data.xml @@ -95,7 +95,7 @@ Welcome -

Goals

+

Goals

  • Your Expectations @@ -106,7 +106,7 @@ Your KPIs
    • -

    Sale Flow

    +

    Sale Flow

  • Your Pipeline @@ -127,13 +127,13 @@ Import Products
    • -

    Lead acquisition

    +

    Lead acquisition

  • Incoming Emails
    • -

    Deployment

    +

    Deployment

  • Reporting @@ -144,7 +144,7 @@ Your Users
    • -

    Grow Revenues

    +

    Grow Revenues

  • Weekly Meeting @@ -166,38 +166,38 @@
    -
    -

    Welcome.

    -

    - Congratulations on taking the leap to boost your sales - activities! -

    - Odoo CRM will help you handle your sales funnel, bringing - your sales vision to life in a simple and seamless way. -

    - Configuring Odoo CRM is easy. But you'll have bigger - challenges like; structuring your sales process, building - sales tools and training your teams. That's why we developed - this tool. We want you to succeed boosting your sales - performance. -

    - If you get stuck, get in touch with our CRM experts, using - the "Help" button on the top menu. Every Odoo Enterprise - customer benefit from an unlimited support, don't hesitate - to abuse it. We are here to help you. -

    -

    - We wish you a fun time, -

    - -
    - -
    - For the Odoo Team,
    - Fabien Pinckaers, Founder -
    +
    +

    Welcome.

    +

    + Congratulations on taking the leap to boost your sales + activities! +

    + Odoo CRM will help you handle your sales funnel, bringing + your sales vision to life in a simple and seamless way. +

    + Configuring Odoo CRM is easy. But you'll have bigger + challenges like; structuring your sales process, building + sales tools and training your teams. That's why we developed + this tool. We want you to succeed boosting your sales + performance. +

    + If you get stuck, get in touch with our CRM experts, using + the "Help" button on the top menu. Every Odoo Enterprise + customer benefit from an unlimited support, don't hesitate + to abuse it. We are here to help you. +

    +

    + We wish you a fun time, +

    + +
    + +
    + For the Odoo Team,
    + Fabien Pinckaers, Founder +
    +
    -

    Your expectations

    @@ -207,14 +207,11 @@ of a successful implementation.

    -
    • -
      Sales objectives by priority:
      -       @@ -255,7 +252,7 @@

      -
      +
      • @@ -296,7 +293,7 @@ performance.

        -
        +
        • @@ -376,7 +373,6 @@ -
          @@ -919,7 +915,7 @@
          -
          +

          You don't need to review lost opportunities at every sales meeting, but it's good practice to do it at least once a month. Ask your team to set tags on opportunities to @@ -957,9 +953,6 @@ class="btn odoo_purple btn_install"> Install Live Chat

          - -
          -

          Survey

          @@ -968,9 +961,7 @@ class="btn odoo_purple btn_install"> Install Surveys
          - -

          Website Builder

          @@ -979,9 +970,6 @@ class="btn odoo_purple btn_install"> Install Website Builder
          - -
          -

          Events

          @@ -990,7 +978,7 @@ class="btn odoo_purple btn_install"> Install Events
          -
          +

          e-Commerce

          Boost your online sales with sleek product pages.

          @@ -998,6 +986,7 @@ class="btn odoo_purple btn_install"> Install e-Commerce
          +
          @@ -1005,12 +994,12 @@

          -

          Congratulations, you're done !

          -

          We hope this process helped you improve your sales strategy.

          -

          Don't hesitate to send us an email to describe
          your experience or to suggest improvements !

          +

          Congratulations, you're done !

          +

          We hope this process helped you improve your sales strategy.

          +

          Don't hesitate to send us an email to describe
          your experience or to suggest improvements !

          -

          Happy Selling!
          - The Odoo Team

          - +

          Happy Selling!
          - The Odoo Team

          +

          @@ -1018,11 +1007,10 @@ - + Sales strategy planner - 5 planner_crm ). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import models diff --git a/addons/planner_crm/__openerp__.py b/addons/planner_crm/__openerp__.py deleted file mode 100644 index b2da88c2702..00000000000 --- a/addons/planner_crm/__openerp__.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -{ - 'name': 'CRM Planner', - 'summary': 'Help to configure application', - 'version': '1.0', - 'category': 'Planner', - 'description': """Plan your sales strategy: objectives, leads, KPIs, and much more!""", - 'author': 'Odoo SA', - 'depends': ['planner', 'crm'], - 'data': [ - 'data/planner_data.xml', - 'views/planner_crm.xml' - ], - 'installable': True, - 'auto_install': True, -} diff --git a/addons/planner_crm/models/__init__.py b/addons/planner_crm/models/__init__.py deleted file mode 100644 index 681bf7b19e5..00000000000 --- a/addons/planner_crm/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -import planner_crm diff --git a/addons/planner_crm/static/description/icon.png b/addons/planner_crm/static/description/icon.png deleted file mode 100644 index 7553379d45db15803aea0acc76ade5fffb373310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3886 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 diff --git a/addons/planner_crm/static/src/img/linkedin.png b/addons/planner_crm/static/src/img/linkedin.png deleted file mode 100644 index a4f7f8c67c781b4ea18485f22e1a2afe1bb72c74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1359 zcmV-V1+e;wP)L=yykYo1mV z`p~~LLdiUO*egLAwe)$H7p1`B5KTK3MZl8E62UkEmQ=OSz>>;1q;^6j zsj^f3n7VSoL+S08KSIx*ev6t#K#72oR6VB~@!5M{qW0MqEIydV(Jv0+yWaWIAf5RE z6{m~%cBltkb*e|N;na~ok%}Crh%H=3*ReSu(}A(KUho&7zu&{anS*$(v>lf=I&ppp zrxo{IjvUG{r<9tORPP_$fz`GD=wo01cnzby*At>chTX;3;5Z6(_4pJ`SnJ!acy@iH zI){2piv)TM;FXqNLfB02+w^=1(g=}CEP1KMYV6up<4yC&%_ZEqv4RH<$@Zsvak%wk z^%6Xxq0Jc4s>XUqbr0>CBF>}DSF6VXW=Z)aI1Mty^uA5cmmrN0sYuBiKJ+V~0kCpm!EdP^ypX9rU7sZpT1tI5+t_6W)3j%YpF(g^G z4{}+%b1QVkPT69_5G;~ZueWZ|^6|IHzcr+ilqYmR?jeH#Lk}ni=Dk!gX=~ykkTvqG z%mzpmBoAFHzm<{&0`bYgbd47sBDji2#tn$-7g$=CpSx!FA}6q$(+oWr#K)TFd@mTt zA&5y((WIE@^CC&ay=K&NaBYO_Rq328reQ}UsrI+MiR#K4EUzx%{;Few*=JK_+WY;d zi$AMLr6Cc$SpgLg4rxIVlO-cW9!DMeq#GHjTC6D`pl5**hhT;5CX)OXYg?KUtBFLqi}th##*-Yp#R;W7|!xr8WEHEorJk?b24qS3Y{KM`ztDPy|BdP%_4#=wUL>VQj5H=?!t$6? zvIe;S6mm<2@QPAwF-KLoV@eews-Wm~QDrh&H?8gd-Z`+%+x_$RV|Wo6_Ko@(uex<~!UYxl4&C3Zs8n%fOy{Y}Kq~o-`m42_80a_= zQ}X!Fs#gQf7}4+vokwRTjpp1fzxz|g#2v)kAlLX;3Gc4N?oa4)JY|)-zStMGN%JG! zD0@dY>vn&B_awZ(lVgw6{RPW$XJ#MT^Ou+(^kcMJj4W%sY=*l(@8z*6rP8p+hLs3} z%b!176?^hwwf|5q+ZkF?l?~dbcVbJbr}yk_=Ef1Q< li { - list-style: none; - border-bottom: 1px dashed #C1D6DA; - height: auto; - padding: 10px 10px 5px 55px; - text-transform: capitalize; - margin: 0; - span { - position: absolute; - left: 9px; - color: rgb(199, 180, 146); - font-size: 20px; - font-weight: bold; - } - } - > li:last-child { border-bottom: 0;} - - li.header { - h5{padding-left: 0px} - div.dropdown { display: inline;float:right; } - span {position: relative; left: 0;} - a { - color: #C4A87A; - position: absolute; - top: 13px; - right: 13px; - &:hover { - text-decoration: none; - color: #9C855D; - } - } - select { - margin-top: 10px; - margin-bottom: 10px; - width: 100%; - max-width: 80%; - font-family: sans-serif; - font-size: 17px; - color: #8A6D3B; - border: none; - background: #F5E7CF; - } - - .help{ - font-size: 14px; - color: rgb(126, 95, 41); - background: #fcf8e3; - background: -moz-linear-gradient(top, #fcf8e3 0%, #FFF8D7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fcf8e3), color-stop(100%,#FFF8D7)); - background: -webkit-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); - background: -o-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); - background: -ms-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); - background: linear-gradient(to bottom, #fcf8e3 0%,#FFF8D7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcf8e3', endColorstr='#FFF8D7',GradientType=0 ); - padding: 0 1em; - margin: 0; - border: none; - z-index: 10; - position: relative; - box-shadow: inset 0 10px 10px -9px #A89E64; - margin: 0px -10px 0px -55px; - - h5 {padding: 14px 0 0; text-indent:0; display: inline-block;} - ul { padding: 0 20px 20px 50px;} - li {text-indent: 0; font-style: italic;} - } - } - > li:not(.header):hover { - background-color: #F5EFD0; - -webkit-transition: all 0.2s; - -moz-transition: all 0.2s; - -ms-transition: all 0.2s; - -o-transition: all 0.2s; - } - .lines { - border-left: 1px solid #ffaa9f; - border-right: 1px solid #ffaa9f; - background: transparent; - position: absolute; - width: 3px; - height: 100%; - top: 0; - left: 42px; - border-bottom: 0; - border-top: 0; - } - } - - .notebook.columns { - li.header{ - padding: 10px 10px 5px 55px; - h5{padding: 0} - } - textarea,input { - vertical-align: top; - margin-bottom: 1em; - } - } - - .notebook-container:after { - content: ""; - display: block; - width: 94%; - left: 20px; - background: transparent; - height: 100%; - position: absolute; - bottom: -5px; - z-index: 0; - background-color: #fcf8e3; - border: 1px solid #faebcc; - } - - .info_icon{ - position: relative; - padding-left: 5em; - overflow: hidden; - min-height: 6em; - span.fa{ - position: absolute; - font-size: 5em; - top: 0.2em; - left: 0.2em; - opacity: 0.6; - color: white; - } - } - - .alert-info.info_icon span.fa { color: #8ABCD4; } - - .arrow-down { - width: 0; - height: 0; - border-left: 30px solid transparent; - border-right: 30px solid transparent; - border-top: 15px solid #D6D6D6; - position: absolute; - margin-left: -30px; - bottom: -15px; - } - - #planner_page1 { - h1 {margin-bottom: 20px;} - mb32 { - margin-bottom: 32px; - } - mb8 { - margin-bottom: 8px; - } - } - #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 { - padding: 5px; - &:first-child { - padding-left: 0; - } - &:last-child { - padding-right: 0; - } - } - } - } - #planner_page11 { - .container-fluid { - .col-xs-12 .panel-heading { - min-height: 200px; - padding: 0; - font-size: 1.1em; - color: #407241; - a { - display: block; - padding: 20px; - height: 100%; - width: 100%; - position: absolute; - padding-top: 40px; - padding-left: 10px; - } - } - } - } - #planner_page16 { - .trophy{ - font-size: 11em; - color: #A24689; - margin-top: .5em; - -webkit-animation-name: bounceIn; - animation-name: bounceIn; - -webkit-animation-duration: 1.75s; - animation-duration: 1.75s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; - } - } -} - -// XS size -@media screen and (max-width: 768px) { - #PlannerModal .pages { - margin-top: 0px; - } - #PlannerModal .counter { - padding: 6px 0 0 5px; - } -} - -// SM size -@media screen and (min-width: 769px) { - #PlannerModal .paragraphs { - div.col-md-10 { - margin-top:1em; - } - .icon { - text-align: center; - font-size: 2em; - margin: 1em auto .5em; - } - span { - transform: translateX(-8px); - position: relative; - display: block; - } - } -} - -// MD size -@media screen and (min-width: 992px) { - #PlannerModal .paragraphs .icon { - text-align: center; - font-size: 4em; - margin: 0.3em auto .5em; - span{ - transform: translateX(0px); - position: relative; - display: block; - } - } -} diff --git a/addons/planner_crm/views/planner_crm.xml b/addons/planner_crm/views/planner_crm.xml deleted file mode 100644 index 56c6beb89ac..00000000000 --- a/addons/planner_crm/views/planner_crm.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/addons/planner/__init__.py b/addons/web_planner/__init__.py similarity index 100% rename from addons/planner/__init__.py rename to addons/web_planner/__init__.py diff --git a/addons/planner/__openerp__.py b/addons/web_planner/__openerp__.py similarity index 66% rename from addons/planner/__openerp__.py rename to addons/web_planner/__openerp__.py index 2237c199ddf..76b3c08ef50 100644 --- a/addons/planner/__openerp__.py +++ b/addons/web_planner/__openerp__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - { 'name': 'Planner', 'category': 'Planner', @@ -10,10 +9,11 @@ 'depends': ['web'], 'data': [ 'security/ir.model.access.csv', - 'views/planner.xml', - 'security/planner_security.xml', + 'security/web_planner_security.xml', + 'views/web_planner_templates.xml', + 'views/web_planner_views.xml', ], - 'qweb': ['static/src/xml/planner.xml'], + 'qweb': ['static/src/xml/web_planner.xml'], 'installable': True, 'auto_install': True, } diff --git a/addons/planner/models/__init__.py b/addons/web_planner/models/__init__.py similarity index 55% rename from addons/planner/models/__init__.py rename to addons/web_planner/models/__init__.py index 6c6667d2bcf..c00c0203d52 100644 --- a/addons/planner/models/__init__.py +++ b/addons/web_planner/models/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -import planner +import web_planner diff --git a/addons/planner/models/planner.py b/addons/web_planner/models/web_planner.py similarity index 84% rename from addons/planner/models/planner.py rename to addons/web_planner/models/web_planner.py index e81704550ef..8bab43b4382 100644 --- a/addons/planner/models/planner.py +++ b/addons/web_planner/models/web_planner.py @@ -13,7 +13,7 @@ class Planner(models.Model): generate the values used to display in specific planner pages """ - _name = 'planner.planner' + _name = 'web.planner' _description = 'Planner' @api.model @@ -24,10 +24,11 @@ class Planner(models.Model): menu_id = fields.Many2one('ir.ui.menu', string='Menu', required=True) view_id = fields.Many2one('ir.ui.view', string='Template', required=True) progress = fields.Integer(string="Progress Percentage", default=5) - # used to store the data filled by user in planner(JSON Data) + # data field is used to store the data filled by user in planner(JSON Data) data = fields.Text(string='Data') tooltip_planner = fields.Html(string='Planner Tooltips', translate=True) planner_application = fields.Selection('_get_planner_application', string='Planner Application', required=True) + active = fields.Boolean(string="Active", default=True, help="If the active field is set to False, it will allow you to hide the planner. This change requires a refreshing a your page.") @api.model def render(self, template_id, planner_app): @@ -42,7 +43,9 @@ class Planner(models.Model): @api.model def prepare_backend_url(self, action_xml_id, view_type='list', module_name=None): - """ prepare the backend url to the given action, or to the given module view. """ + """ prepare the backend url to the given action, or to the given module view. + :returns dict : the value used to render the planer template + """ action = self.env.ref(action_xml_id, False) url = "/web#view_type=%s&action=%s" % (view_type, action and action.id or '') if module_name: diff --git a/addons/web_planner/security/ir.model.access.csv b/addons/web_planner/security/ir.model.access.csv new file mode 100644 index 00000000000..a1d2254458e --- /dev/null +++ b/addons/web_planner/security/ir.model.access.csv @@ -0,0 +1,4 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_planner_emp,planner.planner.emp,model_web_planner,base.group_user,1,1,0,0 +access_planner_manager,planner.planner.manager,model_web_planner,base.group_erp_manager,1,1,1,1 +access_planner_portal,planner.planner.portal,model_web_planner,base.group_portal,1,0,0,0 \ No newline at end of file diff --git a/addons/planner/security/planner_security.xml b/addons/web_planner/security/web_planner_security.xml similarity index 77% rename from addons/planner/security/planner_security.xml rename to addons/web_planner/security/web_planner_security.xml index 7fb8a355b6e..e4bea53fde6 100644 --- a/addons/planner/security/planner_security.xml +++ b/addons/web_planner/security/web_planner_security.xml @@ -1,9 +1,9 @@ - + Portal Planner - + [('planner_application', '=', 'portal')] diff --git a/addons/planner/static/description/icon.png b/addons/web_planner/static/description/icon.png similarity index 100% rename from addons/planner/static/description/icon.png rename to addons/web_planner/static/description/icon.png diff --git a/addons/planner/static/src/fonts/Simple-Line-Icons.dev.svg b/addons/web_planner/static/src/fonts/Simple-Line-Icons.dev.svg similarity index 100% rename from addons/planner/static/src/fonts/Simple-Line-Icons.dev.svg rename to addons/web_planner/static/src/fonts/Simple-Line-Icons.dev.svg diff --git a/addons/planner/static/src/fonts/Simple-Line-Icons.eot b/addons/web_planner/static/src/fonts/Simple-Line-Icons.eot similarity index 100% rename from addons/planner/static/src/fonts/Simple-Line-Icons.eot rename to addons/web_planner/static/src/fonts/Simple-Line-Icons.eot diff --git a/addons/planner/static/src/fonts/Simple-Line-Icons.svg b/addons/web_planner/static/src/fonts/Simple-Line-Icons.svg similarity index 100% rename from addons/planner/static/src/fonts/Simple-Line-Icons.svg rename to addons/web_planner/static/src/fonts/Simple-Line-Icons.svg diff --git a/addons/planner/static/src/fonts/Simple-Line-Icons.ttf b/addons/web_planner/static/src/fonts/Simple-Line-Icons.ttf similarity index 100% rename from addons/planner/static/src/fonts/Simple-Line-Icons.ttf rename to addons/web_planner/static/src/fonts/Simple-Line-Icons.ttf diff --git a/addons/planner/static/src/fonts/Simple-Line-Icons.woff b/addons/web_planner/static/src/fonts/Simple-Line-Icons.woff similarity index 100% rename from addons/planner/static/src/fonts/Simple-Line-Icons.woff rename to addons/web_planner/static/src/fonts/Simple-Line-Icons.woff diff --git a/addons/planner/static/src/img/fabien_pinckaers.jpg b/addons/web_planner/static/src/img/fabien_pinckaers.jpg similarity index 100% rename from addons/planner/static/src/img/fabien_pinckaers.jpg rename to addons/web_planner/static/src/img/fabien_pinckaers.jpg diff --git a/addons/planner/static/src/img/fabien_signature.png b/addons/web_planner/static/src/img/fabien_signature.png similarity index 100% rename from addons/planner/static/src/img/fabien_signature.png rename to addons/web_planner/static/src/img/fabien_signature.png diff --git a/addons/planner/static/src/img/odoo_logo.png b/addons/web_planner/static/src/img/odoo_logo.png similarity index 100% rename from addons/planner/static/src/img/odoo_logo.png rename to addons/web_planner/static/src/img/odoo_logo.png diff --git a/addons/planner/static/src/img/shadow.png b/addons/web_planner/static/src/img/shadow.png similarity index 100% rename from addons/planner/static/src/img/shadow.png rename to addons/web_planner/static/src/img/shadow.png diff --git a/addons/planner/static/src/js/planner.js b/addons/web_planner/static/src/js/web_planner.js similarity index 96% rename from addons/planner/static/src/js/planner.js rename to addons/web_planner/static/src/js/web_planner.js index 8d6b30ba85a..505d42f7680 100644 --- a/addons/planner/static/src/js/planner.js +++ b/addons/web_planner/static/src/js/web_planner.js @@ -1,4 +1,4 @@ -odoo.define('planner.planner', function (require) { +odoo.define('web.planner', function (require) { "use strict"; var core = require('web.core'); @@ -39,7 +39,7 @@ var PlannerLauncher = Widget.extend({ if (!_.isEmpty(this.planner_by_menu)) { def.resolve(self.planner_by_menu); }else{ - (new Model('planner.planner')).query().all().then(function(res) { + (new Model('web.planner')).query().all().then(function(res) { _.each(res, function(planner){ self.planner_by_menu[planner.menu_id[0]] = planner; self.planner_by_menu[planner.menu_id[0]].data = $.parseJSON(self.planner_by_menu[planner.menu_id[0]].data) || {}; @@ -135,7 +135,7 @@ var PlannerDialog = Widget.extend({ // ui _setup_view: function(){ var self = this; - return (new Model('planner.planner')).call('render', [self.planner.view_id[0], self.planner.planner_application]).then(function(res) { + return (new Model('web.planner')).call('render', [self.planner.view_id[0], self.planner.planner_application]).then(function(res) { self.$('.content_page').html(res); // add footer to each page self.add_pages_footer(); @@ -268,7 +268,7 @@ var PlannerDialog = Widget.extend({ this._save_planner_data(); }, _save_planner_data: function() { - return (new Model('planner.planner')).call('write', [this.planner.id, {'data': JSON.stringify(this.planner.data), 'progress': this.planner.progress}]); + return (new Model('web.planner')).call('write', [this.planner.id, {'data': JSON.stringify(this.planner.data), 'progress': this.planner.progress}]); }, // user actions mark_as_done: function(ev) { diff --git a/addons/planner/static/src/less/planner.less b/addons/web_planner/static/src/less/web_planner.less similarity index 70% rename from addons/planner/static/src/less/planner.less rename to addons/web_planner/static/src/less/web_planner.less index 19b9125f7bc..b1e257cf67d 100644 --- a/addons/planner/static/src/less/planner.less +++ b/addons/web_planner/static/src/less/web_planner.less @@ -2,11 +2,11 @@ @font-face { font-family: 'Simple-Line-Icons'; - src:url('/planner/static/src/fonts/Simple-Line-Icons.eot'); - src:url('/planner/static/src/fonts/Simple-Line-Icons.eot?#iefix') format('embedded-opentype'), - url('/planner/static/src/fonts/Simple-Line-Icons.woff') format('woff'), - url('/planner/static/src/fonts/Simple-Line-Icons.ttf') format('truetype'), - url('/planner/static/src/fonts/Simple-Line-Icons.svg#Simple-Line-Icons') format('svg'); + src:url('/web_planner/static/src/fonts/Simple-Line-Icons.eot'); + src:url('/web_planner/static/src/fonts/Simple-Line-Icons.eot?#iefix') format('embedded-opentype'), + url('/web_planner/static/src/fonts/Simple-Line-Icons.woff') format('woff'), + url('/web_planner/static/src/fonts/Simple-Line-Icons.ttf') format('truetype'), + url('/web_planner/static/src/fonts/Simple-Line-Icons.svg#Simple-Line-Icons') format('svg'); font-weight: normal; font-style: normal; } @@ -173,7 +173,6 @@ } } - #oe_main_menu_navbar.navbar { .oe_planner_systray { width: 100px; @@ -192,10 +191,11 @@ #PlannerModal { + font-family: "Lato", serif; + .planner-page{ display : none; } - .planner-dialog { width: 85%; font-family: "Lato", serif; @@ -206,8 +206,6 @@ //button close button.close { - width: 13px; - height: 30px; opacity: 1; line-height: 30px; font-size: 16px; @@ -241,11 +239,8 @@ } .odoo_purple, a.btn.odoo_purple { background-color: #A24689; - border:none; - text-shadow:none; color: white; } - .odoo_purple.btn:hover{ background: #a24689; color: #fff; @@ -262,7 +257,7 @@ right: 0; bottom: 0; .shadow { - background: url("/planner/static/src/img/shadow.png") center center repeat-x; + background: url("/web_planner/static/src/img/shadow.png") center center repeat-x; height: 12px; width: 100%; display: block; @@ -276,8 +271,6 @@ min-height: 60px; } button.fa-check-square-o { - background-color: transparent; - line-height: 0.8em; font-size: 2em; border: none; @@ -316,8 +309,6 @@ } .btn-next i { transform: translateY(1px); - position: relative; - display: inline-block; font-size: 1.3em; margin-left: 10px; } @@ -352,9 +343,6 @@ font-size: 20em; font-family: "FontAwesome"; content: "\f00c"; - width: 100%; - height: 100%; - z-index: 999; color: #21b799; vertical-align: middle; padding: 0.3em 0.7em; @@ -387,7 +375,6 @@ border-right: 1px solid #E5E5E5; background: #f7f7f7; padding: 10px 12px 0 12px; - i.fa{ font-size: 1.7em; padding-left: 0; @@ -395,22 +382,19 @@ margin-top: 0.1em; color: #929292; } - .counter { padding: 6px 0 0 8px; font-weight: bold; color: #727272; font-size: 13px; } - .progress { background-color: #C4C4C4; height: 30px; padding: 3px; - border-radius: 4px; } .progress-bar { - background: #A24689; + background: #A24689; background: -moz-linear-gradient(top, #cc59ab 0%, #a24689 8%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cc59ab), color-stop(8%,#a24689)); background: -webkit-linear-gradient(top, #cc59ab 0%,#a24689 8%); @@ -419,9 +403,6 @@ background: linear-gradient(to bottom, #cc59ab 0%,#a24689 8%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc59ab', endColorstr='#a24689',GradientType=0 ); border-radius: 4px; - font-weight: bold; - text-shadow: 0 1px 0 #4E2443; - line-height: 25px; height: 95%; box-shadow: 0 1px 0 #7A3067; } @@ -430,25 +411,19 @@ .dropdown.mobile { padding: 10px 12px 0 0px; .dropdown-menu{ - width: 100%; height: 250px; overflow: auto; } .btn { - height: 30px; - line-height: 15px; text-align: justify; } - .dropdown-menu a { color: #333; padding: 3px; } - .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { background-color: #F3F3F3; } - .dropdown-menu h4 { padding: 10px 15px 0; border-top: 1px solid #EAEAEA; @@ -480,7 +455,6 @@ margin: auto -10px; color: #444; font-size: 13px; - border-radius: 0; } .nav-stacked li a:hover, .nav-stacked li a:focus { text-decoration: none; @@ -497,6 +471,131 @@ margin-right: 5px; } } + //NOTEBOOK + .notebook-container { + margin: 20px 0; + } + .notebook { + color: #555; + font-size: 22px; + padding: 0 !important; + font-family: courier, monospace; + border: 1px solid #faebcc; + color: #8a6d3b; + position: relative; + background-color: #fcf8e3; + + textarea,input { + background: #fcf8e3; + border: none; + font-size: 15px; + line-height: 17px; + } + > li { + list-style: none; + border-bottom: 1px dashed #C1D6DA; + padding: 10px 10px 5px 55px; + text-transform: capitalize; + margin: 0; + span { + position: absolute; + left: 9px; + color: rgb(199, 180, 146); + font-size: 20px; + font-weight: bold; + } + } + > li:last-child { border-bottom: 0;} + + li.header { + h5{padding-left: 0px} + div.dropdown { display: inline;float:right; } + span {position: relative; left: 0;} + a { + color: #C4A87A; + position: absolute; + top: 13px; + right: 13px; + &:hover { + text-decoration: none; + color: #9C855D; + } + } + select { + margin-bottom: 10px; + font-family: sans-serif; + font-size: 17px; + color: #8A6D3B; + border: none; + background: #F5E7CF; + } + .help{ + font-size: 14px; + color: rgb(126, 95, 41); + background: #fcf8e3; + background: -moz-linear-gradient(top, #fcf8e3 0%, #FFF8D7 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fcf8e3), color-stop(100%,#FFF8D7)); + background: -webkit-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); + background: -o-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); + background: -ms-linear-gradient(top, #fcf8e3 0%,#FFF8D7 100%); + background: linear-gradient(to bottom, #fcf8e3 0%,#FFF8D7 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcf8e3', endColorstr='#FFF8D7',GradientType=0 ); + padding: 0 1em; + position: relative; + box-shadow: inset 0 10px 10px -9px #A89E64; + margin: 0px -10px 0px -55px; + + h5 {padding: 14px 0 0; display: inline-block;} + ul { padding: 0 20px 20px 50px;} + li {font-style: italic;} + } + } + > li:not(.header):hover { + background-color: #F5EFD0; + -webkit-transition: all 0.2s; + -moz-transition: all 0.2s; + -ms-transition: all 0.2s; + -o-transition: all 0.2s; + } + .lines { + border-left: 1px solid #ffaa9f; + border-right: 1px solid #ffaa9f; + background: transparent; + position: absolute; + width: 3px; + height: 100%; + top: 0; + left: 42px; + border-bottom: 0; + border-top: 0; + } + } + .notebook.columns { + textarea,input {margin-bottom: 1em;} + } + .trophy { + font-size: 11em; + color: #A24689; + margin-top: .5em; + -webkit-animation-name: bounceIn; + animation-name: bounceIn; + -webkit-animation-duration: 1.75s; + animation-duration: 1.75s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; + } + .alert-info.info_icon span.fa { color: #8ABCD4; } + .info_icon { + position: relative; + padding-left: 5em; + min-height: 6em; + span.fa { + position: absolute; + font-size: 5em; + left: 0.2em; + opacity: 0.6; + } + } } .pages { color: #444; @@ -510,7 +609,6 @@ > h1, > h2, > h3, > h4, > h5, > h6, > p, > strong, > i { text-shadow:none; } - h1 { margin-top: 0; font-size: 3.5em; @@ -535,7 +633,6 @@ background: #21b799; border-color: #26A38A; text-shadow: 0 1px 0 #2E917D; - font-weight: normal; line-height: 19px; color: white; } @@ -544,4 +641,46 @@ color: white; } } + // PARAGRAPHS + .paragraphs .icon { + text-align: center; + font-size: 2em; + margin: 1em auto .5em; + color: #21b799; + } +} + +// XS size +@media screen and (max-width: 768px) { + #PlannerModal .pages { + margin-top: 0px; + } + #PlannerModal .counter { + padding: 6px 0 0 5px; + } +} +// SM size +@media screen and (min-width: 769px) { + #PlannerModal .paragraphs { + div.col-md-10 { + margin-top:1em; + } + span { + transform: translateX(-8px); + position: relative; + display: block; + } + } +} +// MD size +@media screen and (min-width: 992px) { + #PlannerModal .paragraphs .icon { + font-size: 4em; + margin: 0.3em auto .5em; + span{ + transform: translateX(0px); + position: relative; + display: block; + } + } } diff --git a/addons/planner/static/src/xml/planner.xml b/addons/web_planner/static/src/xml/web_planner.xml similarity index 100% rename from addons/planner/static/src/xml/planner.xml rename to addons/web_planner/static/src/xml/web_planner.xml diff --git a/addons/planner/views/planner.xml b/addons/web_planner/views/web_planner_templates.xml similarity index 53% rename from addons/planner/views/planner.xml rename to addons/web_planner/views/web_planner_templates.xml index a4e111aa0c0..cceaff72bbc 100644 --- a/addons/planner/views/planner.xml +++ b/addons/web_planner/views/web_planner_templates.xml @@ -3,8 +3,8 @@ diff --git a/addons/web_planner/views/web_planner_views.xml b/addons/web_planner/views/web_planner_views.xml new file mode 100644 index 00000000000..c1f3f796dae --- /dev/null +++ b/addons/web_planner/views/web_planner_views.xml @@ -0,0 +1,46 @@ + + + + + web.planner.view.tree + web.planner + + + + + + + + + + + + + web.planner.view.search + web.planner + + + + + + + + + + Planners + web.planner + form + tree + + {'search_default_active': True} + + + + + + \ No newline at end of file