jfinn
/
edan_f0
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Moved all templates into app folders

master
David Winterbottom пре 14 година
родитељ
512c977be5
комит
da8b0902a6
29 измењених фајлова са 96 додато и 20 уклоњено
Један поглед Покажи статистику Diff
  1. 1
    0
      examples/vanilla/settings.py
  2. 19
    0
      examples/vanilla/templates/base.html
  3. 56
    0
      examples/vanilla/templates/layout.html
  4. 0
    0
      oscar/apps/checkout/templates/checkout/checkout.html
  5. 0
    0
      oscar/apps/checkout/templates/checkout/gateway.html
  6. 1
    1
      oscar/apps/checkout/templates/checkout/preview.html
  7. 1
    1
      oscar/apps/checkout/templates/checkout/shipping_address.html
  8. 1
    1
      oscar/apps/checkout/templates/checkout/shipping_methods.html
  9. 0
    0
      oscar/apps/checkout/templates/checkout/thank_you.html
  10. 1
    1
      oscar/apps/checkout/templates/checkout/user_address_form.html
  11. 8
    8
      oscar/apps/checkout/views.py
  12. 0
    0
      oscar/apps/image/__init__.py
  13. 0
    0
      oscar/apps/order_management/templates/order_management/browse.html
  14. 0
    0
      oscar/apps/order_management/templates/order_management/order.html
  15. 2
    2
      oscar/apps/order_management/views.py
  16. 1
    1
      oscar/apps/promotions/abstract_models.py
  17. 0
    0
      oscar/apps/promotions/templates/promotions/block_countdown.html
  18. 0
    0
      oscar/apps/promotions/templates/promotions/block_default.html
  19. 0
    0
      oscar/apps/promotions/templates/promotions/block_singleproduct.html
  20. 0
    0
      oscar/apps/promotions/templates/promotions/block_tabbedblock.html
  21. 0
    0
      oscar/apps/promotions/templates/promotions/home.html
  22. 1
    1
      oscar/apps/promotions/templatetags/promotions.py
  23. 1
    1
      oscar/apps/promotions/views.py
  24. 0
    0
      oscar/apps/reports/templates/reports/dashboard.html
  25. 1
    1
      oscar/apps/reports/views.py
  26. 1
    1
      oscar/apps/search/abstract_indexes.py
  27. 0
    0
      oscar/apps/search/templates/search/indexes/product/item_text.txt
  28. 0
    0
      oscar/apps/search/templates/search/results.html
  29. 1
    1
      oscar/apps/search/views.py

+ 1
- 0
examples/vanilla/settings.py Прегледај датотеку

108 
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
 108 
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
109 
     # Always use forward slashes, even on Windows.
 109 
     # Always use forward slashes, even on Windows.
110 
     # Don't forget to use absolute paths, not relative paths.
 110 
     # Don't forget to use absolute paths, not relative paths.
111 
+    location('templates')
111 
 )
 112 
 )
112
113
113 
 # A sample logging configuration. The only tangible logging
 114 
 # A sample logging configuration. The only tangible logging

+ 19
- 0
examples/vanilla/templates/base.html Прегледај датотеку

1 
+<!DOCTYPE html>
2 
+<html lang="{% block language %}en-gb{% endblock %}">
3 
+    <head>
4 
+        <title>{% block title %}Oscar :: Flexible ecommerce for Django{% endblock %}</title>
5 
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
6 
+        <meta name="created" content='{% now "jS M Y h:i" %}' />
7 
+        <meta name="description" content="{% block description %}{% endblock %}" />
8 
+        <meta name="keywords" content="{% block keywords %}{% endblock %}" />
9 
+        {% block extra_head %}{% endblock %}
10 
+    </head>
11 
+    <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
12 
+        {% block layout %}{% endblock %}
13 
+        {% block tracking %}
14 
+            {% if not debug and not request.user.is_staff %}
15 
+                <!-- Tracking to go here. -->
16 
+            {% endif %}
17 
+        {% endblock %}
18 
+    </body>
19 
+</html>

+ 56
- 0
examples/vanilla/templates/layout.html Прегледај датотеку

1 
+{% extends "base.html" %}
2 
+
3 
+{% load currency_filters %}
4 
+{% load promotions %}
5 
+
6 
+{% block layout %}
7 
+    <div id="container">
8 
+        <div id="header">
9 
+            <p><a href="{% url home %}">Oscar // Flexible e-commerce for Django</a></p>
10 
+
11 
+            <form method="get" action="{% url oscar-search %}">
12 
+                {{ search_form.as_p }}
13 
+                <input type="submit" value="Go!" />
14 
+            </form>
15 
+
16 
+            {% if user.is_authenticated %}
17 
+                <a href="{% url customer:summary %}">Profile</a>
18 
+                <a href="{% url customer:logout %}">Logout</a>
19 
+            {% else %}
20 
+                <a href="{% url customer:login %}">Login</a>
21 
+            {% endif %}
22 
+
23 
+            {% for banner in banners %}
24 
+                {{ banner.get_banner_html|safe }}
25 
+            {% endfor %}
26 
+
27 
+            Add a:
28 
+            <a href="/admin/promotions/pagepromotion/add/?page_url={{ url_path }}" >promotion</a> /
29 
+            <a href="/admin/promotions/pagemerchandisingblock/add/?page_url={{ url_path }}" >merchandising block</a>
30 
+            to this page.
31 
+
32 
+            Basket total: {{ basket.total_incl_tax|currency }}
33 
+            <a href="{% url basket:summary %}">View basket</a>
34 
+
35 
+            {% block header %}
36 
+            {% endblock %}
37 
+        </div>
38 
+        <div id="content">
39 
+
40 
+            {% if messages %}
41 
+            <ul class="messages">
42 
+                {% for message in messages %}
43 
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
44 
+                {% endfor %}
45 
+            </ul>
46 
+            {% endif %}
47 
+
48 
+            {% for linked_block in merchandising_blocks %}
49 
+                {% render_merchandising_block linked_block %}
50 
+            {% endfor %}
51 
+
52 
+            {% block content %}{% endblock %}
53 
+        </div>
54 
+        <div id="footer">{% block footer %}{% endblock %}</div>
55 
+    </div>
56 
+{% endblock %}

oscar/templates/oscar/checkout/checkout.html → oscar/apps/checkout/templates/checkout/checkout.html Прегледај датотеку


oscar/templates/oscar/checkout/gateway.html → oscar/apps/checkout/templates/checkout/gateway.html Прегледај датотеку


oscar/templates/oscar/checkout/preview.html → oscar/apps/checkout/templates/checkout/preview.html Прегледај датотеку

1 
-{% extends "oscar/checkout/checkout.html" %}
1 
+{% extends "checkout/checkout.html" %}
2
2
3 
 {% block place_order %}
 3 
 {% block place_order %}
4 
 <hr/>
 4 
 <hr/>

oscar/templates/oscar/checkout/shipping_address.html → oscar/apps/checkout/templates/checkout/shipping_address.html Прегледај датотеку

1 
-{% extends "oscar/checkout/checkout.html" %}
1 
+{% extends "checkout/checkout.html" %}
2
2
3 
 {% block shipping_address %}
 3 
 {% block shipping_address %}
4
4

oscar/templates/oscar/checkout/shipping_methods.html → oscar/apps/checkout/templates/checkout/shipping_methods.html Прегледај датотеку

1 
-{% extends "oscar/checkout/checkout.html" %}
1 
+{% extends "checkout/checkout.html" %}
2
2
3 
 {% load currency_filters %}
 3 
 {% load currency_filters %}
4
4

oscar/templates/oscar/checkout/thank_you.html → oscar/apps/checkout/templates/checkout/thank_you.html Прегледај датотеку


oscar/templates/oscar/checkout/user_address_form.html → oscar/apps/checkout/templates/checkout/user_address_form.html Прегледај датотеку

1 
-{% extends "oscar/checkout/checkout.html" %}
1 
+{% extends "checkout/checkout.html" %}
2
2
3
3
4 
 {% block shipping_address %}
 4 
 {% block shipping_address %}

+ 8
- 8
oscar/apps/checkout/views.py Прегледај датотеку

42 
     straight onto the next step.  Otherwise, we provide options to login, register and
 42 
     straight onto the next step.  Otherwise, we provide options to login, register and
43 
     (if the option is enabled) proceed anonymously.
 43 
     (if the option is enabled) proceed anonymously.
44 
     """
 44 
     """
45 
-    template_name = 'oscar/checkout/gateway.html'
45 
+    template_name = 'checkout/gateway.html'
46
46
47 
     def get_logged_in_redirect(self):
 47 
     def get_logged_in_redirect(self):
48 
         return reverse('oscar-checkout-shipping-address')
 48 
         return reverse('oscar-checkout-shipping-address')
136 
     saved in the session and saved as a model when the order is sucessfully submitted.
 136 
     saved in the session and saved as a model when the order is sucessfully submitted.
137 
     """
 137 
     """
138
138
139 
-    template_name = 'oscar/checkout/shipping_address.html'
139 
+    template_name = 'checkout/shipping_address.html'
140 
     form_class = ShippingAddressForm
 140 
     form_class = ShippingAddressForm
141
141
142 
     def get_initial(self):
 142 
     def get_initial(self):
155 
             if 'action' in self.request.POST and self.request.POST['action'] == 'ship_to':
 155 
             if 'action' in self.request.POST and self.request.POST['action'] == 'ship_to':
156 
                 # User has selected a previous address to ship to
 156 
                 # User has selected a previous address to ship to
157 
                 self.checkout_session.ship_to_user_address(address)
 157 
                 self.checkout_session.ship_to_user_address(address)
158 
-                return HttpResponseRedirect(self.get_success_response())
158 
+                return HttpResponseRedirect(self.get_success_url())
159 
             elif 'action' in self.request.POST and self.request.POST['action'] == 'delete':
 159 
             elif 'action' in self.request.POST and self.request.POST['action'] == 'delete':
160 
                 address.delete()
 160 
                 address.delete()
161 
                 messages.info(self.request, "Address deleted from your address book")
 161 
                 messages.info(self.request, "Address deleted from your address book")
180 
     This is not the same as creating a SHIPPING Address, although if used for the order,
 180 
     This is not the same as creating a SHIPPING Address, although if used for the order,
181 
     it will be converted into a shipping address at submission-time.
 181 
     it will be converted into a shipping address at submission-time.
182 
     """
 182 
     """
183 
-    template_name = 'oscar/checkout/user_address_form.html'
183 
+    template_name = 'checkout/user_address_form.html'
184 
     form_class = UserAddressForm
 184 
     form_class = UserAddressForm
185
185
186 
     def get_context_data(self, **kwargs):
 186 
     def get_context_data(self, **kwargs):
204 
     """
 204 
     """
205 
     Update a user address
 205 
     Update a user address
206 
     """
 206 
     """
207 
-    template_name = 'oscar/checkout/user_address_form.html'
207 
+    template_name = 'checkout/user_address_form.html'
208 
     form_class = UserAddressForm
 208 
     form_class = UserAddressForm
209
209
210 
     def get_queryset(self):
 210 
     def get_queryset(self):
243 
     Shipping methods are domain-specific and so need implementing in a
243 
     Shipping methods are domain-specific and so need implementing in a
244 
     subclass of this class.
 244 
     subclass of this class.
245 
     """
 245 
     """
246 
-    template_name = 'oscar/checkout/shipping_methods.html';
246 
+    template_name = 'checkout/shipping_methods.html';
247
247
248 
     def get(self, request, *args, **kwargs):
 248 
     def get(self, request, *args, **kwargs):
249 
         # Save shipping methods as instance var as we need them both here
 249 
         # Save shipping methods as instance var as we need them both here
297 
     """
 297 
     """
298 
     View a preview of the order before submitting.
 298 
     View a preview of the order before submitting.
299 
     """
 299 
     """
300 
-    template_name = 'oscar/checkout/preview.html'
300 
+    template_name = 'checkout/preview.html'
301
301
302
302
303 
 class PaymentDetailsView(CheckoutSessionMixin, TemplateView):
 303 
 class PaymentDetailsView(CheckoutSessionMixin, TemplateView):
548 
     """
 548 
     """
549 
     Displays the 'thank you' page which summarises the order just submitted.
 549 
     Displays the 'thank you' page which summarises the order just submitted.
550 
     """
 550 
     """
551 
-    template_name = 'oscar/checkout/thank_you.html'
551 
+    template_name = 'checkout/thank_you.html'
552 
     context_object_name = 'order'
 552 
     context_object_name = 'order'
553
553
554 
     def get_object(self):
 554 
     def get_object(self):

+ 0
- 0
oscar/apps/image/__init__.py Прегледај датотеку


oscar/templates/oscar/order_management/browse.html → oscar/apps/order_management/templates/order_management/browse.html Прегледај датотеку


oscar/templates/oscar/order_management/order.html → oscar/apps/order_management/templates/order_management/order.html Прегледај датотеку


+ 2
- 2
oscar/apps/order_management/views.py Прегледај датотеку

25 
 class OrderListView(ListView):
 25 
 class OrderListView(ListView):
26 
     u"""A list of orders"""
 26 
     u"""A list of orders"""
27 
     context_object_name = "orders"
 27 
     context_object_name = "orders"
28 
-    template_name = 'oscar/order_management/browse.html'
28 
+    template_name = 'order_management/browse.html'
29 
     paginate_by = 20
 29 
     paginate_by = 20
30
30
31 
     def get_queryset(self):
 31 
     def get_queryset(self):
62
62
63 
 class OrderView(DetailView, PostActionMixin):
 63 
 class OrderView(DetailView, PostActionMixin):
64 
     u"""A detail view of an order"""
 64 
     u"""A detail view of an order"""
65 
-    template_name = "oscar/order_management/order.html"
65 
+    template_name = "order_management/order.html"
66 
     context_object_name = 'order'
 66 
     context_object_name = 'order'
67
67
68 
     def get_object(self):
 68 
     def get_object(self):

+ 1
- 1
oscar/apps/promotions/abstract_models.py Прегледај датотеку

183
183
184 
     @property
 184 
     @property
185 
     def template_file(self):
 185 
     def template_file(self):
186 
-        return 'oscar/promotions/block_%s.html' % self.type.lower()
186 
+        return 'promotions/block_%s.html' % self.type.lower()
187
187
188
188
189 
 class MerchandisingBlockProduct(models.Model):
 189 
 class MerchandisingBlockProduct(models.Model):

oscar/templates/oscar/promotions/block_countdown.html → oscar/apps/promotions/templates/promotions/block_countdown.html Прегледај датотеку


oscar/templates/oscar/promotions/block_default.html → oscar/apps/promotions/templates/promotions/block_default.html Прегледај датотеку


oscar/templates/oscar/promotions/block_singleproduct.html → oscar/apps/promotions/templates/promotions/block_singleproduct.html Прегледај датотеку


oscar/templates/oscar/promotions/block_tabbedblock.html → oscar/apps/promotions/templates/promotions/block_tabbedblock.html Прегледај датотеку


oscar/templates/oscar/home.html → oscar/apps/promotions/templates/promotions/home.html Прегледај датотеку


+ 1
- 1
oscar/apps/promotions/templatetags/promotions.py Прегледај датотеку

9
9
10 
     def render(self, context):
 10 
     def render(self, context):
11 
         linked_block = self.linked_block.resolve(context)
 11 
         linked_block = self.linked_block.resolve(context)
12 
-        template = select_template([linked_block.block.template_file, 'oscar/promotions/block_default.html'])
12 
+        template = select_template([linked_block.block.template_file, 'promotions/block_default.html'])
13 
         args = dict(block=linked_block.block, **linked_block.block.template_context(request=context['request']))
 13 
         args = dict(block=linked_block.block, **linked_block.block.template_context(request=context['request']))
14 
         context = Context(args)
 14 
         context = Context(args)
15 
         return template.render(context)
 15 
         return template.render(context)

+ 1
- 1
oscar/apps/promotions/views.py Прегледај датотеку

8
8
9
9
10 
 class HomeView(TemplateView):
 10 
 class HomeView(TemplateView):
11 
-    template_name = 'oscar/home.html'
11 
+    template_name = 'promotions/home.html'
12
12
13
13
14 
 def page_promotion_click(request, page_promotion_id):
 14 
 def page_promotion_click(request, page_promotion_id):

oscar/templates/oscar/reports/dashboard.html → oscar/apps/reports/templates/reports/dashboard.html Прегледај датотеку


+ 1
- 1
oscar/apps/reports/views.py Прегледај датотеку

19 
             return response
 19 
             return response
20 
     else:
 20 
     else:
21 
         form = report_forms.ReportForm()
 21 
         form = report_forms.ReportForm()
22 
-    return TemplateResponse(request, 'oscar/reports/dashboard.html', {'form': form})
22 
+    return TemplateResponse(request, 'reports/dashboard.html', {'form': form})
23
23
24
24
25 
 def _get_generator(form):
 25 
 def _get_generator(form):

+ 1
- 1
oscar/apps/search/abstract_indexes.py Прегледај датотеку

9 
     Base class for products solr index definition.  Overide by creating your
 9 
     Base class for products solr index definition.  Overide by creating your
10 
     own copy of oscar.search_indexes.py
 10 
     own copy of oscar.search_indexes.py
11 
     """
 11 
     """
12 
-    text = EdgeNgramField(document=True, use_template=True, template_name='oscar/search/indexes/product/item_text.txt')
12 
+    text = EdgeNgramField(document=True, use_template=True, template_name='search/indexes/product/item_text.txt')
13 
     title = EdgeNgramField(model_attr='title')
 13 
     title = EdgeNgramField(model_attr='title')
14 
     upc = CharField(model_attr="upc")
 14 
     upc = CharField(model_attr="upc")
15 
     score = FloatField(model_attr="score")
 15 
     score = FloatField(model_attr="score")

oscar/templates/oscar/search/indexes/product/item_text.txt → oscar/apps/search/templates/search/indexes/product/item_text.txt Прегледај датотеку


oscar/templates/oscar/search/results.html → oscar/apps/search/templates/search/results.html Прегледај датотеку


+ 1
- 1
oscar/apps/search/views.py Прегледај датотеку

58 
     u"""
 58 
     u"""
59 
     Search view for multifaceted searches
 59 
     Search view for multifaceted searches
60 
     """
 60 
     """
61 
-    template = 'oscar/search/results.html'
61 
+    template = 'search/results.html'
62
62
63 
     def __call__(self, request, *args, **kwargs):
 63 
     def __call__(self, request, *args, **kwargs):
64 
         """
 64 
         """

Write Preview
Loading…
Откажи
Сачувај