[MERGE] from trunk

bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb

2 files changed, 22 insertions, 15 deletions

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 4630e1f294b..96a38a75d32 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -6,16 +6,18 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
-                        <h3 class="modal-title js_seo_page_url"></h3>
-                        <h4 class="text-muted">Get this page efficiently referenced in Google to attract more visitors.</h4>
+                        <div class="h2">Promote This Page</div>
+                        <div class="text-muted">
+                            Get this page efficiently referenced in Google to attract more visitors.
+                        </div>
                     </div>
                     <div class="modal-body">
                         <div class="js_seo_tips" />
                         <section class="js_seo_keywords_list">
-                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <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-lg-2 control-label">New keyword</label>
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Add keywords:</label>
                                     <div class="col-lg-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
@@ -26,12 +28,12 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="text-muted">Most searched topics related your keywords, ordered by importance:</span>
+                            <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. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
-                            <div class="form-horizontal" role="form">
+                            <h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
+                            <div class="form-horizontal mt16" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
                                     <div class="col-lg-8">
@@ -52,22 +54,27 @@
                                 <!-- filled in JS -->
                             </div>
                         </section>
-                        <hr/>
-                        <section>
-                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
-                        </section>
+                    </div><div class="modal-footer">
+                        <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button>
+                        <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button>
                     </div>
                 </div>
             </div>
         </div>
     </t>
 
-    <t t-name="website.seo_list">
-        <ul class="list-inline">
+    <t t-name="website.seo_suggestion_list">
+        <ul class="list-inline mb0">
             <!-- filled in JS -->
         </ul>
     </t>
 
+    <t t-name="website.seo_list">
+        <div>
+            <!-- filled in JS -->
+        </div>
+    </t>
+
     <t t-name="website.seo_tip">
         <div t-attf-class="alert alert-#{ widget.type }">
             <t t-raw="widget.message"/>
@@ -75,7 +82,7 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <dl class="dl-horizontal">
+        <dl class="dl-horizontal mt8 mb8">
             <dt>
                 <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
                     <a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 38e3b82529d..e5dde368154 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -40,7 +40,7 @@
                             OpenERP shows you a preview of the building block
                             in the page.  You must release the block when the
                             preview is visible.
-                        </p>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>