merging changes

oscar/static/css/styles.css

@@ -2768,10 +2768,10 @@ body {
   padding: 0px;
   list-style: none;
 }
-.choose_shipping_address .alert-message {
+.choose_shipping_address .alert {
   position: relative;
 }
-.choose_shipping_address .alert-message .delete_address {
+.choose_shipping_address .alert .delete_address {
   position: absolute;
   top: 10px;
   right: 4px;
@@ -2885,7 +2885,7 @@ body {
 .product_pod {
   padding: 8%;
   position: relative;
-  height: 320px;
+  height: 375px;
   overflow: hidden;
   *zoom: 1;
 }
@@ -2912,6 +2912,7 @@ body {
   margin-bottom: 18px;
   margin-top: 9px;
   line-height: 18px;
+  font-size: 16px;
 }
 .product_pod h4:before, .product_pod h4:after {
   display: table;
@@ -2945,6 +2946,9 @@ body {
 .product_pod .product_price form {
   margin-bottom: 0px;
 }
+.product_pod .product_price form input#id_quantity {
+  width: 90%;
+}
 .product_pod .product_price .btn {
   padding-left: 0px;
   padding-right: 0px;
@@ -2953,7 +2957,7 @@ body {
 /* Product list image container */
 .image_container {
   width: 100%;
-  height: 150px;
+  height: 125px;
   overflow: hidden;
   text-align: center;
   margin-bottom: 9px;

oscar/static/js/scrollto/jquery.scrollTo-min.js

@@ -0,0 +1,11 @@
+/**
+ * jQuery.ScrollTo - Easy element scrolling using jQuery.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 5/25/2009
+ * @author Ariel Flesler
+ * @version 1.4.2
+ *
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ */
+;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);

oscar/static/less/page/checkout.less

@@ -54,7 +54,7 @@
   ul {
     .remove_bullets();
   }
-  .alert-message {
+  .alert {
     position:relative;
     .delete_address {
       position:absolute;

oscar/static/less/page/product_lists.less

@@ -29,7 +29,7 @@
 .product_pod {
   padding:8%;
   position:relative;
-  height:320px;
+  height:375px;
   overflow:hidden;
   .clearfix();
   & p {
@@ -48,6 +48,7 @@
     margin-bottom: @baseLineHeight;
     margin-top: @baseLineHeight / 2;
     line-height:@baseLineHeight;
+    font-size:@baseFontSize + 3;
     span {
       float:right;
     }
@@ -72,6 +73,9 @@
     width:84%;
     form {
       margin-bottom:0px;
+      input#id_quantity {
+        width:90%;
+      }
     }
     .btn {
       padding-left:0px;
@@ -83,7 +87,7 @@
 /* Product list image container */
 .image_container {
   width:100%;
-  height:150px;
+  height:125px;
   overflow:hidden;
   text-align: center;
   margin-bottom: @baseLineHeight / 2;

oscar/static/less/responsive.less

@@ -117,6 +117,138 @@
   .carousel-caption {
     position: static;
   }
+  .cart, 
+  h1.span6
+   {
+    display:none!important;
+  }
+  .navbar.accounts {
+    margin-bottom:0px;
+    .brand.hidden {
+      display: inline;
+      padding:6px 10px;
+      font-size:18px;
+    }
+    .nav > li {
+      float:left;
+    }
+  }
+  .navbar.primary {
+    margin-top:0px;
+    .brand.hidden {
+      display: inline;
+      visibility: visible;
+    }
+    .navbar-inner {
+      .border-radius(0px);
+    }
+  }
+  .brand.hidden {
+    visibility: visible;
+  }
+  /*Remove float, widths, heights*/
+  .product_title,
+  .product_assets,
+  .product_description,
+  .product_related,
+  .review_content,
+  .review_votes,
+  .main,
+  .products li,
+  .five li,
+  .four li,
+  .three li,
+  .two li,
+  .product_pod .product_price,
+  .footer_links li,
+  .footer_links .top_page {
+    float:none;
+    margin:0px;
+    width:auto;
+    height:auto;
+  }
+  .products {
+    li {
+      border-bottom:1px solid @grayLighter;
+      padding-bottom:@baseLineHeight;
+      margin-bottom:@baseLineHeight;
+      .product_pod {
+        margin-bottom:15px;
+        height:auto!important;
+        padding:0px;
+        .star {
+          clear:none;
+          margin-left:@quart * 1.15;
+        }
+        .avaliability {
+          text-align:left;
+        }
+        .product_price {
+          h4 {
+            margin-bottom:0px;
+            display:inline;
+            span, del {
+              float:none;
+            }
+          }
+          .btn {
+            width:auto;
+            display:block;
+            padding: 5px 14px 6px;
+            margin-top:5px;
+          }
+        } 
+        .image_container {
+          width:@quart;
+          float:left;
+          margin-right:15px;
+          margin-bottom:0px;
+        }
+        .product_price {
+          position:static;
+        }
+      }
+    }
+  }
+  .star {
+    padding-left:70px;
+  	background:url(../../img/ui/bg-stars-small.png) 0px -4px no-repeat;
+  	height:11px;
+  	line-height:11px;
+  }
+  .star.One {
+  	background-position: 0px -18px;
+  }
+  .star.Two {
+  	background-position: 0px -32px;
+  }
+  .star.Three {
+  	background-position: 0px -47px;
+  }
+  .star.Four {
+  	background-position: 0px -61px;
+  }
+  .star.Five {
+  	background-position: 0px -75px;
+  }
+  .review_content {
+    div {
+     border:none;
+    }
+  }
+  .review_votes {
+    div {
+      padding:0px;
+    }
+  }
+  .footer_links {
+    border-bottom:none;
+    li {
+      border-left:none;
+      margin:0px;
+      padding:0px;
+    }
+  }
 
 }
 

oscar/templates/base.html

@@ -29,13 +29,7 @@
     </head>
     <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
         {% block layout %}{% endblock %}
-		<script type="text/javascript">
-			$(function(){
-				{% block onbodyload %}
-
-				{% endblock %}
-			});
-		</script>
+		
         {% block tracking %}
             {% if not debug and not request.user.is_staff %}
                 <!-- Tracking to go here. -->
@@ -45,6 +39,7 @@
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/jquery/jquery-1.7.1.min.js"><\/script>')</script>
         <script src="{{ STATIC_URL }}js/jquery/jquery.easing.1.3.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ STATIC_URL }}js/scrollto/jquery.scrollTo-min.js" type="text/javascript" charset="utf-8"></script>
         <!-- Bootstrap -->
 		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js"></script>
 		<!-- Elastislide carousel js -->
@@ -55,8 +50,14 @@
         <script src="{{ STATIC_URL }}js/responsivegallery/jquery.tmpl.min.js" type="text/javascript" charset="utf-8"></script>
         <script src="{{ STATIC_URL }}js/responsivegallery/gallery.js" type="text/javascript" charset="utf-8"></script>
         {% endif %}
-        
         <!-- Front end js -->
         <script src="{{ STATIC_URL }}js/script.js" type="text/javascript" charset="utf-8"></script>
+        <script type="text/javascript">
+			$(function(){
+				{% block onbodyload %}
+
+				{% endblock %}
+			});
+		</script>
     </body>
 </html>

oscar/templates/base_dashboard.html

@@ -24,13 +24,7 @@
     </head>
     <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
         {% block layout %}{% endblock %}
-		<script type="text/javascript">
-			$(function(){
-				{% block onbodyload %}
-
-				{% endblock %}
-			});
-		</script>
+		
         {% block tracking %}
             {% if not debug and not request.user.is_staff %}
                 <!-- Tracking to go here. -->
@@ -44,5 +38,12 @@
 		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js"></script>    
         <!-- Front end js -->
         <script src="{{ STATIC_URL }}js/dashboard.js" type="text/javascript" charset="utf-8"></script>
+        <script type="text/javascript">
+			$(function(){
+				{% block onbodyload %}
+
+				{% endblock %}
+			});
+		</script>
     </body>
 </html>

oscar/templates/checkout/shipping_address.html

@@ -6,28 +6,35 @@
 <div class="sub-header">
     <h4>Choose a shipping address from your address book</h4>
 </div>
-<ul>
-	{% for address in addresses %}
-	<li>
-	{{ address.summary }}
-	<form action="{% url checkout:shipping-address %}" method="post">
-		{% csrf_token %}
-		<input type="hidden" name="action" value="ship_to" />
-		<input type="hidden" name="address_id" value="{{ address.id }}" />
-		<input type="submit" value="Ship to this address" />
-	</form>
-	<a href="{% url checkout:user-address-update address.id %}">Edit this address</a>
-	<form action="{% url checkout:user-address-delete address.id %}" method="post">
-		{% csrf_token %}
-		<input type="submit" value="Delete from address book" />
-	</form>
-	</li>
-	{% endfor %}
-</ul>
+<div class="choose_shipping_address">
+    <ul>
+    	{% for address in addresses %}
+    	<li>
+    	<div class="alert alert-info">
+    	<p>{{ address.summary }}</p>
+    	<form action="{% url checkout:shipping-address %}" method="post">
+    		{% csrf_token %}
+    		<input type="hidden" name="action" value="ship_to" />
+    		<input type="hidden" name="address_id" value="{{ address.id }}" />
+    		<input type="submit" value="Ship to this address" class="btn btn-large btn-primary"/>
+    		<p><a href="{% url checkout:user-address-update address.id %}">Edit this address</a></p>
+    	</form>
+    	
+    	<form action="{% url checkout:user-address-delete address.id %}" method="post" class="delete_address">
+    		{% csrf_token %}
+    		<input type="submit" value="Delete from address book" class="btn btn-small" />
+    	</form>
+    	</div>
+    	</li>
+    	{% endfor %}
+    </ul>
+</div>
 </form>
 {% endif %}
 {% if request.user.is_authenticated %}
-    <p><a href="{% url checkout:user-address-create %}" class="btn">Add a new address to your address book</a></p>
+    <div class="form-actions">
+        <a href="{% url checkout:user-address-create %}" class="btn">Add a new address to your address book</a>
+        </div>
 {% endif %}
 
 

oscar/templates/dashboard/orders/order_detail.html

@@ -189,39 +189,6 @@ Order {{ order.number }}
 </table>
 
 <p>With selected lines:</p>
-<<<<<<< HEAD
-<ul>
-    <li><label><input type="radio" name="line_action" value="change_line_statuses" /> Change status to</label>
-	<select name="new_status">
-		<option value=""> -- choose new status -- </option>
-		{% for status in line_statuses %}
-		<option>{{ status }}</option>
-		{% endfor %}
-	</select>
-    </li>
-	<li><label><input type="radio" name="line_action" value="create_shipping_event" /> Create shipping event</label>
-	<select name="shipping_event_type">
-		<option value=""> -- choose event type -- </option>
-		{% for event_type in shipping_event_types %}
-		<option value="{{ event_type.code }}">{{ event_type.name }}</option>
-		{% endfor %}
-	</select>
-	with notes: 
-	<textarea name="reference"></textarea>
-	</li>
-	<li><label><input type="radio" name="line_action" value="create_payment_event" /> Create payment event</label>
-	<select name="payment_event_type">
-		<option value=""> -- choose event type -- </option>
-		{% for event_type in payment_event_types %}
-		<option value="{{ event_type.code }}">{{ event_type.name }}</option>
-		{% endfor %}
-	</select>
-	with amount: 
-	<input type="text" name="amount" value="" />
-	</li>
-=======
->>>>>>> 30ac4fe5d8b4f5dd0e19905d684a07d09bd22200
-
 
 <div class="control-group">
     <div class="controls">

oscar/templates/layout.html

@@ -8,7 +8,7 @@
     <div class="navbar accounts">
     	<div class="navbar-inner">
     		<div class="container-fluid">
-    			<a class="brand hidden" href="{% url promotions:home %}">Oscar // Domain-driven e-Commerce for Django</a>
+    			<a class="brand hidden" href="{% url promotions:home %}">Oscar</a>
     			<ul class="nav pull-right">
     				<li><a href="#">Home</a></li>
     				<li><a href="#about">About</a></li>

oscar/templates/layout_checkout.html

@@ -8,7 +8,7 @@
     <div class="navbar accounts">
         <div class="navbar-inner">
             <div class="container-fluid">
-                <a class="brand hidden" href="{% url promotions:home %}">Oscar // Domain-driven e-Commerce for Django</a>
+                <a class="brand hidden" href="{% url promotions:home %}">Oscar</a>
                 <ul class="nav pull-right">
     				<li><a href="#">Home</a></li>
     				<li><a href="#about">About</a></li>