[FIX] website_form, *: fix new website form

* = website_crm, website_hr_recruitment, website_sale

Changing label position on existing field was replacing the label with
the default one.

Redirection message was not updating the overlay

Going from show message to redirect without hidding the mesage made the
form d-none

When a select field's label's position was changed the select was not
editable anymore.

Some other miscellaneous fixes

task-2191409

closes odoo/odoo#44911

X-original-commit: 3cf87cc1cb179598cecb736728378e330d3b2e22
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>

1 files changed, 53 insertions, 51 deletions

diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 2366a67a114..b32f87af001 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -11,72 +11,74 @@
                     'description': request.params.get('description', ''),
                 }</attribute>
             </xpath>
-            <xpath expr="//section[@id='contactus_section']" position="replace">
-                <section class="s_website_form" data-vcss="001">
-                    <div class="container">
-                        <form id="contactus_form" action="/website_form/" method="post" enctype="multipart/form-data" data-model_name="crm.lead" data-success-mode="redirect" data-success-page="/contactus-thank-you" class="o_mark_required" data-mark="*" data-editable-form="false">
-                            <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">
-                                    <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>
-                                        <div class="col-sm">
-                                            <input id="opportunity1" type="text" class="form-control s_website_form_input" name="contact_name" required=""/>
+            <xpath expr="//div[@id='contactus_section']" position="replace">
+                <div id="contactus_section">
+                    <section class="s_website_form" data-vcss="001">
+                        <div class="container">
+                            <form id="contactus_form" action="/website_form/" method="post" enctype="multipart/form-data" data-model_name="crm.lead" data-success-mode="redirect" data-success-page="/contactus-thank-you" class="o_mark_required" data-mark="*" data-editable-form="false">
+                                <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>
+                                            <div class="col-sm">
+                                                <input id="opportunity1" type="text" class="form-control s_website_form_input" name="contact_name" required=""/>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_field" data-type="char">
-                                    <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>
-                                        <div class="col-sm">
-                                            <input id="opportunity2" type="text" class="form-control s_website_form_input" name="phone" />
+                                    <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>
+                                            <div class="col-sm">
+                                                <input id="opportunity2" type="text" class="form-control s_website_form_input" name="phone" />
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_field s_website_form_required" data-type="char">
-                                    <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>
-                                        <div class="col-sm">
-                                            <input id="opportunity3" type="text" class="form-control s_website_form_input" name="email_from" required="" />
+                                    <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>
+                                            <div class="col-sm">
+                                                <input id="opportunity3" type="text" class="form-control s_website_form_input" name="email_from" required="" />
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_field" data-type="char">
-                                    <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>
-                                        <div class="col-sm">
-                                            <input id="opportunity4" type="text" class="form-control s_website_form_input" name="partner_name" />
+                                    <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>
+                                            <div class="col-sm">
+                                                <input id="opportunity4" type="text" class="form-control s_website_form_input" name="partner_name" />
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_field s_website_form_model_required" data-type="char">
-                                    <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>
-                                        <div class="col-sm">
-                                            <input id="opportunity5" type="text" class="form-control s_website_form_input" name="name" required="" />
+                                    <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>
+                                            <div class="col-sm">
+                                                <input id="opportunity5" type="text" class="form-control s_website_form_input" name="name" required="" />
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_field s_website_form_required" data-type="text">
-                                    <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>
-                                        <div class="col-sm">
-                                            <textarea id="opportunity6" class="form-control s_website_form_input" name="description" required=""></textarea>
+                                    <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>
+                                            <div class="col-sm">
+                                                <textarea id="opportunity6" class="form-control s_website_form_input" name="description" required=""></textarea>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="form-group col-12 s_website_form_submit">
-                                    <div class="row s_col_no_resize s_col_no_bgcolor">
-                                        <div style="width: 200px" class="col-sm-auto s_website_form_label"/>
-                                        <div class="col-sm">
-                                            <a href="#" role="button" class="btn btn-primary btn-lg s_website_form_send">Submit</a>
-                                            <span id="s_website_form_result"></span>
+                                    <div class="form-group col-12 s_website_form_submit">
+                                        <div class="row s_col_no_resize s_col_no_bgcolor">
+                                            <div style="width: 200px" class="col-sm-auto s_website_form_label"/>
+                                            <div class="col-sm">
+                                                <a href="#" role="button" class="btn btn-primary btn-lg s_website_form_send">Submit</a>
+                                                <span id="s_website_form_result"></span>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                        </form>
-                    </div>
-                </section>
+                            </form>
+                        </div>
+                    </section>
+                </div>
 			</xpath>
 		</template>