diff options
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.backend.xml | 18 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.contentMenu.xml | 10 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 4 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.facebook_page.xml | 32 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.gallery.xml | 4 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.pageProperties.xml | 80 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 38 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.share.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 30 |
9 files changed, 113 insertions, 105 deletions
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index a5e14c2c0bc..b61d4503e95 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -21,19 +21,19 @@ <t t-name="website.dashboard_content"> <div class="o_website_dashboard_content"> <div class="row o_dashboard_visits" t-if="widget.groups.website_designer"> - <div class="col-xs-12 o_box"> + <div class="col-12 o_box"> <h2>Visits</h2> <div t-if="widget.dashboards_data.visits && widget.dashboards_data.visits.ga_client_id"> <div class="row js_analytics_components"/> <a href="#" class="js_link_analytics_settings">Edit my Analytics Client ID</a> </div> - <div t-if="!(widget.dashboards_data.visits && widget.dashboards_data.visits.ga_client_id)" class="col-md-12"> + <div t-if="!(widget.dashboards_data.visits && widget.dashboards_data.visits.ga_client_id)" class="col-lg-12"> <div class="o_demo_background"> <div class="o_layer"> </div> <div class="o_buttons text-center"> <h3>There is no data currently available.</h3> - <button class="btn btn-sm btn-primary js_link_analytics_settings center-block mb8">Link my Analytics Account</button> + <button class="btn btn-primary js_link_analytics_settings d-block mx-auto mb8">Link my Analytics Account</button> </div> </div> </div> @@ -42,7 +42,7 @@ </div> </t> - <div t-name="website.unauthorized_analytics" class="col-xs-12 js_unauthorized_message mb16"> + <div t-name="website.unauthorized_analytics" class="col-12 js_unauthorized_message mb16"> <span t-if="reason === 'not_connected'">You need to log in to your Google Account before: </span> <span t-if="reason === 'no_right'">You do not seem to have access to this Analytics Account.</span> <span t-if="reason === 'not_initialized'">Google Analytics initialization failed. Maybe this domain is not whitelisted in your Google Analytics project for this client ID.</span> @@ -61,11 +61,11 @@ </div> <t t-name="website.DateRangeButtons"> - <!-- TODO: Applied hidden-xs class as it is going to push in control panel and it breaks UI, maybe we will improve it in future --> - <div class="btn-group btn-group-sm o_date_range_buttons hidden-xs pull-right"> - <button class="btn btn-sm btn-default js_date_range active" data-date="week">Last Week</button> - <button class="btn btn-sm btn-default js_date_range" data-date="month">Last Month</button> - <button class="btn btn-sm btn-default js_date_range" data-date="year">Last Year</button> + <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future --> + <div class="btn-group o_date_range_buttons d-none d-md-inline-flex float-right"> + <button class="btn btn-secondary js_date_range active" data-date="week">Last Week</button> + <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button> + <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button> </div> </t> diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index 9cabe61a861..abcd94d5764 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -3,14 +3,16 @@ <t t-name="website.contentMenu.dialog.submenu"> <li t-att-data-menu-id="submenu.id"> <div class="input-group"> - <span class="input-group-addon fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/> + <div class="input-group-prepend"> + <span class="input-group-text fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/> + </div> <span class="form-control"> <span class="js_menu_label"> <t t-esc="submenu.name"/> </span> - <i t-if="submenu.is_homepage" class="pull-right fa fa-home" style="margin-top: 3px" role="img" aria-label="Home" title="Home"/> + <i t-if="submenu.is_homepage" class="float-right fa fa-home" style="margin-top: 3px" role="img" aria-label="Home" title="Home"/> </span> - <span class="input-group-btn"> + <span class="input-group-append"> <button type="button" class="btn btn-primary js_edit_menu fa fa-pencil-square-o" aria-label="Edit menu" title="Edit menu"/> <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o" aria-label="Delete menu" title="Delete menu"/> </span> @@ -42,7 +44,7 @@ </t> </ul> <div class="mt32"> - <small class="pull-right text-muted"> + <small class="float-right text-muted"> Drag a menu to the right to create a sub-menu </small> <a href="#" class="js_add_menu"> diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index ad7d326a43b..20045478c8c 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -2,8 +2,8 @@ <templates id="template" xml:space="preserve"> <div t-name="website.homepage_editor_welcome_message" class="container text-center o_homepage_editor_welcome_message"> <h2 class="mt0">Welcome to your <b>Homepage</b>!</h2> - <p class="lead hidden-xs">Let's start designing.</p> - <div class="o_tooltip_container hidden-xs">Follow all the <div class="o_tooltip bottom"/> signs to get your website ready in no time.</div> + <p class="lead d-none d-md-block">Let's start designing.</p> + <div class="o_tooltip_container d-none d-md-block">Follow all the <div class="o_tooltip bottom"/> signs to get your website ready in no time.</div> </div> <div t-name="website.leaving_current_page_edition"> diff --git a/addons/website/static/src/xml/website.facebook_page.xml b/addons/website/static/src/xml/website.facebook_page.xml index 4d362582a7b..7f16b568aec 100644 --- a/addons/website/static/src/xml/website.facebook_page.xml +++ b/addons/website/static/src/xml/website.facebook_page.xml @@ -2,43 +2,43 @@ <templates> <div t-name="website.facebook_page_dialog"> <div class="row"> - <form class="col-md-6 form-horizontal"> - <div class="form-group"> - <label class="control-label col-sm-3">Page URL</label> - <div class="col-sm-9"> + <form class="col-lg-6"> + <div class="form-group row"> + <label class="col-form-label col-md-3">Page URL</label> + <div class="col-md-9"> <input class="form-control o_facebook_page_url" required="required" t-att-value="widget.fbData.href"/> </div> </div> - <div class="form-group o_facebook_tabs"> + <div class="form-group row o_facebook_tabs"> <t t-set="fb_tabs" t-value="widget.fbData.tabs and widget.fbData.tabs.split(',') or []"/> - <label class="control-label col-sm-3">Tabs</label> - <div class="col-sm-3 checkbox"> + <label class="col-form-label col-md-3">Tabs</label> + <div class="col-md-3 checkbox"> <label><input type="checkbox" name="timeline" t-att-checked="_.contains(fb_tabs, 'timeline') or None"/>Timeline</label> </div> - <div class="col-sm-3 checkbox"> + <div class="col-md-3 checkbox"> <label><input type="checkbox" name="events" t-att-checked="_.contains(fb_tabs, 'events') or None"/>Events</label> </div> - <div class="col-sm-3 checkbox"> + <div class="col-md-3 checkbox"> <label><input type="checkbox" name="messages" t-att-checked="_.contains(fb_tabs, 'messages') or None"/>Messages</label> </div> </div> - <div class="form-group o_facebook_options"> - <label class="control-label col-sm-3">Options</label> - <div class="col-sm-9 mt8"> + <div class="form-group row o_facebook_options"> + <label class="col-form-label col-md-3">Options</label> + <div class="col-md-9 mt8"> <label class="o_switch"> <input name="small_header" type="checkbox" t-att-checked="widget.fbData.small_header or None"/> <span/> Use Small Header </label> </div> - <div class="col-sm-offset-3 mt16 col-sm-9"> + <div class="offset-md-3 mt16 col-md-9"> <label class="o_switch"> <input name="hide_cover" type="checkbox" t-att-checked="widget.fbData.hide_cover or None"/> <span/> Hide Cover Photo </label> </div> - <div class="col-sm-offset-3 mt16 col-sm-9"> + <div class="offset-md-3 mt16 col-md-9"> <label class="o_switch"> <input name="show_facepile" type="checkbox" t-att-checked="widget.fbData.show_facepile or None"/> <span/> @@ -47,10 +47,10 @@ </div> </div> </form> - <div class="col-md-6" style="border-left: 1px solid #eeeeee;"> + <div class="col-lg-6" style="border-left: 1px solid #eeeeee;"> <div class="form-group text-center"> <label>Preview</label> - <div class="alert alert-warning hidden facebook_page_warning text-center" role="alert"> + <div class="alert alert-warning d-none facebook_page_warning text-center" role="alert"> <div> <i class="fa fa-exclamation-triangle fa-3x" role="img" aria-label="Warning" title="Warning"></i> </div> diff --git a/addons/website/static/src/xml/website.gallery.xml b/addons/website/static/src/xml/website.gallery.xml index 08226cb911b..0ac854554d7 100644 --- a/addons/website/static/src/xml/website.gallery.xml +++ b/addons/website/static/src/xml/website.gallery.xml @@ -13,8 +13,8 @@ <div t-attf-id="#{id}" class="carousel slide" data-ride="carousel" t-attf-data-interval="#{interval}" style="margin: 0 12px;"> <div class="carousel-inner container" style="padding: 0;"> <t t-foreach="srcs" t-as="src"> - <div t-attf-class="item #{src_index == index and 'active' or ''}"> - <img t-attf-class="img img-responsive #{userStyle}" t-att-src="src" alt="Slide image"/> + <div t-attf-class="carousel-item #{src_index == index and 'active' or ''}"> + <img t-attf-class="img img-fluid #{userStyle}" t-att-src="src" alt="Slide image"/> </div> </t> </div> diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index 61c0c507cf4..7f3b4cbfc64 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -18,7 +18,7 @@ </t> </t> <t t-name="website.show_page_key_dependencies"> - <div class="col-sm-9 col-sm-offset-3"> + <div class="col-md-9 offset-md-3"> <span class="text-muted" id="warn_about_call_message"> <t t-set="depTooltip"> <t t-call="website.get_tooltip_dependencies"/> @@ -39,32 +39,34 @@ <!-- Page Properties --> <div t-name="website.pagesMenu.page_info" class="o_page_management_info"> - <form class="form-horizontal"> + <form> <ul class="nav nav-tabs" role="tablist"> - <li class="active"><a aria-controls="basic_page_info" data-toggle="tab" href="#basic_page_info" role="tab">Name</a></li> - <li><a aria-controls="advances_page_info" data-toggle="tab" href="#advances_page_info" role="tab">Publish</a></li> + <li class="nav-item"><a aria-controls="basic_page_info" role="tab" data-toggle="tab" class="nav-link active" href="#basic_page_info">Name</a></li> + <li class="nav-item"><a aria-controls="advances_page_info" role="tab" data-toggle="tab" class="nav-link" href="#advances_page_info">Publish</a></li> </ul> <div class="tab-content mt16"> <div role="tabpanel" id="basic_page_info" class="tab-pane fade in active"> - <div class="form-group"> - <label class="control-label col-sm-3" for="page_name">Page Name</label> - <div class="col-sm-9"> - <input type="text" class="form-control input-sm" id="page_name" t-att-value="widget.page.name" /> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="page_name">Page Name</label> + <div class="col-md-9"> + <input type="text" class="form-control form-control-sm" id="page_name" t-att-value="widget.page.name" /> </div> </div> <div class="form-group warn_about_call"></div> - <div class="form-group"> - <label class="control-label col-sm-3" for="page_url">Page URL</label> - <div class="col-sm-9"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="page_url">Page URL</label> + <div class="col-md-9"> <div class="input-group"> - <span class="input-group-addon" t-att-title="widget.serverUrl"><small><t t-esc="widget.serverUrlTrunc"/></small></span> - <input type="text" class="form-control input-sm" id="page_url" t-att-value="widget.page.url" /> + <div class="input-group-prepend"> + <span class="input-group-text" t-att-title="widget.serverUrl"><small><t t-esc="widget.serverUrlTrunc"/></small></span> + </div> + <input type="text" class="form-control form-control-sm" id="page_url" t-att-value="widget.page.url" /> </div> </div> </div> - <div class="form-group ask_for_redirect"> - <label class="control-label col-sm-3" for="create_redirect">Redirect Old URL</label> - <div class="col-sm-2"> + <div class="form-group row ask_for_redirect"> + <label class="col-form-label col-md-3" for="create_redirect">Redirect Old URL</label> + <div class="col-md-2"> <a> <label class="o_switch" for="create_redirect" > <input type="checkbox" id="create_redirect"/> @@ -72,13 +74,13 @@ </label> </a> </div> - <div class="col-sm-7 mt4"> + <div class="col-md-7 mt4"> <span class="text-muted" id="dependencies_redirect"></span> </div> </div> - <div class="form-group ask_for_redirect"> - <label class="control-label col-sm-3 redirect_type" for="redirect_type">Type</label> - <div class="col-sm-6 redirect_type"> + <div class="form-group row ask_for_redirect"> + <label class="col-form-label col-md-3 redirect_type" for="redirect_type">Type</label> + <div class="col-md-6 redirect_type"> <select class="form-control" id="redirect_type"> <option t-foreach="widget.fields.type.selection" t-as="field" t-att-value="field[0]"><t t-esc="field[0] + ': ' + field[1]" /></option> </select> @@ -86,53 +88,55 @@ </div> </div> <div role="tabpanel" id="advances_page_info" class="tab-pane fade"> - <div class="form-group"> - <label class="control-label col-sm-3" for="is_menu">Show in Top Menu</label> - <div class="col-sm-2"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="is_menu">Show in Top Menu</label> + <div class="col-md-2"> <label class="o_switch" for="is_menu" > <input type="checkbox" t-att-checked="widget.page.menu_ids.length > 0 ? true : undefined" id="is_menu"/> <span/> </label> </div> </div> - <div class="form-group"> - <label class="control-label col-sm-3" for="is_homepage">Use as Homepage</label> - <div class="col-sm-2"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="is_homepage">Use as Homepage</label> + <div class="col-md-2"> <label class="o_switch" for="is_homepage" > <input type="checkbox" t-att-checked="widget.page.is_homepage ? true : undefined" id="is_homepage"/> <span/> </label> </div> </div> - <div class="form-group"> - <label class="control-label col-sm-3" for="is_indexed"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="is_indexed"> Indexed <i class="fa fa-question-circle-o" title="Hide this page from search results" role="img" aria-label="Info"></i> </label> - <div class="col-sm-2"> + <div class="col-md-2"> <label class="o_switch" for="is_indexed" > <input type="checkbox" t-att-checked="widget.page.website_indexed ? true : undefined" id="is_indexed"/> <span/> </label> </div> </div> - <div class="form-group"> - <label class="control-label col-sm-3" for="is_published">Publish</label> - <div class="col-sm-2"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="is_published">Publish</label> + <div class="col-md-2"> <label class="o_switch js_publish_btn" for="is_published"> <input type="checkbox" t-att-checked="widget.page.website_published ? true : undefined" id="is_published"/> <span/> </label> </div> </div> - <div class="form-group"> - <label class="control-label col-sm-3" for="date_publish">Publishing Date</label> - <div class="col-sm-9"> + <div class="form-group row"> + <label class="col-form-label col-md-3" for="date_publish">Publishing Date</label> + <div class="col-md-9"> <div class='input-group date' id='date_publish_container'> <input type='text' class="form-control" name="date_publish" id="date_publish" /> - <span class="input-group-addon"> - <span class="fa fa-calendar" role="img" aria-label="Publish date" title="Publish date"></span> - </span> + <div class="input-group-append"> + <span class="input-group-text"> + <span class="fa fa-calendar" role="img" aria-label="Publish date" title="Publish date"></span> + </span> + </div> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 08137872596..d9cb1f38f80 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -8,27 +8,27 @@ <div t-name="website.seo_configuration"> <section class="row"> - <div class="col-md-6"> - <div class="form-horizontal mt16" role="form"> - <div class="form-group"> - <label for="seo_page_title" class="col-xs-3 control-label">Page Title</label> - <div class="col-xs-9"> + <div class="col-lg-6"> + <div class="mt16" role="form"> + <div class="form-group row"> + <label for="seo_page_title" class="col-3 col-form-label">Page Title</label> + <div class="col-9"> <input type="text" name="seo_page_title" class="form-control" maxlength="70" size="70"/> </div> </div> - <div class="form-group"> - <label for="seo_page_description" class="col-xs-3 control-label">Description</label> - <div class="col-xs-9"> + <div class="form-group row"> + <label for="seo_page_description" class="col-3 col-form-label">Description</label> + <div class="col-9"> <textarea name="seo_page_description" class="form-control" style="max-width: 100%;height:145px;max-height:145px" t-att-maxlength="widget.maxDescriptionSize"/> </div> </div> </div> </div> - <div class="col-md-6"> + <div class="col-lg-6"> <h5 class="mt16">Preview <small>how your page will be listed on Google</small></h5> - <div class="well"> - <div class="panel mb0"> - <div class="panel-body"> + <div> + <div class="card mb0"> + <div class="card-body"> <div class="js_seo_preview"/> </div> </div> @@ -46,10 +46,10 @@ <div class="form-inline" role="form"> <div class="input-group"> <input type="text" style="min-width:170px" name="seo_page_keywords" class="form-control" placeholder="Keyword" maxlength="30"/> - <span class="input-group-btn"> + <span class="input-group-append"> <select name="seo_page_language" id="language-box" class="btn form-control"/> </span> - <span class="input-group-btn"> + <span class="input-group-append"> <button data-action="add" class="btn btn-success" type="button">Add</button> </span> </div> @@ -63,10 +63,10 @@ <td/> <td><hr/> <small class="text-muted">Legend:</small> - <span class="label label-default">Not used</span> - <span class="label label-success">In title</span> - <span class="label label-primary">In description</span> - <span class="label label-info">In page's content</span> + <span class="badge badge-secondary">Not used</span> + <span class="badge badge-success">In title</span> + <span class="badge badge-primary">In description</span> + <span class="badge badge-info">In page's content</span> </td> </tr> </tfoot> @@ -106,7 +106,7 @@ </t> <t t-name="website.seo_suggestion"> - <li class="oe_seo_suggestion"> + <li class="list-inline-item oe_seo_suggestion"> <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_suggestion" t-att-data-keyword="widget.keyword"> <t t-raw="widget.keyword"/> </span> diff --git a/addons/website/static/src/xml/website.share.xml b/addons/website/static/src/xml/website.share.xml index b534f6e9cc7..d78c1babc46 100644 --- a/addons/website/static/src/xml/website.share.xml +++ b/addons/website/static/src/xml/website.share.xml @@ -2,7 +2,7 @@ <templates id="template" xml:space="preserve"> <t t-name="website.social_hover"> <div class="row clearfix" style='font-size:16px'> - <div class="col-xs-12 css_editable_mode_hidden"> + <div class="col-12 css_editable_mode_hidden"> <t t-foreach="medias" t-as="media"> <a style="cursor: pointer" t-attf-class="fa-stack fa-lg share #{media}" t-att-aria-label="media" t-att-title="media"> <span class="fa fa-square fa-stack-2x"></span> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index bdd5aa42941..e391fcfd5f8 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -9,12 +9,12 @@ <h3 class="modal-title"><t t-esc="window_title"/></h3> </header> <main class="modal-body"> - <form class="form-horizontal" role="form" t-att-id="id"> - <div class="form-group mb0"> - <label for="page-name" class="col-sm-3 control-label"> + <form role="form" t-att-id="id"> + <div class="form-group row mb0"> + <label for="page-name" class="col-md-3 col-form-label"> <t t-esc="field_name"/>: </label> - <div class="col-sm-8"> + <div class="col-md-8"> <input t-if="field_type == 'input'" type="text" class="form-control" required="required"/> <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5"></textarea> <select t-if="field_type == 'select'" class="form-control"></select> @@ -23,8 +23,8 @@ </form> </main> <footer class="modal-footer"> - <button type="button" class="btn btn-sm btn-primary btn-continue">Continue</button> - <button type="button" class="btn btn-sm btn-default" data-dismiss="modal" aria-label="Cancel">Cancel</button> + <button type="button" class="btn btn-primary btn-continue">Continue</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal" aria-label="Cancel">Cancel</button> </footer> </div> </div> @@ -62,15 +62,17 @@ </div> <div t-name="website.rename_page"> - <div class="well"> - <form class="form-horizontal"> - <div class="form-group mb0"> - <label for="new_name" class="control-label col-sm-4">Rename Page To:</label> - <div class="col-sm-8"> - <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/> + <div class="card"> + <div class="card-body"> + <form> + <div class="form-group row mb0"> + <label for="new_name" class="col-form-label col-md-4">Rename Page To:</label> + <div class="col-md-8"> + <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/> + </div> </div> - </div> - </form> + </form> + </div> </div> <t t-call="website.dependencies"/> </div> |