From 79597a2b84c7ffab18f2c7b4d9015eac97e45707 Mon Sep 17 00:00:00 2001
From: Rohan Patel <rop@odoo.com>
Date: Fri, 3 Mar 2017 16:30:37 +0100
Subject: [PATCH] [REF] website: merge Website and Website Admin menu items

This commit merge the two website menu items in order to ease user flow
inside Odoo. When clicking on the Website item a server action is called
that decides to redirect the user either to the dashboard if the user is
an admin or a website publisher, either to the website for other people.
Overriding this method allows to define a specific behavior. Future commit
will also redirect sales people to the website dashboard.

Dashboard itself is customized to add a header used to display a website
button. It will be used in future commits to add other new stuff to the
dashboard.
---
 addons/website/__manifest__.py                |   4 +-
 addons/website/data/web_planner_data.xml      |   2 +-
 addons/website/data/website_data.xml          |   7 --
 addons/website/models/website.py              |   6 ++
 .../website/static/description/icon_admin.png | Bin 21652 -> 0 bytes
 .../static/src/js/website.backendDashboard.js |  18 +++++
 .../src/less/website.backendDashboard.less    |  68 ++++++++++++++++++
 .../static/src/xml/website.backend.xml        |  14 ++++
 addons/website/views/res_config_views.xml     |   6 +-
 addons/website/views/website_views.xml        |  16 +++--
 10 files changed, 124 insertions(+), 17 deletions(-)
 delete mode 100644 addons/website/static/description/icon_admin.png

diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index aaba5cea675..5e62bf95162 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -17,18 +17,16 @@ Odoo Website CMS
     'installable': True,
     'data': [
         'data/website_data.xml',
-        'data/web_planner_data.xml',
         'security/website_security.xml',
         'security/ir.model.access.csv',
-
         'views/website_templates.xml',
         'views/website_navbar_templates.xml',
         'views/snippets.xml',
         'views/website_views.xml',
         'views/res_config_views.xml',
         'views/ir_actions_views.xml',
-
         'wizard/base_language_install_views.xml',
+        'data/web_planner_data.xml',
     ],
     'demo': [
         'data/website_demo.xml',
diff --git a/addons/website/data/web_planner_data.xml b/addons/website/data/web_planner_data.xml
index 0485cd3aac4..0cb1687dda8 100644
--- a/addons/website/data/web_planner_data.xml
+++ b/addons/website/data/web_planner_data.xml
@@ -709,7 +709,7 @@
     <record id="planner_website" model="web.planner">
         <field name="name">Website Planner</field>
         <field name="view_id" ref="website_planner"/>
-        <field name="menu_id" ref="website.menu_website"/>
+        <field name="menu_id" ref="website.menu_website_configuration"/>
         <field name="planner_application">planner_website</field>
         <field name="tooltip_planner"><![CDATA[
         Plan your website strategy, design your pages, sell your products and grow your online business!
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index cef9cc4b437..9344ed70e4a 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -65,13 +65,6 @@
             <field name="target">self</field>
         </record>
 
-        <record id="menu_website" model="ir.ui.menu">
-            <field name="name">Website</field>
-            <field name="sequence" eval="200"/>
-            <field name="web_icon">website,static/description/icon.png</field>
-            <field name="action" ref="action_website"/>
-        </record>
-
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_website"/>
             <field name="state">open</field>
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index db918401eed..95a229cda71 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -601,6 +601,12 @@ class Website(models.Model):
                     return urlparse.urljoin(cdn_url, uri)
         return uri
 
+    @api.model
+    def action_dashboard_redirect(self):
+        if self.env.user.has_group('base.group_system') or self.env.user.has_group('website.group_website_designer'):
+            return self.env.ref('website.backend_dashboard').read()[0]
+        return self.env.ref('website.action_website').read()[0]
+
 
 class Menu(models.Model):
 
diff --git a/addons/website/static/description/icon_admin.png b/addons/website/static/description/icon_admin.png
deleted file mode 100644
index c3c37a0d6451d1c29ede195d59b01046df104bb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21652
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
LTe(=#BH(`krWT!x

diff --git a/addons/website/static/src/js/website.backendDashboard.js b/addons/website/static/src/js/website.backendDashboard.js
index 5caad853fcf..23e4c74a817 100644
--- a/addons/website/static/src/js/website.backendDashboard.js
+++ b/addons/website/static/src/js/website.backendDashboard.js
@@ -19,6 +19,7 @@ var Dashboard = Widget.extend(ControlPanelMixin, {
     template: "website.WebsiteDashboardMain",
     events: {
         'click .js_link_analytics_settings': 'on_link_analytics_settings',
+        'click .o_dashboard_action': 'on_dashboard_action_clicked',
     },
 
     init: function(parent, context) {
@@ -217,6 +218,23 @@ var Dashboard = Widget.extend(ControlPanelMixin, {
         this.update_cp();
     },
 
+    on_dashboard_action_clicked: function (ev) {
+        ev.preventDefault();
+        var $action = $(ev.currentTarget);
+        var additional_context = {};
+        if (this.date_range === 'week') {
+            additional_context = {'search_default_week': true}
+        } else if (this.date_range === 'month') {
+            additional_context = {'search_default_month': true}
+        } else if (this.date_range === 'year') {
+            additional_context = {'search_default_year': true}
+        }
+        this.do_action($action.attr('name'), {
+            additional_context: additional_context,
+            on_reverse_breadcrumb: this.on_reverse_breadcrumb
+        });
+    },
+
     update_cp: function() {
         var self = this;
         if (!this.$searchview) {
diff --git a/addons/website/static/src/less/website.backendDashboard.less b/addons/website/static/src/less/website.backendDashboard.less
index 8c2c4737a3a..1e162f6c43b 100644
--- a/addons/website/static/src/less/website.backendDashboard.less
+++ b/addons/website/static/src/less/website.backendDashboard.less
@@ -128,6 +128,74 @@
             }
         }
 
+        .o_dashboard_common {
+            .o_box {
+                display: flex;
+                flex-flow: row wrap;
+                justify-content: flex-start;
+                > .o_box_item {
+                    @media (max-width: @screen-sm-min) {
+                        flex: 1 1 200px;
+                        display: block !important;
+                    }
+                    @media (min-width: @screen-sm-min) {
+                        flex: 0 0 20%;
+                    }
+                }
+            }
+            .o_inner_box {
+                padding-top: 10px;
+                text-align: center;
+                border: 1px solid @odoo-view-background-color;
+                height: 80px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                &.o_main {
+                    background-color: @odoo-brand-optional;
+                    &:hover {
+                        background-color: darken(@odoo-brand-optional, 10%);
+                    }
+                    a {
+                        color: white;
+                    }
+                }
+                &.o_primary {
+                    background-color: @odoo-brand-primary;
+                    color: white;
+                    &:hover {
+                        background-color: darken(@odoo-brand-primary, 10%);
+                    }
+                }
+                &.o_apps {
+                    position: relative;
+                    background-color: @odoo-brand-optional;
+                    color: white;
+                    .o_apps_hidden {
+                        display: none;
+                        &.o_apps_hide_panel {
+                            position: absolute;
+                            top: 0px;
+                            right: 0px;
+                            background: @brand-danger;
+                            padding: 6px;
+                        }
+                    }
+                    &:hover {
+                        background-color: #45818E;
+                        .o_apps_show {
+                            display: none;
+                        }
+                        .o_apps_hidden {
+                            display: block;
+                        }
+                    }
+                }
+                .o_highlight {
+                    font-size: 27px;
+                }
+            }
+        }
+
         .o_dashboard_visits {
 
             .o_demo_background {
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 413c3d35631..992ffc5d821 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -8,6 +8,20 @@
     <t t-name="website.WebsiteDashboardMain">
         <div class="o_dashboards">
             <div class="container-fluid o_website_dashboard">
+                <t t-call="website.dashboard_header"/>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.dashboard_header">
+        <div class="row o_dashboard_common">
+            <div class="o_box">
+                <a href="#" class="o_box_item o_dashboard_action" name="website.action_website" title="Go to Website">
+                    <div class="o_inner_box o_primary">
+                        <i class="fa fa-globe fa-3x"></i><br/>
+                        Go to Website
+                    </div>
+                </a>
             </div>
         </div>
     </t>
diff --git a/addons/website/views/res_config_views.xml b/addons/website/views/res_config_views.xml
index 5b05e220b1c..f923fa167a5 100644
--- a/addons/website/views/res_config_views.xml
+++ b/addons/website/views/res_config_views.xml
@@ -373,6 +373,10 @@ You can also edit the fields of the Extra Step page in eCommerce checkout.">
 
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
             sequence="100" name="Configuration" groups="base.group_system"/>
-        <menuitem id="menu_website_website_settings" parent="menu_website_global_configuration" name="Settings" action="action_website_configuration"/>
+        <menuitem name="Settings"
+            id="menu_website_website_settings"
+            action="action_website_configuration"
+            parent="menu_website_global_configuration"
+            groups="base.group_system"/>
 
 </odoo>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 9fbe8790a72..1b9b4c87fa5 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -2,11 +2,11 @@
 <odoo>
     <data>
         <!-- Menu items -->
-        <menuitem name="Website Admin"
+        <menuitem name="Website"
             id="menu_website_configuration"
             sequence="9"
-            groups="website.group_website_publisher"
-            web_icon="website,static/description/icon_admin.png"/>
+            groups="base.group_user"
+            web_icon="website,static/description/icon.png"/>
 
         <!-- website views -->
         <record id="view_website_form" model="ir.ui.view">
@@ -124,11 +124,17 @@
             <field name="tag">backend_dashboard</field>
         </record>
 
+        <record id="ir_actions_server_website_dashboard" model="ir.actions.server">
+            <field name="name">Website: Dashboard</field>
+            <field name="model_id" ref="website.model_website"/>
+            <field name="state">code</field>
+            <field name="code">action = model.action_dashboard_redirect()</field>
+        </record>
+
         <menuitem id="menu_dashboard"
             name="Dashboard"
             sequence="1"
-            action="website.backend_dashboard"
-            groups="website.group_website_publisher"
+            action="website.ir_actions_server_website_dashboard"
             parent="website.menu_website_configuration"/>
 
     </data>