[MERGE] from parent branch

bzr revid: xmo@openerp.com-20130913145530-p1gm7k7ie5t3powp

2 files changed, 64 insertions, 23 deletions

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index f0cbd4913c7..9471733e25c 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="website.seo_configuration">
-        <div class="modal fade oe_seo_configuration" tabindex="-1" role="dialog">
+        <div class="modal fade oe_seo_configuration js_seo_configuration" 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.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index f4c83c18fb3..be1304a9d5c 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -27,6 +27,7 @@
                 <div class="dropdown oe_options">
                     <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                        <li class="divider"></li>
                         <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
@@ -53,7 +54,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
     </div>
 
-    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-childs='.row'>
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-vertical-childs='.row'>
         <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
@@ -66,28 +67,27 @@
         <li class='oe_snippet_options'>
             <a href="#" class="button js_remove">Remove current layer</a>
         </li>
-        <li>
-            <div class="dropdown">
-                <a data-toggle="dropdown" href="#">test</a>
-                <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                    <li>inside</li>
-                </ul>
-            </div>
-        </li>
         <li class='oe_snippet_options'>
-            <select name="carousel-background">
-                <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
-                <option value="/website/static/src/img/landscape.png">landscape</option>
-                <option value="/website/static/src/img/aqua.jpg">aqua</option>
-            </select>
-        </li>
-        <li class='oe_snippet_options'>
-            <select name="carousel-style">
-                <option value="no_image">No image</option>
-                <option value="image_left">Image left</option>
-                <option value="image_right">Image right</option>
-            </select>
+            <a class="carousel-background">
+                Background
+                <select class="form-control" name="carousel-background">
+                    <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
+                    <option value="/website/static/src/img/landscape.png">landscape</option>
+                    <option value="/website/static/src/img/aqua.jpg">aqua</option>
+                </select>
+                <input class="form-control input-sm" type="text" placeholder="http://...."/>
+            </a>
         </li>
+        <!--li class='oe_snippet_options'>
+            <a class="carousel-style">
+                Style
+                <select class="form-control" name="carousel-style">
+                    <option value="no_image">No image</option>
+                    <option value="image_left">Image left</option>
+                    <option value="image_right">Image right</option>
+                </select>
+            </a>
+        </li-->
 
         <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail oe_label'>carousel</div>
@@ -98,7 +98,7 @@
             <div class="carousel-inner">
                 <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
                     <div class="container">
-                        <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                        <div class="content mt48 mb48" data-snippet-id='resize'>
                             <h1>Create Awesome Websites</h1>
                             <h3>Super easy, fully flexible</h3>
                             <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
@@ -149,6 +149,47 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-7">
+                    <h4 class="mt16">Mollit Anim</h4>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                </div>
+                <div class="col-md-5">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+                </div>
+            </div>
+        </section>
+    </div>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-5">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+                </div>
+                <div class="col-md-7">
+                    <h4 class="mt16">Mollit Anim</h4>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                </div>
+            </div>
+        </section>
+    </div>
+
     <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
         <section class="oe_snippet_body container">