pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] {base, coupon, crm, event, mass_mailing, product, project, sales_team, utm, web}: prevent long texts from overflowing

Browse Source 
Previously, in multiple modules, long names would result in an overflow of text.
With this commit long texts should appear like this: [aaaaa...] instead of
going out of their boxes.

Various views are updated, depending on which fields we wanted to prevent
from overflowing and the probability they do so.

Task ID-2325219
PR odoo/odoo#57713
PR odoo/enterprise#13226

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
This commit is contained in:
Pedro (pno)
2020-11-04 07:32:27 +00:00
committed by Thibault Delavallée
parent 16908e9eac
commit a0ebb46098
14 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/coupon/views/coupon_program_views.xml
+3 -3
View File
@@ -10,7 +10,7 @@
<sheet> <sheet>
<div class="oe_button_box" name="button_box" /> <div class="oe_button_box" name="button_box" />
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<div name="title" class="oe_left"> <div name="title" class="oe_left mw-100">
</div> </div>
<group> <group>
<group name="conditions" string="Conditions"> <group name="conditions" string="Conditions">
@@ -139,7 +139,7 @@
<templates> <templates>
<t t-name="kanban-box"> <t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click"> <div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="text-center"> <div class="text-center oe_kanban_details">
<strong><span><field name="name"/></span></strong> <strong><span><field name="name"/></span></strong>
</div> </div>
<hr class="mt4 mb4"/> <hr class="mt4 mb4"/>
@@ -192,7 +192,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[@name='title']" position="inside"> <xpath expr="//div[@name='title']" position="inside">
<label class="oe_edit_only" for="name" string="Promotion Program Name"/> <label class="oe_edit_only" for="name" string="Promotion Program Name"/>
<h1><field name="name" class="oe_title" placeholder="Promotion Program Name..." height="20px"/></h1> <h1><field name="name" class="oe_title o_text_overflow" placeholder="Promotion Program Name..." height="20px"/></h1>
</xpath> </xpath>
<xpath expr="//div[@name='button_box']" position="inside"> <xpath expr="//div[@name='button_box']" position="inside">
<button class="oe_stat_button" type="action" icon="fa-ticket" name="%(coupon.coupon_action)d" attrs="{'invisible': [('promo_applicability', '=', 'on_current_order')]}"> <button class="oe_stat_button" type="action" icon="fa-ticket" name="%(coupon.coupon_action)d" attrs="{'invisible': [('promo_applicability', '=', 'on_current_order')]}">
addons/crm/views/crm_lead_views.xml
+3 -3
View File
@@ -44,7 +44,7 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only" string="Lead" attrs="{'invisible': [('type', '=', 'opportunity')]}"/> <label for="name" class="oe_edit_only" string="Lead" attrs="{'invisible': [('type', '=', 'opportunity')]}"/>
<label for="name" class="oe_edit_only" attrs="{'invisible': [('type', '=', 'lead')]}"/> <label for="name" class="oe_edit_only" attrs="{'invisible': [('type', '=', 'lead')]}"/>
<h1><field name="name" placeholder="e.g. Product Pricing"/></h1> <h1><field class="o_text_overflow" name="name" placeholder="e.g. Product Pricing"/></h1>
<h2 class="o_row no-gutters align-items-end"> <h2 class="o_row no-gutters align-items-end">
<div class="col" attrs="{'invisible': [('type', '=', 'lead')]}"> <div class="col" attrs="{'invisible': [('type', '=', 'lead')]}">
<label for="expected_revenue" class="oe_edit_only" /> <label for="expected_revenue" class="oe_edit_only" />
@@ -504,7 +504,7 @@
</div> </div>
</div> </div>
<div class="oe_kanban_content"> <div class="oe_kanban_content">
<div class="o_kanban_record_title"> <div class="o_kanban_record_title oe_kanban_details">
<strong><field name="name"/></strong> <strong><field name="name"/></strong>
</div> </div>
<div class="o_kanban_record_subtitle"> <div class="o_kanban_record_subtitle">
@@ -518,7 +518,7 @@
</t> </t>
</div> </div>
<div> <div>
<span t-if="record.partner_id.value" t-esc="record.partner_id.value"></span> <span class="o_text_overflow" t-if="record.partner_id.value" t-esc="record.partner_id.value"></span>
</div> </div>
<div> <div>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
addons/event/views/event_views.xml
+6 -6
View File
@@ -219,7 +219,7 @@
<field name="kanban_state" widget="state_selection" class="ml-auto float-right"/> <field name="kanban_state" widget="state_selection" class="ml-auto float-right"/>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only" string="Event Name"/> <label for="name" class="oe_edit_only" string="Event Name"/>
<h1><field name="name" placeholder="e.g. Conference for Architects"/></h1> <h1><field class="o_text_overflow" name="name" placeholder="e.g. Conference for Architects"/></h1>
</div> </div>
<group> <group>
<group> <group>
@@ -544,13 +544,13 @@
<group> <group>
<group string="Attendee" name="attendee"> <group string="Attendee" name="attendee">
<field name="partner_id" attrs="{'readonly':[('state', '!=', 'draft')]}"/> <field name="partner_id" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
<field name="name"/> <field class="o_text_overflow" name="name"/>
<field name="email"/> <field name="email"/>
<field name="phone" class="o_force_ltr"/> <field name="phone" class="o_force_ltr"/>
<field name="mobile" class="o_force_ltr"/> <field name="mobile" class="o_force_ltr"/>
</group> </group>
<group string="Event Information" name="event"> <group string="Event Information" name="event">
<field name="event_id" attrs="{'readonly': [('state', '!=', 'draft')]}" options="{'no_create': True}"/> <field class="o_text_overflow" name="event_id" attrs="{'readonly': [('state', '!=', 'draft')]}" options="{'no_create': True}"/>
<field name="event_ticket_id" <field name="event_ticket_id"
domain="[ domain="[
('event_id', '=', event_id), ('event_id', '=', event_id),
@@ -626,12 +626,12 @@
<div class="oe_kanban_content h-100"> <div class="oe_kanban_content h-100">
<div class="o_kanban_record_body pt-1 pl-2 h-100 d-flex flex-column"> <div class="o_kanban_record_body pt-1 pl-2 h-100 d-flex flex-column">
<b class="o_kanban_record_title"><field name="name"/></b> <b class="o_kanban_record_title"><field name="name"/></b>
<field name="event_id" invisible="context.get('default_event_id')" /> <field class="o_text_overflow" name="event_id" invisible="context.get('default_event_id')" />
<span attrs="{'invisible': [('partner_id', '=', False)]}">Booked by <field name="partner_id" /></span> <span class="o_text_overflow" attrs="{'invisible': [('partner_id', '=', False)]}">Booked by <field name="partner_id" /></span>
<div id="event_ticket_id" class="o_field_many2manytags o_field_widget d-flex mt-auto"> <div id="event_ticket_id" class="o_field_many2manytags o_field_widget d-flex mt-auto">
<t t-if="record.event_ticket_id.raw_value"> <t t-if="record.event_ticket_id.raw_value">
<div t-attf-class="badge badge-pill o_tag_color_#{(record.event_ticket_id.raw_value % 11) + 1}" > <div t-attf-class="badge badge-pill o_tag_color_#{(record.event_ticket_id.raw_value % 11) + 1}" >
<b><span class="o_badge_text"><t t-esc="record.event_ticket_id.value"/></span></b> <b><span class="o_badge_text o_text_overflow"><t t-esc="record.event_ticket_id.value"/></span></b>
</div> </div>
</t> </t>
</div> </div>
addons/mass_mailing/views/mailing_contact_views.xml
+1 -1
View File
@@ -153,7 +153,7 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1> <h1>
<field name="name" placeholder="e.g. John Smith"/> <field class="o_text_overflow" name="name" placeholder="e.g. John Smith"/>
</h1> </h1>
<label for="tag_ids" class="oe_edit_only"/> <label for="tag_ids" class="oe_edit_only"/>
<div> <div>
addons/mass_mailing/views/mailing_list_views.xml
+2 -2
View File
@@ -47,7 +47,7 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1> <h1>
<field name="name" placeholder="e.g. Consumer Newsletter"/> <field name="name" class="o_text_overflow" placeholder="e.g. Consumer Newsletter"/>
</h1> </h1>
</div> </div>
<group> <group>
@@ -107,7 +107,7 @@
<div class="o_mass_mailing_kanban_main"> <div class="o_mass_mailing_kanban_main">
<div class="o_kanban_card_content"> <div class="o_kanban_card_content">
<div class="o_kanban_primary_left"> <div class="o_kanban_primary_left">
<div class="o_primary"> <div class="o_primary o_text_overflow">
<span><t t-esc="record.name.value"/></span> <span><t t-esc="record.name.value"/></span>
</div> </div>
</div> </div>
addons/mass_mailing/views/mailing_mailing_views.xml
+5 -4
View File
@@ -158,8 +158,8 @@
<field name="active" invisible="1"/> <field name="active" invisible="1"/>
<field name="mailing_type" widget="radio" options="{'horizontal': true}" invisible="1" <field name="mailing_type" widget="radio" options="{'horizontal': true}" invisible="1"
attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/> attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/>
<field name="subject" string="Subject" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}" widget="char_emojis" placeholder="e.g. New Sale on all T-shirts"/> <field class="o_text_overflow" name="subject" string="Subject" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}" widget="char_emojis" placeholder="e.g. New Sale on all T-shirts"/>
<field name="preview" string="Preview Text" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}" widget="char_emojis" placeholder="e.g. Check it out before it's too late!"/> <field class="o_text_overflow" name="preview" string="Preview Text" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}" widget="char_emojis" placeholder="e.g. Check it out before it's too late!"/>
<label for="mailing_model_id" string="Recipients"/> <label for="mailing_model_id" string="Recipients"/>
<div name="mailing_model_id_container"> <div name="mailing_model_id_container">
<div class="row"> <div class="row">
@@ -216,7 +216,7 @@
<group> <group>
<group> <group>
<field name="id" invisible="1"/> <field name="id" invisible="1"/>
<field name="name" required="False" groups="base.group_no_one" string="Name"/> <field name="name" required="False" groups="base.group_no_one" class="o_text_overflow" string="Name"/>
<field name="user_id" domain="[('share', '=', False)]"/> <field name="user_id" domain="[('share', '=', False)]"/>
<field name="email_from" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/> <field name="email_from" attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/>
<label for="reply_to"/> <label for="reply_to"/>
@@ -258,6 +258,7 @@
string="Source" string="Source"
readonly="1" readonly="1"
required="False" required="False"
class="o_text_overflow"
groups="base.group_no_one" groups="base.group_no_one"
attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/> attrs="{'readonly': [('state', 'in', ('sending', 'done'))]}"/>
<field name="medium_id" <field name="medium_id"
@@ -339,7 +340,7 @@
t-attf-style="width: #{record.delivered.raw_value * 100 / record.expected.raw_value}%"/> t-attf-style="width: #{record.delivered.raw_value * 100 / record.expected.raw_value}%"/>
</div> </div>
</div> </div>
<h3 class="my-1 o_text_overflow" attrs="{'invisible': [('sent_date', '!=', False)]}"> <h3 class="my-1" attrs="{'invisible': [('sent_date', '!=', False)]}">
<field name="subject"/> <field name="subject"/>
</h3> </h3>
<field name="mailing_type" invisible="1"/> <field name="mailing_type" invisible="1"/>
addons/mass_mailing_sms/views/mailing_mailing_views.xml
+1 -1
View File
@@ -100,7 +100,7 @@
For an SMS Text Message, internal Title of the Message.</attribute> For an SMS Text Message, internal Title of the Message.</attribute>
</xpath> </xpath>
<xpath expr="//field[@name='subject']" position="after"> <xpath expr="//field[@name='subject']" position="after">
<field name="sms_subject" string="Title" attrs="{'invisible': [('mailing_type', '!=', 'sms')], 'readonly': [('state', 'in', ('sending', 'done'))], 'required': [('mailing_type', '=', 'sms')]}"/> <field class="o_text_overflow" name="sms_subject" string="Title" attrs="{'invisible': [('mailing_type', '!=', 'sms')], 'readonly': [('state', 'in', ('sending', 'done'))], 'required': [('mailing_type', '=', 'sms')]}"/>
</xpath> </xpath>
<xpath expr="//page[@name='mail_body']" position="attributes"> <xpath expr="//page[@name='mail_body']" position="attributes">
<attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute> <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
addons/product/views/product_views.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/> <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
<div class="oe_title"> <div class="oe_title">
<label class="oe_edit_only" for="name" string="Product Name"/> <label class="oe_edit_only" for="name" string="Product Name"/>
<h1><field name="name" placeholder="Product Name"/></h1> <h1><field class="o_text_overflow" name="name" placeholder="Product Name"/></h1>
<div name="options" groups="base.group_user"> <div name="options" groups="base.group_user">
<div> <div>
<field name="sale_ok"/> <field name="sale_ok"/>
addons/project/static/src/scss/project_dashboard.scss
+5
View File
@@ -1,4 +1,9 @@
.o_kanban_view.o_kanban_dashboard.o_project_kanban { .o_kanban_view.o_kanban_dashboard.o_project_kanban {
.o_project_kanban_main {
max-width: 300px;
}
.o_project_kanban_boxes { .o_project_kanban_boxes {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
addons/project/views/project_views.xml
+4 -4
View File
@@ -275,7 +275,7 @@
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="name" placeholder="Project Name"/> <field name="name" class="o_text_overflow" placeholder="Project Name"/>
</h1> </h1>
<div name="options_active"> <div name="options_active">
<div> <div>
@@ -513,11 +513,11 @@
<t t-name="kanban-box"> <t t-name="kanban-box">
<div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click o_has_icon"> <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click o_has_icon">
<div class="o_project_kanban_main"> <div class="o_project_kanban_main">
<div class="o_kanban_card_content"> <div class="o_kanban_card_content mw-100">
<div class="o_kanban_primary_left"> <div class="o_kanban_primary_left">
<div class="o_primary"> <div class="o_primary">
<span><t t-esc="record.name.value"/></span> <span class="o_text_overflow"><t t-esc="record.name.value"/></span>
<span t-if="record.partner_id.value"> <span class="o_text_overflow" t-if="record.partner_id.value">
<strong><t t-esc="record.partner_id.value"/></strong> <strong><t t-esc="record.partner_id.value"/></strong>
</span> </span>
</div> </div>
addons/sales_team/views/crm_team_views.xml
+2 -2
View File
@@ -27,7 +27,7 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only" string="Sales Team"/> <label for="name" class="oe_edit_only" string="Sales Team"/>
<h1> <h1>
<field name="name" placeholder="Sales Team name..."/> <field class="o_text_overflow" name="name" placeholder="Sales Team name..."/>
</h1> </h1>
<div name="options_active" /> <div name="options_active" />
</div> </div>
@@ -128,7 +128,7 @@
<div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}">
<div t-attf-class="o_kanban_card_header"> <div t-attf-class="o_kanban_card_header">
<div class="o_kanban_card_header_title"> <div class="o_kanban_card_header_title">
<div class="o_primary"><field name="name"/></div> <div class="o_primary o_text_overflow"><field name="name"/></div>
</div> </div>
<div class="o_kanban_manage_button_section"> <div class="o_kanban_manage_button_section">
<a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a> <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
addons/utm/views/utm_campaign_views.xml
+2 -2
View File
@@ -30,7 +30,7 @@
<div class="oe_button_box d-flex justify-content-end" name="button_box"> <div class="oe_button_box d-flex justify-content-end" name="button_box">
</div> </div>
<group id="top-group"> <group id="top-group">
<field name="name" string="Campaign Name" placeholder="e.g. Black Friday"/> <field class="o_text_overflow" name="name" string="Campaign Name" placeholder="e.g. Black Friday"/>
<field name="user_id" domain="[('share', '=', False)]"/> <field name="user_id" domain="[('share', '=', False)]"/>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
</group> </group>
@@ -61,7 +61,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<group> <group>
<field name="name" string="Campaign Name" placeholder="e.g. Black Friday"/> <field class="o_text_overflow" name="name" string="Campaign Name" placeholder="e.g. Black Friday"/>
<field name="user_id" domain="[('share', '=', False)]"/> <field name="user_id" domain="[('share', '=', False)]"/>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
</group> </group>
addons/web/static/src/scss/kanban_view.scss
+4 -1
View File
@@ -99,6 +99,8 @@
.o_kanban_record_title { .o_kanban_record_title {
@include o-kanban-record-title($font-size: 13px); @include o-kanban-record-title($font-size: 13px);
overflow-wrap: break-word;
word-wrap: break-word;
} }
.o_kanban_record_subtitle { .o_kanban_record_subtitle {
@@ -372,7 +374,8 @@
.oe_kanban_details { .oe_kanban_details {
width: 100%; width: 100%;
overflow-wrap: break-word;
word-wrap: break-word;
// Useful for the class 'o_text_overflow' // Useful for the class 'o_text_overflow'
min-width: 0; min-width: 0;
odoo/addons/base/views/res_partner_views.xml
+1 -1
View File
@@ -159,7 +159,7 @@
class="oe_edit_only" class="oe_edit_only"
options="{'horizontal': true}"/> options="{'horizontal': true}"/>
<h1> <h1>
<field name="name" default_focus="1" placeholder="Name" attrs="{'required' : [('type', '=', 'contact')]}"/> <field class="o_text_overflow" name="name" default_focus="1" placeholder="Name" attrs="{'required' : [('type', '=', 'contact')]}"/>
</h1> </h1>
<div class="o_row"> <div class="o_row">
<field name="parent_id" <field name="parent_id"