diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2015-02-15 20:32:29 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2015-02-15 20:32:29 +0100 |
| commit | 1d7f266c1f685475cc9cca719b8809f78594f11f (patch) | |
| tree | e2fe891c062a8c2732ccd672502b8a52430331b4 | |
| parent | 0b475818ad1b01d0470572878320ad3e39b4d4ba (diff) | |
[IMP] Project form view cleaned
| -rw-r--r-- | addons/project/project_view.xml | 42 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.backend.xml | 2 |
2 files changed, 20 insertions, 24 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index de75199596d..77d499ccf6d 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -112,30 +112,23 @@ <field string="Documents" name="doc_count" widget="statinfo"/> </button> </div> - <group> - <group col="4"> - <field name="user_id" string="Project Manager" - attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" - context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/> - <newline/> - </group> - <group name="group_alias" - attrs="{'invisible': [('alias_domain', '=', False)]}"> - <label for="alias_name" string="Email Alias"/> - <div name="alias_def"> - <field name="alias_id" class="oe_read_only oe_inline" - string="Email Alias" required="0"/> - <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" > - <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> - </div> - </div> - <label for="alias_model" string="Incoming Emails create"/> - <field name="alias_model" class="oe_inline" nolabel="1"/> - <field name="alias_contact" class="oe_inline" - string="Accept Emails From"/> - </group> - </group> <notebook> + <page string="Emails" attrs="{'invisible': [('alias_domain', '=', False)]}"> + <group name="group_alias"> + <label for="alias_name" string="Email Alias"/> + <div name="alias_def"> + <field name="alias_id" class="oe_read_only oe_inline" + string="Email Alias" required="0"/> + <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" > + <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> + </div> + </div> + <label for="alias_model" string="Incoming Emails create"/> + <field name="alias_model" class="oe_inline" nolabel="1"/> + <field name="alias_contact" class="oe_inline" + string="Accept Emails From"/> + </group> + </page> <page string="Team" name="team"> <field colspan="4" name="members" widget="many2many_kanban" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"> <kanban quick_create="false" create="true" delete="true"> @@ -159,6 +152,9 @@ <page string="Other Info"> <group string="Administration"> <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/> + <field name="user_id" string="Project Manager" + attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" + context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/> <field name="privacy_visibility" widget="radio"/> <field name="planned_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/> diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index 6860b10b5cd..8aec7f2017c 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -3,7 +3,7 @@ <t t-name="WidgetWebsiteButton"> <div class="oe_WidgetWebsiteButton success"> - <strong class="oe_unpublish text-danger">Not Published</strong> + <strong class="oe_unpublish text-danger">Not<br/>Published</strong> <strong class="oe_publish text-success">Published</strong> </div> </t> |