diff options
8 files changed, 22 insertions, 21 deletions
diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index 314ecec51b4..7476fa38b73 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -47,7 +47,7 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ var $add = $('<div/>', {'class': 'form-group mb0'}) .append($('<span/>', {'class': 'offset-md-3 col-md-9 text-left'}) - .append(qweb.render('web_editor.components.switch', {id: 'switch_addTo_menu', label: _t("Add page in menu")}))); + .append(qweb.render('web_editor.components.switch', {id: 'switch_addTo_menu', label: _t("Add to menu")}))); $add.find('input').prop('checked', true); $group.after($add); } diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml index 9193e3cdc4f..fe3256e5c8d 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml @@ -420,9 +420,9 @@ </div> </div> </div> - <div> - <a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><i class="fa fa-file-text-o"/> I'm interested</a> - <a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><i class="fa fa-fw fa-times"/> I'm not interested</a> + <div class='mt8'> + <a role="button" href="#" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><i class="fa fa-file-text-o"/> I'm interested</a> + <a role="button" href="#" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><i class="fa fa-fw fa-times"/> I'm not interested</a> <div class="modal fade modal_partner_assign_interested" role="form"> <div class="modal-dialog"> <form method="POST" class="js_accept_json modal-content js_website_submit_form interested_partner_assign_form"> diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js index bbd31e8f3e2..74e03206c7b 100644 --- a/addons/website_forum/static/src/js/website_forum.editor.js +++ b/addons/website_forum/static/src/js/website_forum.editor.js @@ -40,7 +40,7 @@ WebsiteNewMenu.include({ ' <input type="checkbox" required="required"/> '+ '</label>'+ '</div>'); - $add.find('label').append(_t("Add page in menu")); + $add.find('label').append(_t("Add to menu")); $group.after($add); } }).then(function (forum_name, field, $dialog) { diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js index 8ac0150f8d4..872d3ae5ebb 100644 --- a/addons/website_sale/static/src/js/website_sale.editor.js +++ b/addons/website_sale/static/src/js/website_sale.editor.js @@ -30,7 +30,7 @@ WebsiteNewMenu.include({ wUtils.prompt({ id: "editor_new_product", window_title: _t("New Product"), - input: "Product Name", + input: _t("Name"), }).then(function (name) { self._rpc({ route: '/shop/add_product', diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index ce404acc77c..66e661ab390 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -212,7 +212,7 @@ </table> <t t-if="not bins"> <div class="text-center text-muted oe_product"> - <h3 class="css_editable_display">No product defined.</h3> + <h3 class="css_editable_display mt8">No product defined.</h3> <t t-if="search"> <p> No results found for "<strong t-esc='search'/>". @@ -930,7 +930,7 @@ </div> <div class="col-12 col-xl-4"> <t t-call="website_sale.short_cart_summary"/> - <div class="d-xl-none"> + <div class="d-xl-none mt8"> <a role="button" href="/shop" class="btn btn-secondary mb32"> <span class="fa fa-chevron-left" /> Continue<span class="d-none d-md-inline"> Shopping</span> @@ -965,12 +965,12 @@ <span class="h6" t-esc="line.name_short" /> </t> </div> - <small>Qty: <t t-esc="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty" /></small> + Qty: <t t-esc="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty" /> </div> </div> </t> <div class="text-center"> - <span class="h5"> + <span class="h6"> <t t-call="website_sale.total"> <t t-set='hide_coupon'>True</t> </t> @@ -1125,17 +1125,17 @@ </form> <div t-attf-class="card #{selected and 'border_primary' or 'js_change_shipping'}"> <div class='card-body' style='min-height: 130px;'> - <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" href="#" class="btn btn-link float-right js_edit_address no-decoration" role="button" title="Edit this address" aria-label="Edit this address"><i class='fa fa-edit'/></a> + <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" href="#" class="btn btn-link float-right p-0 js_edit_address no-decoration" role="button" title="Edit this address" aria-label="Edit this address"><i class='fa fa-edit'/></a> <t t-esc="contact" t-options="dict(widget='contact', fields=['name', 'address'], no_marker=True)"/> </div> <div class='card-footer' t-if='not readonly'> <span class='btn-ship' t-att-style="'' if selected else 'display:none;'"> - <a role="button" class="btn btn-block btn-primary"> + <a role="button" href='#' class="btn btn-block btn-primary"> <i class='fa fa-check'></i> Ship to this address </a> </span> <span class='btn-ship' t-att-style="'' if not selected else 'display:none;'"> - <a role="button" class="btn btn-block btn-secondary"> + <a role="button" href='#' class="btn btn-block btn-secondary"> Select this address </a> </span> @@ -1259,7 +1259,7 @@ <div class="col-lg-12"> <div class="checkbox"> <label> - <input type="checkbox" id='shipping_use_same' name='use_same' value="1" checked='checked'/>Ship to the same address + <input type="checkbox" id='shipping_use_same' class="mr8" name='use_same' value="1" checked='checked'/>Ship to the same address <span class='ship_to_other text-muted' style="display: none">&nbsp;(<i>Your shipping address will be requested later) </i></span> </label> </div> diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml index 0a05cdef054..ddf0a24d8c4 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml @@ -25,13 +25,14 @@ <template id="payment_delivery_methods"> <input t-att-value="delivery.id" t-att-id="'delivery_%i' % delivery.id" type="radio" name="delivery_type" t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False" t-att-class="'d-none' if delivery_nb == 1 else ''"/> <label class="label-optional" t-field="delivery.name" t-att-for="'delivery_%i' % delivery.id"/> + <t t-set='badge_class' t-value="(delivery_nb != 1 and 'float-right ' or '') + 'badge badge-secondary'" /> <t t-if="delivery.delivery_type == 'fixed'"> - <span t-if="delivery.fixed_price > 0.0" class="float-right badge badge-secondary" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/> - <span t-else="" class="float-right badge badge-secondary">Free</span> + <span t-if="delivery.fixed_price > 0.0" t-att-class="badge_class" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/> + <span t-else="" t-att-class="badge_class">Free</span> </t> <t t-else=""> - <span class="float-right badge badge-secondary d-none" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/> - <span class="float-right badge badge-secondary o_delivery_compute">Select to compute delivery rate</span> + <span t-attf-class="#{badge_class} d-none" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/> + <span t-attf-class="#{badge_class} o_delivery_compute">Select to compute delivery rate</span> </t> <t t-if="delivery.website_description"> <div t-field="delivery.website_description" class="text-muted mt8"/> diff --git a/addons/website_sale_options/views/website_sale_options_templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml index 5a4c06bdce7..2c71180fdf7 100644 --- a/addons/website_sale_options/views/website_sale_options_templates.xml +++ b/addons/website_sale_options/views/website_sale_options_templates.xml @@ -138,8 +138,8 @@ </table> </main> <footer class="modal-footer"> - <a role="button" class="btn btn-secondary a-submit js_goto_shop" aria-label="Continue shopping" title="Continue shopping"><i class="fa fa-chevron-left"></i> <span class="d-none d-md-inline">Continue Shopping</span><span class="d-inline d-md-none">Continue</span></a> - <a role="button" class="btn btn-primary float-right a-submit" aria-label="Proceed to checkout" title="Proceed to checkout"><i class="fa fa-shopping-cart fa-fw"></i> <span class="d-none d-md-inline">Proceed to Checkout</span><span class="d-inline d-md-none">Checkout</span></a> + <a href="#" role="button" class="btn btn-secondary a-submit js_goto_shop" aria-label="Continue shopping" title="Continue shopping"><i class="fa fa-chevron-left"></i> <span class="d-none d-md-inline">Continue Shopping</span><span class="d-inline d-md-none">Continue</span></a> + <a href="#" role="button" class="btn btn-primary float-right a-submit" aria-label="Proceed to checkout" title="Proceed to checkout"><i class="fa fa-shopping-cart fa-fw"></i> <span class="d-none d-md-inline">Proceed to Checkout</span><span class="d-inline d-md-none">Checkout</span></a> </footer> </div> </div> diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml index 7cbe6d7102e..d852beb42dc 100644 --- a/addons/website_theme_install/views/views.xml +++ b/addons/website_theme_install/views/views.xml @@ -73,7 +73,7 @@ <!-- Actions to list themes with custom kanban (launched on module installation) --> <record id="theme_install_kanban_action" model="ir.actions.act_window"> - <field name="name">Choose a theme for this website</field> + <field name="name">Choose a theme for your website</field> <field name="res_model">ir.module.module</field> <field name="view_mode">kanban</field> <field name="view_id" ref="theme_view_kanban"/> |