diff options
| author | aca <aca@odoo.com> | 2019-06-19 09:14:43 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-07-26 09:53:46 +0000 |
| commit | 78565b1dc933692abba46a73f2298b7ea8e03c88 (patch) | |
| tree | 05006de48a2099a35c39dc5571d4929ab0135a3b /addons/base_setup/views | |
| parent | a8893ad2994aad05961bdddcecb3e2c55f301ed5 (diff) | |
[REM] web_settings_dashboard: Merge module into base_setup
Purpose
=======
Currently, when we click on “Settings” on the Home Dashboard, we arrive
on a new Dashboard with several pieces of information like Installed Apps,
invite new users, or translations. Some informations are reachable in
several ways, which is not necessary.
We would like to remove this page and replace it with the General Settings
page directly. That makes more sense to the user who click on “Settings”. The
present informations will be dispatched in the menu or in the general settings
for a better usability.
Specification
=============
This commit move code from web_settings_dashboard in order to put the features
in settings directly. To do so, we choose to move code to base_setup, and create
widget on the settings form view to keep features. Concerned features are: invite
users, dev tools, odoo edition number and IAP account link.
TaskID: 2006910
closes odoo/odoo#34290
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/base_setup/views')
| -rw-r--r-- | addons/base_setup/views/assets.xml | 10 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 143 |
2 files changed, 116 insertions, 37 deletions
diff --git a/addons/base_setup/views/assets.xml b/addons/base_setup/views/assets.xml new file mode 100644 index 00000000000..340e4a52445 --- /dev/null +++ b/addons/base_setup/views/assets.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + <template id="assets_backend" name="dev tool assets" inherit_id="web.assets_backend"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/base_setup/static/src/js/res_config_dev_tool.js"></script> + <script type="text/javascript" src="/base_setup/static/src/js/res_config_edition.js"></script> + <script type="text/javascript" src="/base_setup/static/src/js/res_config_invite_users.js"></script> + </xpath> + </template> +</odoo> diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index 5acfd343678..2398075bf0e 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -3,11 +3,72 @@ <record id="res_config_settings_view_form" model="ir.ui.view"> <field name="name">res.config.settings.view.form.inherit.base.setup</field> <field name="model">res.config.settings</field> - <field name="priority" eval="100"/> + <field name="priority" eval="0"/> <field name="inherit_id" ref="base.res_config_settings_view_form"/> <field name="arch" type="xml"> <xpath expr="//div[hasclass('settings')]" position="inside"> <div class="app_settings_block" data-string="General Settings" string="General Settings" data-key="general_settings"> + <div id='about'> + <h2>About</h2> + <div class="row mt16 o_settings_container"> + <div class='col-12 col-lg-6 o_setting_box d-flex' id='appstore'> + <div class="o_setting_right_pane"> + <!-- FIXME Those links are defined directly in the template which means that we will have to + update the template code is the link ever changes --> + <a class="d-block mx-auto" href="https://play.google.com/store/apps/details?id=com.odoo.mobile" target="blank"> + <img alt="On Google Play" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/google_play.png"/> + </a> + </div> + <div> + <a class='d-block mx-auto' href="https://itunes.apple.com/us/app/odoo/id1272543640" target="blank"> + <img alt="On Apple Store" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/app_store.png"/> + </a> + </div> + </div> + <widget name='res_config_edition'/> + </div> + </div> + <div id='invite_users'> + <h2>Users</h2> + <widget name='res_config_invite_users'/> + </div> + + <div id="companies"> + <h2>Companies</h2> + <div class='row mt16 o_settings_container'> + <div class='col-xs-12 col-md-6 o_setting_box'> + <div class='o_setting_right_pane'> + <!-- TODO This is not an ideal solution but it looks ok on the interface --> + <div class="w-50"> + <field name='company_count' class="w-auto pl-1"/> + <span class='o_form_label'> + companies + </span> + </div> + <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Manage Companies" class="btn-link"/> + </div> + </div> + </div> + </div> + + <div id="languages"> + <h2>Languages</h2> + <div class='row mt16 o_settings_container'> + <div class='col-xs-12 col-md-6 o_setting_box'> + <div class='o_setting_right_pane'> + <!-- TODO This is not an ideal solution but it looks ok on the interface --> + <div class="w-50"> + <field name="language_count" class="w-auto pl-1"/> + <span class="o_form_label"> + Languages + </span> + </div> + <button name="%(base.res_lang_act_window)d" icon="fa-arrow-right" type="action" string="Manage Languages" class="btn-link"/> + </div> + </div> + </div> + </div> + <div id="business_documents"> <h2>Business Documents</h2> <div class="row mt16 o_settings_container"> @@ -48,6 +109,13 @@ </div> </div> </div> + + <div id="statistics"> + <h2>Statistics</h2> + <div class='row mt16 o_settings_container' id='statistics_div'> + </div> + </div> + <div id="contacts_settings"> <h2>Contacts</h2> <div class="row mt16 o_settings_container"> @@ -72,55 +140,55 @@ Send texts to your contacts </div> </div> - </div> </div> </div> - <div id="emails"/> - <h2>Users</h2> - <div class="row mt16 o_settings_container" id="user_default_rights"> - <div class="col-12 col-lg-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights"> - <div class="o_setting_left_pane"> - <field name="user_default_rights"/> - </div> - <div class="o_setting_right_pane"> - <label string="Access Rights" for="user_default_rights"/> - <div class="text-muted"> - Set custom access rights for new users - </div> - <div class="content-group" attrs="{'invisible': [('user_default_rights','=',False)]}"> - <div class="mt16"> - <button type="object" name="open_default_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/> - </div> - </div> - </div> + </div> + <div id="emails"/> + <h2>Users</h2> + <div class="row mt16 o_settings_container" id="user_default_rights"> + <div class="col-12 col-lg-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights"> + <div class="o_setting_left_pane"> + <field name="user_default_rights"/> </div> - <div class="col-12 col-lg-6 o_setting_box"> - <div class="o_setting_left_pane"> - <field name="module_base_import" /> + <div class="o_setting_right_pane"> + <label string="Access Rights" for="user_default_rights"/> + <div class="text-muted"> + Set custom access rights for new users </div> - <div class="o_setting_right_pane"> - <label string="Import & Export" for="module_base_import"/> - <div class="text-muted"> - Allow users to import data from CSV/XLS/XLSX/ODS files + <div class="content-group" attrs="{'invisible': [('user_default_rights','=',False)]}"> + <div class="mt16"> + <button type="object" name="open_default_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/> </div> </div> </div> - <div class="col-12 col-lg-6 o_setting_box" groups="base.group_no_one"> - <div class="o_setting_left_pane"> - <field name="show_effect"/> + </div> + <div class="col-12 col-lg-6 o_setting_box"> + <div class="o_setting_left_pane"> + <field name="module_base_import" /> + </div> + <div class="o_setting_right_pane"> + <label string="Import & Export" for="module_base_import"/> + <div class="text-muted"> + Allow users to import data from CSV/XLS/XLSX/ODS files </div> - <div class="o_setting_right_pane"> - <label for="show_effect"/> - <div class="text-muted"> - Add fun feedback and motivate your employees - </div> + </div> + </div> + <div class="col-12 col-lg-6 o_setting_box" groups="base.group_no_one"> + <div class="o_setting_left_pane"> + <field name="show_effect"/> + </div> + <div class="o_setting_right_pane"> + <label for="show_effect"/> + <div class="text-muted"> + Add fun feedback and motivate your employees </div> </div> </div> + </div> <div id="multi_company" groups="base.group_multi_company"> <field name="company_id" invisible="1"/> <h2>Multi-companies</h2> - <div class="row mt16 o_settings_container" name="multi_company"> + <div class="row mt16 o_settings_container" name="multi"> <div class="col-12 col-lg-6 o_setting_box"> <div class="o_setting_right_pane"> <label string="Multi-companies" for="multi_company"/> @@ -283,6 +351,7 @@ </div> </div> </div> + <widget name='res_config_dev_tool'/> </div> </xpath> </field> @@ -301,7 +370,7 @@ id="menu_config" name="General Settings" parent="base.menu_administration" - sequence="2" + sequence="0" action="action_general_configuration" groups="base.group_system"/> |
