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

[FIX] website_crm, *: fix label content name

Browse Source 
* = website_form, website_hr_recruitment, website_sale

Changes to website_form label name were not replicated to views.

Introduced by: https://github.com/odoo/odoo/pull/44790

closes odoo/odoo#49265

X-original-commit: 65840dcceac335ebd33f8d0503ff761cf8a6205e
Related: odoo/enterprise#9776
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
fja-odoo
2020-04-08 17:25:09 +00:00
parent b76b0cbcc7
commit 86c2ef70a6
4 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_crm/views/website_crm_templates.xml
+21 -6
View File
@@ -19,7 +19,10 @@
<div class="s_website_form_rows row s_col_no_bgcolor">
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity1">Your Name<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity1">
<span class="s_website_form_label_content">Your Name</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="opportunity1" type="text" class="form-control s_website_form_input" name="contact_name" required=""/>
</div>
@@ -27,7 +30,9 @@
</div>
<div class="form-group col-12 s_website_form_field" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity2">Phone Number</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity2">
<span class="s_website_form_label_content">Phone Number</span>
</label>
<div class="col-sm">
<input id="opportunity2" type="text" class="form-control s_website_form_input" name="phone" />
</div>
@@ -35,7 +40,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity3">Email<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity3">
<span class="s_website_form_label_content">Email</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="opportunity3" type="text" class="form-control s_website_form_input" name="email_from" required="" />
</div>
@@ -43,7 +51,9 @@
</div>
<div class="form-group col-12 s_website_form_field" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity4">Your Company</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity4">
<span class="s_website_form_label_content">Your Company</span>
</label>
<div class="col-sm">
<input id="opportunity4" type="text" class="form-control s_website_form_input" name="partner_name" />
</div>
@@ -51,7 +61,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_model_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity5">Subject</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity5">
<span class="s_website_form_label_content">Subject</span>
</label>
<div class="col-sm">
<input id="opportunity5" type="text" class="form-control s_website_form_input" name="name" required="" />
</div>
@@ -59,7 +71,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="text" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity6">Your Question<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity6">
<span class="s_website_form_label_content">Your Question</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<textarea id="opportunity6" class="form-control s_website_form_input" name="description" required=""></textarea>
</div>
addons/website_form/views/website_form_templates.xml
+24 -7
View File
@@ -11,7 +11,10 @@
<div class="s_website_form_rows row s_col_no_bgcolor">
<div class="form-group col-12 s_website_form_field s_website_form_custom s_website_form_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact1">Your Name<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact1">
<span class="s_website_form_label_content">Your Name</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="contact1" type="text" class="form-control s_website_form_input" name="Name" required=""/>
</div>
@@ -19,7 +22,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact2">Phone Number</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact2">
<span class="s_website_form_label_content">Phone Number</span>
</label>
<div class="col-sm">
<input id="contact2" type="text" class="form-control s_website_form_input" name="Phone"/>
</div>
@@ -27,7 +32,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="email" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact3">Email<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact3">
<span class="s_website_form_label_content">Email</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="contact3" type="email" class="form-control s_website_form_input" name="email_from" required=""/>
</div>
@@ -35,7 +43,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact4">Your Company</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact4">
<span class="s_website_form_label_content">Your Company</span>
</label>
<div class="col-sm">
<input id="contact4" type="text" class="form-control s_website_form_input" name="Partner Name"/>
</div>
@@ -43,7 +53,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact5">Subject<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact5">
<span class="s_website_form_label_content">Subject</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="contact5" type="text" class="form-control s_website_form_input" name="subject" required=""/>
</div>
@@ -51,7 +64,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom s_website_form_required" data-type="text" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact6">Your Question</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact6">
<span class="s_website_form_label_content">Your Question</span>
</label>
<div class="col-sm">
<textarea id="contact6" class="form-control s_website_form_input" name="Description" required=""></textarea>
</div>
@@ -59,7 +74,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_dnone">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact7">Email To</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="contact7">
<span class="s_website_form_label_content">Email To</span>
</label>
<div class="col-sm">
<input id="contact7" type="hidden" class="form-control s_website_form_input" name="email_to"/>
</div>
addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+24 -7
View File
@@ -142,7 +142,10 @@
<div class="s_website_form_rows row s_col_no_bgcolor">
<div class="form-group col-12 s_website_form_field s_website_form_required s_website_form_model_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment1">Your Name<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment1">
<span class="s_website_form_label_content">Your Name</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="recruitment1" type="text" class="form-control s_website_form_input" name="partner_name" required=""/>
</div>
@@ -150,7 +153,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="email" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment2">Your Email<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment2">
<span class="s_website_form_label_content">Your Email</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="recruitment2" type="email" class="form-control s_website_form_input" name="email_from" required=""/>
</div>
@@ -158,7 +164,10 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_required" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment3">Your Phone Number<span class="s_website_form_mark"> *</span></label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment3">
<span class="s_website_form_label_content">Your Phone Number</span>
<span class="s_website_form_mark"> *</span>
</label>
<div class="col-sm">
<input id="recruitment3" type="text" class="form-control s_website_form_input" name="partner_phone" required=""/>
</div>
@@ -166,7 +175,9 @@
</div>
<div class="form-group col-12 s_website_form_field" data-type="text" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment4">Short Introduction</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment4">
<span class="s_website_form_label_content">Short Introduction</span>
</label>
<div class="col-sm">
<textarea id="recruitment4" class="form-control s_website_form_input" name="description"></textarea>
</div>
@@ -174,7 +185,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom" data-type="binary" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment5">Resume</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment5">
<span class="s_website_form_label_content">Resume</span>
</label>
<div class="col-sm">
<input id="recruitment5" type="file" class="form-control s_website_form_input" name="Resume"/>
</div>
@@ -182,7 +195,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_dnone">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment6">Job</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment6">
<span class="s_website_form_label_content">Job</span>
</label>
<div class="col-sm">
<input id="recruitment6" type="hidden" class="form-control s_website_form_input" name="job_id"/>
</div>
@@ -190,7 +205,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_dnone">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment7">Department</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="recruitment7">
<span class="s_website_form_label_content">Department</span>
</label>
<div class="col-sm">
<input id="recruitment7" type="hidden" class="form-control s_website_form_input" name="department_id"/>
</div>
addons/website_sale/views/templates.xml
+9 -3
View File
@@ -752,7 +752,9 @@
<div class="s_website_form_rows row s_col_no_bgcolor">
<div class="form-group col-12 s_website_form_field" data-type="char" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale1">Your Reference</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale1">
<span class="s_website_form_label_content">Your Reference</span>
</label>
<div class="col-sm">
<input id="sale1" type="text" class="form-control s_website_form_input" name="client_order_ref"/>
</div>
@@ -760,7 +762,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom" data-type="text" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale2">Give us your feedback</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale2">
<span class="s_website_form_label_content">Give us your feedback</span>
</label>
<div class="col-sm">
<textarea id="sale2" class="form-control s_website_form_input" name="Give us your feedback" />
</div>
@@ -768,7 +772,9 @@
</div>
<div class="form-group col-12 s_website_form_field s_website_form_custom" data-type="binary" data-name="Field">
<div class="row s_col_no_resize s_col_no_bgcolor">
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale3">A document to provide</label>
<label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="sale3">
<span class="s_website_form_label_content">A document to provide</span>
</label>
<div class="col-sm">
<input id="sale3" type="file" class="form-control-file s_website_form_input" name="a_document" />
</div>