summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2016-06-29 11:09:03 +0200
committerYannick Tivisse <yti@odoo.com>2016-06-29 12:02:19 +0200
commit3106d5a3f2a9267c1a9bbd6f2d1273a8a2ca2286 (patch)
tree9b529b7f7500eaee7e326d0039659778a1e19fb8
parent2a3f37806f88e6a69ef53f7e54ac6cf2fb10c940 (diff)
[IMP] web_settings_dashboard,web_tour: usability improvement from user tests
1/ The tip should be on the textarea, not on the button. 2/ The access right field on the quick user creation form is confusing. I propose to put it in "Technical Feature" so that it's not visible for normal users. 3/ dissociate les settings tour from project tour
-rw-r--r--addons/project/static/src/js/tour.js12
-rw-r--r--addons/web_settings_dashboard/static/src/js/tour.js21
-rw-r--r--addons/web_settings_dashboard/views/dashboard_templates.xml1
-rw-r--r--addons/web_settings_dashboard/views/dashboard_views.xml6
-rw-r--r--openerp/addons/base/res/res_users_view.xml4
5 files changed, 30 insertions, 14 deletions
diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tour.js
index c533fd93045..b2f509bc6a6 100644
--- a/addons/project/static/src/js/tour.js
+++ b/addons/project/static/src/js/tour.js
@@ -50,18 +50,6 @@ tour.register('project_tour', {
extra_trigger: '.o_form_project_tasks',
content: _t("Click on layers in the path to easily <b>return to tasks</b>."),
position: "bottom"
-}, {
- trigger: ".o_main_navbar .o_menu_toggle",
- content: _t('Click the <i>Home icon</i> to navigate across apps.'),
- position: "bottom"
-}, {
- trigger: ".o_apps .o_app:last",
- content: _t("Configuration options are available in the Settings app."),
- position: "bottom"
-}, {
- trigger: ".o_web_settings_dashboard .o_web_settings_dashboard_invitations",
- content: _t("<b>Invite collegues</b> via email.<br/><i>Enter one email per line.</i>"),
- position: "bottom"
}]);
});
diff --git a/addons/web_settings_dashboard/static/src/js/tour.js b/addons/web_settings_dashboard/static/src/js/tour.js
new file mode 100644
index 00000000000..524ce2976a4
--- /dev/null
+++ b/addons/web_settings_dashboard/static/src/js/tour.js
@@ -0,0 +1,21 @@
+odoo.define('web_settings_dashboard.tour', function(require) {
+"use strict";
+
+var core = require('web.core');
+var tour = require('web_tour.tour');
+
+var _t = core._t;
+
+tour.register('web_settings_dashboard_tour', {
+ 'skip_enabled': true,
+}, [{
+ trigger: '.o_app[data-menu-xmlid="base.menu_administration"], .oe_menu_toggler[data-menu-xmlid="base.menu_administration"]',
+ content: _t("Configuration options are available in the Settings app."),
+ position: "bottom"
+}, {
+ trigger: '.o_web_settings_dashboard_invitation_form textarea[id="user_emails"]',
+ content: _t("<b>Invite collegues</b> via email.<br/><i>Enter one email per line.</i>"),
+ position: "bottom"
+}]);
+
+}); \ No newline at end of file
diff --git a/addons/web_settings_dashboard/views/dashboard_templates.xml b/addons/web_settings_dashboard/views/dashboard_templates.xml
index ff4f74b1063..8f1d708eade 100644
--- a/addons/web_settings_dashboard/views/dashboard_templates.xml
+++ b/addons/web_settings_dashboard/views/dashboard_templates.xml
@@ -4,6 +4,7 @@
<xpath expr="." position="inside">
<link href="/web_settings_dashboard/static/src/less/dashboard.less" rel="stylesheet" type="text/less"/>
<script type="text/javascript" src="/web_settings_dashboard/static/src/js/dashboard.js"></script>
+ <script type="text/javascript" src="/web_settings_dashboard/static/src/js/tour.js"></script>
</xpath>
</template>
</odoo>
diff --git a/addons/web_settings_dashboard/views/dashboard_views.xml b/addons/web_settings_dashboard/views/dashboard_views.xml
index 2a051860708..abbcc515d66 100644
--- a/addons/web_settings_dashboard/views/dashboard_views.xml
+++ b/addons/web_settings_dashboard/views/dashboard_views.xml
@@ -5,4 +5,10 @@
<field name="tag">web_settings_dashboard.main</field>
</record>
<menuitem name="Dashboard" id="web_dashboard_menu" action="web_settings_dashboard_action" parent="base.menu_administration" sequence="-1" groups="base.group_system"/>
+
+ <!-- Make the xmlid of menus required by the Website Generic tour available in webclient -->
+ <record id="base.menu_administration" model="ir.ui.menu">
+ <field name="load_xmlid" eval="True"/>
+ </record>
+
</odoo>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 3ab620e20fb..79857095c68 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -149,8 +149,8 @@
</div>
<group>
<label for="groups_id" string="Access Rights"
- attrs="{'invisible': [('id', '>', 0)]}"/>
- <div attrs="{'invisible': [('id', '>', 0)]}">
+ attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one"/>
+ <div attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one">
<field name="groups_id" readonly="1" widget="many2many_tags" style="display: inline;"/> You will be able to define additional access rights by editing the newly created user under the Settings / Users menu.
</div>
<field name="phone" widget="phone"/>