[IMP] fixes bootstrap

bzr revid: fp@openerp.com-20130829220425-xxyub3uvrmdi13j4

1 files changed, 62 insertions, 48 deletions

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index f5f13f7bbcd..53715824c53 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -2,36 +2,38 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
+
     <t t-name="website.editorbar">
-        <div class="navbar-inverse navbar-fixed-top">
+        <div class="navbar navbar-inverse navbar-fixed-top">
             <div id="website-top-view">
-                <form class="navbar-form navbar-left">
-                    <button data-action="edit" class="btn btn-primary">Edit</button>
-                </form>
-                <ul class="nav navbar-nav navbar-right">
-                    <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
-                    <li class="divider-vertical"></li>
-                    <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
-                    <li><a href="#">Translate</a></li>
-                    <li class="dropdown">
-                        <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1" id="customize-menu">
-                            <!-- filled in JS -->
-                        </ul>
-                    </li>
-                    <li>
-                        <a href="/admin#action=website.action_module_website">Apps</a>
-                    </li>
-                </ul>
-            </div>
-            <div id="website-top-edit">
-                <form class="navbar-form navbar-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
-                </form>
-                <ul class="nav navbar-nav navbar-right">
-                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-                </ul>
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-edit-collapse">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <form class="navbar-form navbar-left">
+                        <button data-action="edit" class="btn btn-primary">Edit</button>
+                    </form>
+                </div>
+                <div class="collapse navbar-collapse navbar-edit-collapse">
+                    <ul class="nav navbar-nav navbar-right">
+                        <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
+                        <li class="divider-vertical"></li>
+                        <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
+                        <li><a href="#">Translate</a></li>
+                        <li class="dropdown">
+                            <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu" id="customize-menu">
+                                <!-- filled in JS -->
+                            </ul>
+                        </li>
+                        <li>
+                            <a href="/admin#action=website.action_module_website">Apps</a>
+                        </li>
+                    </ul>
+                </div>
             </div>
         </div>
     </t>
@@ -54,44 +56,56 @@
         <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="js_seo_page_url" aria-hidden="true">
             <div class="modal-header">
                 <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3>Promote your page on the Web</h3>
-                <br/>
-                <span class="js_seo_page_url"></span>
+                <h2>Promote <small class="js_seo_page_url"></small></h2>
+                <h4>Get your page efficiently referenced in Google to attract more visitors with relevant content.</h4>
             </div>
             <div class="modal-body">
-                <div class="control-group">
+                <div class="js_seo_tips" />
+
+                <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                <div class="control-group form-horizontal oe_seo_keywords_area">
+                    <label class="control-label" for="seo_page_keywords">Keyword</label>
+                    <div class="controls">
+                        <div class="input-append">
+                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder=""/>
+                            <button data-action="add" class="btn" type="button">Add</button>
+                        </div>
+                        <div class="container oe_seo_keywords_list js_seo_keywords_list">
+
+                                <!-- filled in JS -->
+
+                        </div>
+                    </div>
+                </div>
+
+                <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="control-group form-horizontal">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
                         <input type="text" name="seo_page_title" maxlength="70" size="70"/>
                     </div>
                 </div>
-                <div class="control-group">
+                <div class="control-group form-horizontal">
                     <label class="control-label" for="seo_page_description">Description</label>
                     <div class="controls">
                         <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
                     </div>
                 </div>
-                <div class="control-group oe_seo_keywords_area">
-                    <label class="control-label" for="seo_page_keywords">Keywords</label>
-                    <div class="controls">
-                        <div class="input-append">
-                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder="New keyword"/>
-                            <button data-action="add" class="btn" type="button">Add</button>
-                        </div>
-                        <ul class="oe_seo_keywords_list js_seo_keywords_list">
-                            <!-- filled in JS -->
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
+                <hr/>
                 <a data-action="update" href="#" class="btn btn-primary">Update page</a>
             </div>
         </div>
     </t>
 
+    <t t-name="website.seo_tip">
+        <div t-attf-class="alert alert-#{widget.type}">
+              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
+              <t t-raw="widget.message"/>
+        </div>
+    </t>
+
     <t t-name="website.seo_keyword">
-        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></li>
+        <div class="oe_seo_keyword"><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></div>
     </t>
 
     <t t-name="website.carousel">