浏览代码

Improve mark-up on offer browsing page

Using well to break up content.
master
David Winterbottom 13 年前
父节点
当前提交
6333ea83ea
共有 2 个文件被更改,包括 6 次插入8 次删除
  1. 5
    7
      oscar/templates/oscar/offer/detail.html
  2. 1
    1
      oscar/templates/oscar/partials/pagination.html

+ 5
- 7
oscar/templates/oscar/offer/detail.html 查看文件

32
 	{% endif %}
32
 	{% endif %}
33
 
33
 
34
     {% if offer.description %}
34
     {% if offer.description %}
35
-    {{ offer.description|safe }}
35
+	<div class="well">
36
+		{{ offer.description|safe }}
37
+	</div>
36
     {% endif %}
38
     {% endif %}
37
 
39
 
38
     {% if upsell_message %}
40
     {% if upsell_message %}
45
     {% if products.count %}
47
     {% if products.count %}
46
 		<section>
48
 		<section>
47
 			<div class="mod">
49
 			<div class="mod">
48
-				{% if page_obj %}
49
-					{% include "partials/pagination.html" %}
50
-				{% endif %}
50
+				{% include "partials/pagination.html" %}
51
 				<ol class="products four">
51
 				<ol class="products four">
52
 					{% for product in products %}
52
 					{% for product in products %}
53
 					<li>{% include "catalogue/partials/product.html" %}</li>
53
 					<li>{% include "catalogue/partials/product.html" %}</li>
54
 					{% endfor %}
54
 					{% endfor %}
55
 				</ol>
55
 				</ol>
56
-				{% if page_obj %}
57
-					{% include "partials/pagination.html" %}
58
-				{% endif %}
56
+				{% include "partials/pagination.html" %}
59
 			</div>
57
 			</div>
60
 		</section>
58
 		</section>
61
     {% else %}
59
     {% else %}

+ 1
- 1
oscar/templates/oscar/partials/pagination.html 查看文件

1
 {% load display_tags %}
1
 {% load display_tags %}
2
 {% load i18n %}
2
 {% load i18n %}
3
 
3
 
4
-{% if total_pages > 1 %}
4
+{% if paginator.num_pages > 1 %}
5
 	<div>
5
 	<div>
6
 		<ul class="pager">
6
 		<ul class="pager">
7
 			{% if page_obj.has_previous %}
7
 			{% if page_obj.has_previous %}

正在加载...
取消
保存