Moved Oscar's templates into a new folder.

This avoids conflicts with other libraries that use the same trick for
extending templates.

CHANGELOG.pdf

@@ -0,0 +1,554 @@
+%PDF-1.4
+%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
+% 'BasicFonts': class PDFDictionary 
+1 0 obj
+% The standard fonts dictionary
+<< /F1 2 0 R
+ /F2 3 0 R
+ /F3 4 0 R >>
+endobj
+% 'F1': class PDFType1Font 
+2 0 obj
+% Font Helvetica
+<< /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F2': class PDFType1Font 
+3 0 obj
+% Font Helvetica-Bold
+<< /BaseFont /Helvetica-Bold
+ /Encoding /WinAnsiEncoding
+ /Name /F2
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F3': class PDFType1Font 
+4 0 obj
+% Font Courier
+<< /BaseFont /Courier
+ /Encoding /WinAnsiEncoding
+ /Name /F3
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'Page1': class PDFPage 
+5 0 obj
+% Page dictionary
+<< /Contents 14 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 13 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'R6': class PDFCatalog 
+6 0 obj
+% Document Root
+<< /Outlines 8 0 R
+ /PageLabels 15 0 R
+ /PageMode /UseNone
+ /Pages 13 0 R
+ /Type /Catalog >>
+endobj
+% 'R7': class PDFInfo 
+7 0 obj
+<< /Author ()
+ /CreationDate (D:20120719073244+08'00')
+ /Creator (\(unspecified\))
+ /Keywords ()
+ /Producer (ReportLab PDF Library - www.reportlab.com)
+ /Subject (\(unspecified\))
+ /Title (Changelog) >>
+endobj
+% 'R8': class PDFOutlines 
+8 0 obj
+<< /Count 4
+ /First 9 0 R
+ /Last 12 0 R
+ /Type /Outlines >>
+endobj
+% 'Outline.0': class OutlineEntryObject 
+9 0 obj
+<< /Dest [ 5 0 R
+ /XYZ
+ 62.69291
+ 729.0236
+ 0 ]
+ /Next 10 0 R
+ /Parent 8 0 R
+ /Title (0.3) >>
+endobj
+% 'Outline.1': class OutlineEntryObject 
+10 0 obj
+<< /Dest [ 5 0 R
+ /XYZ
+ 62.69291
+ 410.4236
+ 0 ]
+ /Next 11 0 R
+ /Parent 8 0 R
+ /Prev 9 0 R
+ /Title (0.2.1 - 09 July 2012) >>
+endobj
+% 'Outline.2': class OutlineEntryObject 
+11 0 obj
+<< /Dest [ 5 0 R
+ /XYZ
+ 62.69291
+ 359.4236
+ 0 ]
+ /Next 12 0 R
+ /Parent 8 0 R
+ /Prev 10 0 R
+ /Title (0.2 - 01 June 2012) >>
+endobj
+% 'Outline.3': class OutlineEntryObject 
+12 0 obj
+<< /Dest [ 5 0 R
+ /XYZ
+ 62.69291
+ 176.4236
+ 0 ]
+ /Parent 8 0 R
+ /Prev 11 0 R
+ /Title (0.1) >>
+endobj
+% 'R13': class PDFPages 
+13 0 obj
+% page tree
+<< /Count 1
+ /Kids [ 5 0 R ]
+ /Type /Pages >>
+endobj
+% 'R14': class PDFStream 
+14 0 obj
+% page stream
+<< /Length 6642 >>
+stream
+1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
+q
+1 0 0 1 62.69291 741.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4 Tm /F2 20 Tf 24 TL 183.2749 0 Td (Changelog) Tj T* -183.2749 0 Td ET
+Q
+Q
+q
+1 0 0 1 62.69291 708.0236 cm
+q
+BT 1 0 0 1 0 3.5 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (0.3) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 678.0236 cm
+q
+BT 1 0 0 1 0 14 Tm .386647 Tw 12 TL /F2 10 Tf 0 0 0 rg (Important ) Tj /F1 10 Tf (- A new setting ) Tj /F3 10 Tf (OSCAR_MAIN_TEMPLATE_DIR ) Tj /F1 10 Tf (has been introduced as the template structure) Tj T* 0 Tw (has been altered. This requires your ) Tj /F3 10 Tf (TEMPLATE_DIRS ) Tj /F1 10 Tf (setting to be altered to include this folder, eg:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 596.8236 cm
+q
+q
+1 0 0 1 0 0 cm
+q
+1 0 0 1 6.6 6.6 cm
+q
+.662745 .662745 .662745 RG
+.5 w
+.960784 .960784 .862745 rg
+n -6 -6 468.6898 72 re B*
+Q
+q
+0 0 0 rg
+BT 1 0 0 1 0 50 Tm /F3 10 Tf 12 TL (from oscar import OSCAR_MAIN_TEMPLATE_DIR) Tj T* (TEMPLATE_DIRS = \() Tj T* (    location\('templates'\),) Tj T* (    OSCAR_MAIN_TEMPLATE_DIR) Tj T* (\)) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
+1 0 0 1 62.69291 576.8236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (If you want to extend one of Oscar's templates, then use:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 531.6236 cm
+q
+q
+1 0 0 1 0 0 cm
+q
+1 0 0 1 6.6 6.6 cm
+q
+.662745 .662745 .662745 RG
+.5 w
+.960784 .960784 .862745 rg
+n -6 -6 468.6898 36 re B*
+Q
+q
+0 0 0 rg
+BT 1 0 0 1 0 14 Tm /F3 10 Tf 12 TL (# base.html) Tj T* ({% extends 'oscar/base.html' %}) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
+1 0 0 1 62.69291 511.6236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (instead of:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 466.4236 cm
+q
+q
+1 0 0 1 0 0 cm
+q
+1 0 0 1 6.6 6.6 cm
+q
+.662745 .662745 .662745 RG
+.5 w
+.960784 .960784 .862745 rg
+n -6 -6 468.6898 36 re B*
+Q
+q
+0 0 0 rg
+BT 1 0 0 1 0 14 Tm /F3 10 Tf 12 TL (# base.html) Tj T* ({% extends 'templates/base.html' %}) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
+1 0 0 1 62.69291 452.4236 cm
+Q
+q
+1 0 0 1 62.69291 452.4236 cm
+Q
+q
+1 0 0 1 62.69291 440.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Category management added to dashboard) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 434.4236 cm
+Q
+q
+1 0 0 1 62.69291 422.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Some improvements to how group/variant products are handled) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 422.4236 cm
+Q
+q
+1 0 0 1 62.69291 389.4236 cm
+q
+BT 1 0 0 1 0 3.5 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (0.2.1 - 09 July 2012) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 371.4236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Mainly small bug-fixes to templates and javascript.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 338.4236 cm
+q
+BT 1 0 0 1 0 3.5 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (0.2 - 01 June 2012) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 308.4236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .374692 Tw (Many components have been rewritten since 0.1 - Oscar is much more of a complete package now. New) Tj T* 0 Tw (features include:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 302.4236 cm
+Q
+q
+1 0 0 1 62.69291 302.4236 cm
+Q
+q
+1 0 0 1 62.69291 278.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 9 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .419147 Tw (Dashboard for managing catalogue, offers, stock, vouchers and more. This includes statistics pages) Tj T* 0 Tw (to track performance.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 272.4236 cm
+Q
+q
+1 0 0 1 62.69291 260.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Sample templates, CSS and JS to get a shop up and running in a minutes.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 254.4236 cm
+Q
+q
+1 0 0 1 62.69291 242.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Updated documentation.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 236.4236 cm
+Q
+q
+1 0 0 1 62.69291 224.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Reworking of shipping methods.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 218.4236 cm
+Q
+q
+1 0 0 1 62.69291 206.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Automatic up-selling on the basket page. We now inform the user if they partially qualify for an offer.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 206.4236 cm
+Q
+q
+1 0 0 1 62.69291 188.4236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (The documentation still needs more work which we'll do over the next week or two.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 155.4236 cm
+q
+BT 1 0 0 1 0 3.5 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (0.1) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 143.4236 cm
+Q
+q
+1 0 0 1 62.69291 143.4236 cm
+Q
+q
+1 0 0 1 62.69291 107.4236 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 21 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 26 Tm /F1 10 Tf 12 TL .69561 Tw (Initial release - used in production by two major applications at Tangent but still quite rough around) Tj T* 0 Tw .874269 Tw (the edges. Many features were implemented directly in the applications rather than using a feature) Tj T* 0 Tw (from oscar.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 101.4236 cm
+Q
+q
+1 0 0 1 62.69291 89.42362 cm
+0 0 0 rg
+BT /F1 10 Tf 12 TL ET
+q
+1 0 0 1 6 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 -3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Docs are a bit stale and need updating in 0.2) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 89.42362 cm
+Q
+ 
+endstream
+endobj
+% 'R15': class PDFPageLabels 
+15 0 obj
+% Document Root
+<< /Nums [ 0
+ 16 0 R ] >>
+endobj
+% 'R16': class PDFPageLabel 
+16 0 obj
+% None
+<< /S /D
+ /St 1 >>
+endobj
+xref
+0 17
+0000000000 65535 f
+0000000113 00000 n
+0000000233 00000 n
+0000000398 00000 n
+0000000573 00000 n
+0000000732 00000 n
+0000001011 00000 n
+0000001167 00000 n
+0000001422 00000 n
+0000001545 00000 n
+0000001706 00000 n
+0000001899 00000 n
+0000002091 00000 n
+0000002237 00000 n
+0000002344 00000 n
+0000009089 00000 n
+0000009182 00000 n
+trailer
+<< /ID 
+ % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
+ [(3\251D\017\363\251\343\356\2041t\304e\2066D) (3\251D\017\363\251\343\356\2041t\304e\2066D)] 
+
+ /Info 7 0 R
+ /Root 6 0 R
+ /Size 17 >>
+startxref
+9229
+%%EOF

CHANGELOG.rst

@@ -2,6 +2,33 @@
 Changelog
 =========
 
+0.3 
+~~~
+
+**Important** - A new setting ``OSCAR_MAIN_TEMPLATE_DIR`` has been introduced
+as the template structure has been altered.  This requires your
+``TEMPLATE_DIRS`` setting to be altered to include this folder, eg::
+
+    from oscar import OSCAR_MAIN_TEMPLATE_DIR
+    TEMPLATE_DIRS = (
+        location('templates'),
+        OSCAR_MAIN_TEMPLATE_DIR
+    )
+
+If you want to extend one of Oscar's templates, then use::
+
+    # base.html
+    {% extends 'oscar/base.html' %}
+
+instead of::
+
+    # base.html
+    {% extends 'templates/base.html' %}
+
+* Category management added to dashboard
+
+* Some improvements to how group/variant products are handled
+
 0.2.1 - 09 July 2012
 ~~~~~~~~~~~~~~~~~~~~
 

docs/source/getting_started.rst

@@ -75,6 +75,11 @@ and set your auth backends to::
 
 to allow customers to sign in using an email address rather than a username.
 
+Modify your ``TEMPLATE_DIRS`` to include the main Oscar template directory::
+
+    from oscar import OSCAR_MAIN_TEMPLATE_DIR
+    TEMPLATE_DIRS = TEMPLATE_DIRS + (OSCAR_MAIN_TEMPLATE_DIR,) 
+
 Oscar currently uses Haystack for search so you need to specify::
 
     HAYSTACK_SITECONF = 'oscar.search_sites'

oscar/__init__.py

@@ -20,15 +20,12 @@ def get_version():
     return version
 
 
-# Cheeky setting that can be used to override templates and give them
-# the same name.  You can use:
-#
-# {% includes 'templates/basket/basket.html' %}
-#
-# when you want to create a new template with path 'basket/basket.html'
-# Just add this setting to the end of your TEMPLATE_DIRS setting.
-OSCAR_PARENT_TEMPLATE_DIR = os.path.dirname(os.path.abspath(__file__))
-
+# Cheeky setting that allows each template to be accessible by two paths. 
+# Eg: the template 'oscar/templates/oscar/base.html' can be accessed via both
+# 'base.html' and 'oscar/base.html'.  This allows Oscar's templates to be 
+# extended by templates with the same filename
+OSCAR_MAIN_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                       'templates/oscar')
 
 OSCAR_CORE_APPS = [
     'oscar',