Slight tweaks to reviews and login/logout urls in layout

oscar/apps/customer/__init__.py

@@ -1,7 +1,8 @@
 from django.conf.urls.defaults import patterns, url, include
 from django.contrib.auth.decorators import login_required
 from oscar.apps.customer.views import AccountSummaryView, OrderHistoryView, \
-    OrderHistoryView, OrderDetailView, OrderLineView, AddressListView, AddressCreateView, AddressUpdateView, AddressDeleteView
+    OrderDetailView, OrderLineView, AddressListView, AddressCreateView, \
+    AddressUpdateView, AddressDeleteView, EmailHistoryView, EmailDetailView
 from oscar.core.application import Application
 
 class CustomerApplication(Application):
@@ -13,12 +14,14 @@ class CustomerApplication(Application):
     address_list_view = AddressListView
     address_create_view = AddressCreateView
     address_update_view = AddressUpdateView
-    address_delete_view = AddressDeleteView 
+    address_delete_view = AddressDeleteView
+    email_list_view = EmailHistoryView
+    email_detail_view = EmailDetailView
 
     def get_urls(self):
         urlpatterns = patterns('django.contrib.auth.views',
             url(r'^login/$', 'login', {'template_name': 'admin/login.html'}, name='login'),
-            url(r'^logout/$', 'login', name='logout'),
+            url(r'^logout/$', 'logout', name='logout'),
         )
         
         urlpatterns += patterns('',
@@ -27,10 +30,12 @@ class CustomerApplication(Application):
             url(r'^orders/(?P<order_number>[\w-]*)/$', login_required(self.order_detail_view.as_view()), name='order'),
             url(r'^orders/(?P<order_number>[\w-]*)/(?P<line_id>\w+)$', login_required(self.order_line_view), name='order-line'),
             url(r'^addresses/$', login_required(self.address_list_view.as_view()), name='address-list'),
-            url(r'^addresses/add/$', login_required(self.address_create_view.as_view()), name='address-create'),            
+            url(r'^addresses/add/$', login_required(self.address_create_view.as_view()), name='address-create'),
             url(r'^addresses/(?P<pk>\d+)/$', login_required(self.address_update_view.as_view()), name='address-detail'),
-            url(r'^addresses/(?P<pk>\d+)/delete/$', login_required(self.address_delete_view.as_view()), name='address-delete'),            
-        )
+            url(r'^addresses/(?P<pk>\d+)/delete/$', login_required(self.address_delete_view.as_view()), name='address-delete'),
+            url(r'^emails/$', login_required(self.email_list_view.as_view()), name='email-list'),
+            url(r'^emails/(?P<email_id>\d+)/$', login_required(self.email_detail_view.as_view()), name='email-detail'),
+            )
         return urlpatterns
 
-application = CustomerApplication()
+application = CustomerApplication()

oscar/apps/product/__init__.py

@@ -37,7 +37,7 @@ class NavigationApplication(Application):
         )
         return urlpatterns
     
-class ProductApplication(BaseProductApplication, ReviewsApplication, NavigationApplication):
+class ProductApplication(BaseProductApplication, ReviewsApplication):
     """
     Composite class combining Products with Reviews
     """

oscar/apps/product/reviews/abstract_models.py

@@ -65,8 +65,8 @@ class AbstractProductReview(models.Model):
     def get_absolute_url(self):
         return ('products:reviews-detail', (), {
             'item_slug': self.product.slug,
-            'item_id': self.product.id,
-            'review_pk': self.id})
+            'item_pk': self.product.id,
+            'pk': self.id})
 
     def __unicode__(self):
         return self.title

oscar/apps/product/reviews/views.py

@@ -50,7 +50,8 @@ class CreateProductReviewView(CreateView):
     
     def get_success_url(self):
         return self.object.product.get_absolute_url()
-    
+
+
 class CreateReviewCompleteView(DetailView):
     template_name = "reviews/add_review_complete.html"
     context_object_name = 'review'
@@ -59,7 +60,7 @@ class CreateReviewCompleteView(DetailView):
     
     def get_context_data(self, **kwargs):
         context = super(ProductReviewDetailView, self).get_context_data(**kwargs)
-        context['item'] = get_object_or_404(self.product_model, pk=self.kwargs['item_id'])
+        context['item'] = get_object_or_404(self.product_model, pk=self.kwargs['item_pk'])
         return context    
 
 
@@ -75,7 +76,7 @@ class ProductReviewDetailView(DetailView, PostActionMixin):
     
     def get_context_data(self, **kwargs):
         context = super(ProductReviewDetailView, self).get_context_data(**kwargs)
-        context['item'] = get_object_or_404(self.product_model, pk=self.kwargs['item_id'])
+        context['item'] = get_object_or_404(self.product_model, pk=self.kwargs['item_pk'])
         return context
     
     def do_vote_up(self, review):

oscar/apps/product/templates/product/detail.html

@@ -92,19 +92,20 @@
                 <p>{{ review.body|linebreaks }}</p>
                 <p><a href="{{ review.get_absolute_url }}">Permalink</a>
                 {% if user.is_authenticated %}
+                	Was this review helpful to you?
                     <form action="{{ review.get_absolute_url }}" method="post">
                         {% csrf_token %}               
                         <input type="hidden" name="action" value="vote_up"/>
-                        <input type="submit" value="I agree" /> 
-                    </form>
+                        <input type="submit" value="Yes" /> 
+                    </form> / 
                     <form  action="{{ review.get_absolute_url }}" method="post">
                         {% csrf_token %}                
                         <input type="hidden" name="action" value="vote_down"/>
-                        <input type="submit" value="I disagree" /> 
+                        <input type="submit" value="No" /> 
                     </form>
                 {% endif %}
                 {% if review.has_votes %}
-                    <p>{{ review.num_up_votes }} customer{{ review.num_up_votes|pluralize }} agreed.</p>
+                    <p>{{ review.num_up_votes }} customer{{ review.num_up_votes|pluralize }} found this review helpful.</p>
                 {% endif %}
             </div>
         {% endfor %}
@@ -120,7 +121,7 @@
     <h4>Related items</h4>
     <ul>
     {% for product in item.related_items.all %}
-        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
+        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a></li>
     {% endfor %}
     </ul>
 </div>
@@ -131,7 +132,7 @@
     <h4>Recommended items</h4>
     <ul>
     {% for product in item.recommended_items.all %}
-        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
+        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a></li>
     {% endfor %}
     </ul>
 </div>

oscar/templates/layout.html

@@ -15,9 +15,9 @@
             
             {% if user.is_authenticated %}
                 <a href="{% url customer:summary %}">Profile</a>
-                <a href="{% url oscar-customer-logout %}">Logout</a>
+                <a href="{% url customer:logout %}">Logout</a>
             {% else %}
-                <a href="{% url oscar-customer-login %}">Login</a>
+                <a href="{% url customer:login %}">Login</a>
             {% endif %}
             
             {% for banner in banners %}