summaryrefslogtreecommitdiff
path: root/addons/website/static/src/xml
diff options
context:
space:
mode:
Diffstat (limited to 'addons/website/static/src/xml')
-rw-r--r--addons/website/static/src/xml/website.gallery.xml8
-rw-r--r--addons/website/static/src/xml/website.seo.xml119
-rw-r--r--addons/website/static/src/xml/website.translator.xml2
-rw-r--r--addons/website/static/src/xml/website.xml65
4 files changed, 71 insertions, 123 deletions
diff --git a/addons/website/static/src/xml/website.gallery.xml b/addons/website/static/src/xml/website.gallery.xml
index 36a81cd9bf5..2e879f0f7d5 100644
--- a/addons/website/static/src/xml/website.gallery.xml
+++ b/addons/website/static/src/xml/website.gallery.xml
@@ -10,7 +10,7 @@
-->
<t t-name="website.gallery.dialog.upload">
- <div class="modal website_modal fade" >
+ <div class="modal o_website_modal fade" >
<div class="modal-dialog" style="max-width: 50%;">
<div class="modal-content">
<div class="modal-header">
@@ -69,9 +69,9 @@
<a class="carousel-control right" t-attf-href="##{id}" data-slide="next"><span class="fa fa-chevron-right" /></a>
</div> <!-- carousel-id -->
<script type="text/javascript">
- (function() {
+ (function () {
$(".slideshow").css("height", Math.round(window.innerHeight*0.7));
- $(window).on("resize", function() { $(".slideshow").css("height", Math.round(window.innerHeight*0.7)); });
+ $(window).on("resize", function () { $(".slideshow").css("height", Math.round(window.innerHeight*0.7)); });
})();
</script>
</t>
@@ -88,7 +88,7 @@
-->
<t t-name="website.gallery.slideshow.lightbox">
- <div class="modal website_modal fade" aria-labbelledby="Image Gallery Dialog" aria-hidden="true">
+ <div class="modal o_website_modal fade" aria-labbelledby="Image Gallery Dialog" aria-hidden="true">
<div class="modal-dialog modal-lg" role="Picture Gallery"
t-attf-style="min-width: #{dim.min_width}px ; min-height: #{dim.min_height}px ; max-width: #{dim.max_width}px ; max-height: #{dim.max_height}px ; height: #{dim.height}px ;">
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 2d817f67720..57f3cc76a31 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -11,85 +11,58 @@
</t>
</t>
- <t t-name="website.seo_configuration">
- <div class="modal website_modal fade oe_seo_configuration js_seo_configuration" tabindex="-1" role="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
- <div class="h2">Promote This Page</div>
- <div class="text-muted">
- Get this page efficiently referenced in Google to attract more visitors.
+ <div t-name="website.seo_configuration">
+ <div class="js_seo_tips" />
+ <section class="js_seo_keywords_list">
+ <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
+ <div class="form-horizontal" role="form">
+ <div class="form-group">
+ <label for="seo_page_keywords" class="col-sm-3 control-label">Add keyword:</label>
+ <div class="col-sm-4">
+ <div>
+ <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
</div>
</div>
- <div class="modal-body">
- <div class="js_seo_tips" />
- <section class="js_seo_keywords_list">
- <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
- <div class="form-horizontal" role="form">
- <div class="form-group">
- <label for="seo_page_keywords" class="col-sm-3 control-label">Add keyword:</label>
- <div class="col-sm-4">
- <div>
- <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
- </div>
- </div>
- </div>
- <div class="row mt8">
- <label for="seo_page_language" class="col-sm-3 control-label">Language:</label>
- <div>
- <div class="col-sm-4">
- <select name="seo_page_language" id="language-box" class="form-control"/>
- </div>
- </div>
- </div>
- <div class="row mt8">
- <div class="col-md-10 text-center">
- <button data-action="add" class="btn btn-default" type="button">Add</button>
- </div>
- </div>
- </div>
- <span class="text-muted">Most searched topics related to your keywords, ordered by importance:</span>
- <!-- filled in JS -->
- </section>
- <section>
- <h3 class="page-header">2. Reference Your Page <small>using above suggested keywords</small></h3>
- <div class="form-horizontal mt16" role="form">
- <div class="form-group">
- <label for="seo_page_title" class="col-sm-2 control-label">Title</label>
- <div class="col-sm-8">
- <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-sm-2 control-label">Description</label>
- <div class="col-sm-8">
- <textarea name="seo_page_description" class="form-control" rows="3" cols="70" t-att-maxlength="widget.maxDescriptionSize"/>
- </div>
- </div>
- </div>
- </section>
- <section>
- <h3 class="page-header">3. Preview <small>how your page will be listed on Google</small></h3>
- <div class="js_seo_preview"></div>
- </section>
- <!--
- <section class="js_image_section">
- <h3 class="page-header">4. Describe your images</h3>
- <div class="row js_seo_image_list">
- </div>
- </section>
- -->
+ </div>
+ <div class="row mt8">
+ <label for="seo_page_language" class="col-sm-3 control-label">Language:</label>
+ <div>
+ <div class="col-sm-4">
+ <select name="seo_page_language" id="language-box" class="form-control"/>
+ </div>
</div>
- <div class="modal-footer">
- <button type="button" data-action="update" class="btn btn-primary">Save</button>
- or
- <a data-action="discard" data-dismiss="modal" href="#" >Discard</a>
+ </div>
+ <div class="row mt8">
+ <div class="col-md-10 text-center">
+ <button data-action="add" class="btn btn-default" type="button">Add</button>
</div>
</div>
</div>
- </div>
- </t>
+ <span class="text-muted">Most searched topics related to your keywords, ordered by importance:</span>
+ <!-- filled in JS -->
+ </section>
+ <section>
+ <h3 class="page-header">2. Reference Your Page <small>using above suggested keywords</small></h3>
+ <div class="form-horizontal mt16" role="form">
+ <div class="form-group">
+ <label for="seo_page_title" class="col-sm-2 control-label">Title</label>
+ <div class="col-sm-8">
+ <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-sm-2 control-label">Description</label>
+ <div class="col-sm-8">
+ <textarea name="seo_page_description" class="form-control" rows="3" cols="70" t-att-maxlength="widget.maxDescriptionSize"/>
+ </div>
+ </div>
+ </div>
+ </section>
+ <section>
+ <h3 class="page-header">3. Preview <small>how your page will be listed on Google</small></h3>
+ <div class="js_seo_preview"></div>
+ </section>
+ </div>
<t t-name="website.seo_suggestion_list">
<ul class="list-inline mb0">
diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index 9506813b7b1..4185f418fcc 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -6,7 +6,7 @@
</t>
<t t-name="website.TranslatorDialog">
- <div class="modal website_modal fade oe_website_translator" tabindex="-1" role="dialog">
+ <div class="modal o_website_modal fade oe_website_translator" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 184b6f037a5..8bfccbd25dd 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -1,49 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates id="template" xml:space="preserve">
- <t t-name="website.mobile_preview">
- <div class="modal website_modal fade oe_mobile_preview" tabindex="-1" role="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
- <h3 class="modal-title">Mobile preview</h3>
- </div>
- <div class="modal-body">
- <iframe id="mobile-viewport" class="oe_mobile_viewport" style="width: 326px"></iframe>
- </div>
- </div>
- </div>
- </div>
+ <t t-extend="Dialog">
+ <t t-jquery=".modal-dialog">
+ $(this).parent().addClass('o_website_modal');
+ </t>
</t>
- <t t-name="website.error_dialog">
- <div class="modal website_modal fade" tabindex="-1" role="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
- <div class="h2"><t t-esc="title"/></div>
- </div>
- <div class="modal-body" t-if="message or backend_url">
- <section>
- <t t-raw="message"/>
- </section>
- <section class="mt32" t-if="backend_url">
- <p>The web site has encountered an error.</p>
- <p>
- It might be possible to edit the relevant items
- or fix the issue in <a t-attf-href="#{backend_url}">
- the classic Odoo interface</a>.
- </p>
- </section>
- </div>
- <div class="modal-footer">
- <button type="button" data-dismiss="modal" class="btn btn-primary">Close</button>
- </div>
- </div>
- </div>
- </div>
- </t>
+ <div t-name="website.mobile_preview">
+ <iframe id="mobile-viewport" t-att-src="widget.mobile_src"/>
+ </div>
+
+ <div t-name="website.error_dialog">
+ <section t-if="message">
+ <t t-raw="message"/>
+ </section>
+ <section class="mt32" t-if="backend_url">
+ <p>The web site has encountered an error.</p>
+ <p>It might be possible to edit the relevant items or fix the issue in <a t-attf-href="#{backend_url}"> the classic Odoo interface</a>.</p>
+ </section>
+ </div>
<t t-name="website.prompt">
<t t-call="website.modal_base">
@@ -63,7 +38,7 @@
</t>
<t t-name="website.modal_base">
- <div class="modal website_modal " tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal o_website_modal " tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<t t-call="website.modal_header" />
@@ -84,8 +59,8 @@
<t t-name="website.modal_footer">
<div class="modal-footer">
- <button type="button" class="btn btn-primary btn-continue">Continue</button>
- <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+ <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-hidden="true">Cancel</button>
</div>
</t>