diff options
| author | qsm-odoo <qsm@odoo.com> | 2015-08-21 10:46:31 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2015-08-21 14:31:11 +0200 |
| commit | 2a3f359ae85ee5bdbdfc84c2bc383430a26526e5 (patch) | |
| tree | 776d5ed01b2b028f5660bfe7b656d543c107b0e4 | |
| parent | cb1ce61c84300b61bbfcf85fec861944819e1f3f (diff) | |
[REF] * : Remove oe_left of oe_title & oe_avatar
LESS rules (enterprise compatibility) :
* .oe_avatar is float:left by default
* .oe_title is placed between oe_avatar/oe_button_box if any
without the need to make it float
| -rw-r--r-- | addons/fleet/fleet_view.xml | 6 | ||||
| -rw-r--r-- | addons/gamification/views/badge.xml | 2 | ||||
| -rw-r--r-- | addons/hr/hr_view.xml | 2 | ||||
| -rw-r--r-- | addons/im_livechat/views/im_livechat_channel_views.xml | 2 | ||||
| -rw-r--r-- | addons/mail/views/mail_channel_views.xml | 2 | ||||
| -rw-r--r-- | addons/product/product_view.xml | 10 | ||||
| -rw-r--r-- | addons/stock_landed_costs/stock_landed_costs_view.xml | 2 | ||||
| -rw-r--r-- | addons/web/static/src/less/enterprise_compatibility.less | 23 | ||||
| -rw-r--r-- | addons/website_slides/view/website_slides_backend.xml | 6 | ||||
| -rw-r--r-- | openerp/addons/base/module/module_view.xml | 2 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_company_view.xml | 4 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_partner_view.xml | 4 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_users_view.xml | 4 |
13 files changed, 33 insertions, 36 deletions
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index cc5c2a14286..dde08fca493 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -6,7 +6,7 @@ <field name="model">fleet.vehicle.model</field> <field name="arch" type="xml"> <form string="Model"> - <field name="image_medium" widget='image' class="oe_left oe_avatar"/> + <field name="image_medium" widget='image' class="oe_avatar"/> <div class="oe_title"> <label for="modelname" class="oe_edit_only"/> <h1> @@ -98,7 +98,7 @@ <form string="Model Make"> <group> <div> - <field name="image_medium" widget="image" class="oe_left oe_avatar"/> + <field name="image_medium" widget="image" class="oe_avatar"/> <label for="name" class="oe_edit_only"/> <h1> <field name="name" class="oe_inline" /> @@ -232,7 +232,7 @@ <field name="odometer_count" widget="statinfo" string="Odometer"/> </button> </div> - <field name="image_medium" widget='image' class="oe_left oe_avatar"/> + <field name="image_medium" widget='image' class="oe_avatar"/> <div class="oe_title"> <label for="model_id" class="oe_edit_only"/> <h1> diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml index c981ccb8f37..f2f59b7792f 100644 --- a/addons/gamification/views/badge.xml +++ b/addons/gamification/views/badge.xml @@ -43,7 +43,7 @@ </header> <sheet> <div class="oe_button_box" name="button_box"/> - <field name="image" widget='image' class="oe_left oe_avatar"/> + <field name="image" widget='image' class="oe_avatar"/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1> diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 27093991707..7a65d368a59 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -21,7 +21,7 @@ <form string="Employee"> <sheet> <div class="oe_button_box" name="button_box"/> - <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image":"image_medium"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image":"image_medium"}'/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1> diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml index a08556a1e87..06f8e3ec6de 100644 --- a/addons/im_livechat/views/im_livechat_channel_views.xml +++ b/addons/im_livechat/views/im_livechat_channel_views.xml @@ -73,7 +73,7 @@ <field string="% Happy" name="rating_percentage_satisfaction" widget="statinfo"/> </button> </div> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1> diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index 0a763fa7938..9512e7aaf1a 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -99,7 +99,7 @@ <field name="arch" type="xml"> <form string="Group Form"> <sheet class="openerp_mail_channel_sheet"> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_small"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_small"}'/> <div class="oe_title"> <div class="oe_edit_only"> <label for="name"/> diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 62846207ddb..7b0ff540c46 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -223,12 +223,10 @@ <field name="arch" type="xml"> <form string="Variant Information"> <sheet> - <div class="oe_left" style="width: 500px;"> - <field name="image_medium" widget="image" class="oe_avatar oe_left"/> - <div class="oe_title" style="width: 390px;"> - <label class="oe_edit_only" for="name" string="Product Name"/> - <h1><field name="name" class="oe_inline"/></h1> - </div> + <field name="image_medium" widget="image" class="oe_avatar"/> + <div class="oe_title"> + <label class="oe_edit_only" for="name" string="Product Name"/> + <h1><field name="name" class="oe_inline"/></h1> </div> <group> <p>All general settings about this product are managed on <button name="open_product_template" type="object" string="the product template" class="oe_link"/></p> diff --git a/addons/stock_landed_costs/stock_landed_costs_view.xml b/addons/stock_landed_costs/stock_landed_costs_view.xml index e4b8829dade..9cd9bd4c7ee 100644 --- a/addons/stock_landed_costs/stock_landed_costs_view.xml +++ b/addons/stock_landed_costs/stock_landed_costs_view.xml @@ -164,7 +164,7 @@ <field name="arch" type="xml"> <form string="Landed Costs"> <sheet> - <field name="image_medium" widget="image" class="oe_avatar oe_left"/> + <field name="image_medium" widget="image" class="oe_avatar"/> <div class="oe_title"> <div class="oe_edit_only"> <label for="name" name='label_name' string="Product Name"/> diff --git a/addons/web/static/src/less/enterprise_compatibility.less b/addons/web/static/src/less/enterprise_compatibility.less index b7f26de697d..0e13216e3cf 100644 --- a/addons/web/static/src/less/enterprise_compatibility.less +++ b/addons/web/static/src/less/enterprise_compatibility.less @@ -217,23 +217,24 @@ div.o_checkbox { } } - + .oe_title { - width: 400px; - } - - + .oe_avatar { - > img { - max-width: 90px; - max-height: 90px; - } - + &, & + .oe_avatar { + .oe_title { width: 400px; - padding-left: 95px; } } } + .oe_avatar { + > img { + max-width: 90px; + max-height: 90px; + } + + + .oe_title { + padding-left: 95px; + } + } + .o_row { > * { width: auto!important; // oe_inline diff --git a/addons/website_slides/view/website_slides_backend.xml b/addons/website_slides/view/website_slides_backend.xml index e1bbf8d6a7f..fff35d4be08 100644 --- a/addons/website_slides/view/website_slides_backend.xml +++ b/addons/website_slides/view/website_slides_backend.xml @@ -46,8 +46,8 @@ <field name="website_published" widget="website_button"/> </button> </div> - <field name="image" widget="image" class="oe_left oe_avatar" options='{"preview_image": "image_thumb"}'/> - <div class="oe_title oe_left"> + <field name="image" widget="image" class="oe_avatar" options='{"preview_image": "image_thumb"}'/> + <div class="oe_title"> <div class="oe_edit_only"> <label for="name" string="Name"/> </div> @@ -200,7 +200,7 @@ <field name="website_published" widget="website_button"/> </button> </div> - <div class="oe_title oe_left"> + <div class="oe_title"> <div class="oe_edit_only"> <label for="name" string="Name"/> </div> diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 5e1db78e4dc..faa463c42b5 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -73,7 +73,7 @@ <form create="0" edit="0" string="Module"> <link rel="stylesheet" href="/base/static/src/css/description.css"></link> <sheet> - <field name="icon_image" widget="image" class="oe_avatar oe_left"/> + <field name="icon_image" widget="image" class="oe_avatar"/> <div class="oe_title"> <h1><field name="shortdesc"/></h1> <h3 class="oe_fade"> diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index 20a1da117b0..ff0bfb9d23d 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -11,9 +11,7 @@ <div class="oe_button_box" name="button_box"> <button name="%(preview_report)d" string="Preview Header/Footer" type="action"/> </div> - <div> - <field name="logo" widget="image" class="oe_avatar oe_left"/> - </div> + <field name="logo" widget="image" class="oe_avatar"/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1> diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index b8d11f6a35a..21fd350f544 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -73,7 +73,7 @@ <field name="model">res.partner</field> <field name="arch" type="xml"> <form string="Contact"> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/> <div class="oe_title"> <field name="company_type" options="{'horizontal': true}" class="oe_edit_only" widget="radio"/> <h1> @@ -103,7 +103,7 @@ <field name="priority" eval="20"/> <field name="arch" type="xml"> <form string="Partner"> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium", "size": [90, 90]}' readonly="1"/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}' readonly="1"/> <div class="oe_title"> <h1> <field name="name" readonly="1"/> diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index a9051d7f4aa..2d0ca8ecace 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -134,7 +134,7 @@ <div class="oe_form_box_info oe_text_center" style="margin-bottom: 10px" attrs="{'invisible': [('id', '>', 0)]}"> You are creating a new user. After saving, the user will receive an invite email containing a link to set its password. </div> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1><field name="name"/></h1> @@ -172,7 +172,7 @@ <sheet> <field name="id" invisible="1"/> <div class="oe_button_box" name="button_box"/> - <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/> + <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1><field name="name"/></h1> |
