[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20140318054255-3c32y4fnogjfb83v

diff --cc addons/website/views/snippets.xml
index fbf950a,cdc4bd8..cb641c2
--- 1/addons/website/views/snippets.xml
--- 2/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@@ -949,10 -922,69 +922,69 @@@
          </li>
      </div>
  
- </div>
+     <div data-snippet-option-id='carousel-style'
+         data-selector="div[data-snippet-id='carousel']">
+         <li class="dropdown-submenu" data-required="true">
+             <a tabindex="-1" href="#">Layout</a>
+             <ul class="dropdown-menu">
+                 <li data-value="text_only"><a>Text Only</a></li>
+                 <li data-value="image_text"><a>Image - Text</a></li>
+                 <li data-value="text_image"><a>Text - Image</a></li>
+             </ul>
+         </li>
+     </div>
  
+     <div data-snippet-option-id='carousel'
+         data-selector=".carousel">
+         <li class="divider"></li>
+         <li>
+             <a href="#" class="button js_add">Add Slide</a>
+         </li>
+         <li>
+             <a href="#" class="button js_remove">Remove Slide</a>
+         </li>
      </div>
- </div>
+ 
+     <div data-snippet-option-id='margin-y'
+         data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
+     </div>
+ 
+     <div data-snippet-option-id='resize'
+         data-selector="section, .carousel, .parallax"
+         data-selector-children=".oe_structure, [data-oe-type=html]">
+         <li>
+             <a href="#" class="button js_size_auto">Size Automatic</a>
+         </li>
+     </div>
+ 
+     <div data-snippet-option-id='margin-x'
+         data-selector=".row > [class*='col-md-']"
+         data-selector-vertical-children='.row'>
+     </div>
+ 
+     <div data-snippet-option-id='content'
+         data-selector="blockquote, .well, .panel, .oe_share"
+         data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel, .oe_share"
+         data-selector-children=".content">
+     </div>
+ 
+     <div data-snippet-option-id='parallax'
+         data-selector=".parallax">
+         <li class="dropdown-submenu">
+             <a tabindex="-1" href="#">Scroll Speed</a>
+             <ul class="dropdown-menu" name="parallax-scroll">
+                 <li data-value="0"><a>Static</a></li>
+                 <li data-value="0.3"><a>Very Slow</a></li>
+                 <li data-value="0.6"><a>Slow</a></li>
+                 <li data-value="1"><a>Fixed</a></li>
+                 <li data-value="1.4"><a>Fast</a></li>
+                 <li data-value="1.7"><a>Very Fast</a></li>
+             </ul>
+         </li>
+     </div>
+ 
  </template>
+ 
+ 
  </data>
 -</openerp>
 +</openerp>