From 3430cef9a4bff9fcac2b4bfafb835ded659cc3fa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 29 Sep 2013 18:06:35 +0200
Subject: [PATCH] [IMP] design shop

bzr revid: fp@openerp.com-20130929160635-ye56hhpj5ycbzltt
---
 addons/website_sale/views/website_sale.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 61baf3e9406..d3f5b09de1e 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -123,18 +123,17 @@
                 <div class="row">
                     <div class="col-sm-4">
                         <h1>Our Products</h1>
-                    </div><div class="col-sm-4 pagination text-center">
-                        <a t-if="editable" t-href="/shop/#{ category_id and ('category/%s/' % category_id) or ''}add_product/" class="btn btn-default">New Product</a>
-                    </div><div class="col-sm-4">
-                        <form t-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="pull-right pagination">
-                            <div class="input-group">
-                                <span class="input-group-addon"><span class="glyphicon glyphicon-search"/></span>
+                    </div><div class="col-sm-2 pagination text-center">
+                        <a t-if="editable" t-href="/shop/#{ category_id and ('category/%s/' % category_id) or ''}add_product/" class="btn btn-primary btn-default">New Product</a>
+                    </div><div class="col-sm-6">
+                        <t t-call="website.pager">
+                            <t t-set="classname">pull-right</t>
+                        </t>
+                        <form t-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="pull-right pagination form-inline" style="padding-right: 5px;">
+                            <div class="form-group">
                                 <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search or ''"/>
                             </div>
                         </form>
-                        <t t-call="website.pager">
-                            <t t-set="classname">pull-left</t>
-                        </t>
                     </div>
                 </div>
 
@@ -162,7 +161,7 @@
 
                                 <div class="css_options" t-ignore="true">
                                   <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
-                                    <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown"> Style options <span class="caret"></span></a>
+                                    <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
                                       <li class='dropdown-submenu'>
                                         <a tabindex="-1" href="#">Size</a>