Merge branch 'release/3.4.0.15'

openlabs · Apr 20, 2015 · 4e5fcfc · 4e5fcfc
2 parents af43e56 + 28751c5
commit 4e5fcfc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/static/css/style.css b/static/css/style.css
@@ -647,11 +647,6 @@ li.google-plus a:hover, li.google a:active{
  padding: 10px 0 10px 20px !important;
 
 }
-.filter-by{
-  margin-bottom: -34px;
-  float: right;
-  margin-right: 20px;
-}
 @media(max-width: 768px){
   .modal-dialog{
     width: 100%;
@@ -662,11 +657,6 @@ li.google-plus a:hover, li.google a:active{
   .no-pad-xs{
     padding: 0;
   }
-  .filter-by{
-    margin-bottom: 0;
-    float: none;
-    margin-right: 0;
-  }
 }
 
 
@@ -1793,7 +1783,4 @@ h3.product-item-name{
 }
 .margin-auto{
   margin: auto;
-}
-.my-account-order > h4{
-  margin-top: 0;
 }
diff --git a/templates/webshop/sale.jinja b/templates/webshop/sale.jinja
@@ -19,8 +19,12 @@
 
       {% if not current_user.is_anonymous() %}
         {{ account_header(_('My Account / Order #') + sale.reference, 'orders') }}
+        <div class="col-md-10">
+      {% else %}
+        <h4 class="text-center">{{ _('Order #') + sale.reference }}</h4>
+        <br>
+        <div class="col-md-12">
       {% endif %}
-      <div class="col-md-10">
         <!--My Orders-->
         <div class="cart-table">
           <div class="row-fluid">

diff --git a/templates/webshop/sales.jinja b/templates/webshop/sales.jinja
@@ -6,7 +6,7 @@
 <!-- My Orders Page starts here -->
 <section class="my-account">
   <div class="container">
-    <div class="filter-by">
+    <div class="filter-by hidden-sm hidden-xs">
       <div class="dropdown pull-right">
         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
           {% if request.args.get('filter_by') %}Filtered by {{ request.args.get('filter_by')|title }} orders {% else %} Filter by orders state {% endif %}
@@ -21,7 +21,7 @@
       </div>
     </div>
     <div class="col-md-12 my-account-order">
-      {{ account_header(_('My Account '), 'orders') }}
+      {{ account_header(_('My Account'), 'orders') }}
         <!--My Orders-->
         {% if sales %}
         <div class="col-md-10 no-pad-xs">
@@ -81,7 +81,7 @@
                 </div>
               </div>
               <div class="panel-body">
-                <div class="col-md-8">
+                <div class="col-md-8 col-xs-8">
                   <div class="orderd-products">
                       {% for line in sale.lines %}
                       <div class="row margin-bottom-10">
@@ -90,7 +90,7 @@
                           <a href="{{ url_for('product.product.render', uri=line.product.uri) }}" class="product-name">{{ line.description }}</a>
                         </div>
                       {% else %}
-                        <div class="col-md-6">
+                        <div class="col-md-7 col-xs-8">
                           <a class="product-name">{{ line.description }}</a>
                         </div>
                       {% endif %}
@@ -101,7 +101,7 @@
                       {% endfor %}
                   </div>
                 </div>
-                <div class="col-md-4 text-right">
+                <div class="col-md-4 col-xs-4 text-right">
                   {% for invoice in sale.invoices %}
                   {% if invoice.state == "paid" %}
                   <a href="{{ url_for('account.invoice.download_invoice', active_id=invoice.id) }}" class="text-muted download-invoice">

diff --git a/tryton.cfg b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0.14
+version=3.4.0.15
 depends:
     nereid
     nereid_cms