This is to avoid namespace clashes when collectstatic is run. If projects used the same path for an asset then it would clobber one of oscar's. Eg, a project might define 'css/dashboard.css' which would clobber the CSS file from oscar.

13 年之前 · 52a1421630
--- a/oscar/static/oscar/css/dashboard.css
+++ b/oscar/static/oscar/css/dashboard.css
--- a/oscar/static/oscar/css/responsive.css
+++ b/oscar/static/oscar/css/responsive.css
--- a/oscar/static/oscar/css/snowcone.css
+++ b/oscar/static/oscar/css/snowcone.css
--- a/oscar/static/oscar/css/styles.css
+++ b/oscar/static/oscar/css/styles.css
--- a/oscar/static/oscar/favicon.ico
+++ b/oscar/static/oscar/favicon.ico
--- a/oscar/static/oscar/fonts/snowcone-regular-webfont.eot
+++ b/oscar/static/oscar/fonts/snowcone-regular-webfont.eot
--- a/oscar/static/oscar/fonts/snowcone-regular-webfont.svg
+++ b/oscar/static/oscar/fonts/snowcone-regular-webfont.svg
--- a/oscar/static/oscar/fonts/snowcone-regular-webfont.ttf
+++ b/oscar/static/oscar/fonts/snowcone-regular-webfont.ttf
--- a/oscar/static/oscar/fonts/snowcone-regular-webfont.woff
+++ b/oscar/static/oscar/fonts/snowcone-regular-webfont.woff
--- a/oscar/static/oscar/img/ui/ajax-loader.gif
+++ b/oscar/static/oscar/img/ui/ajax-loader.gif
--- a/oscar/static/oscar/img/ui/bg-stars-small.png
+++ b/oscar/static/oscar/img/ui/bg-stars-small.png
--- a/oscar/static/oscar/img/ui/bg-stars.png
+++ b/oscar/static/oscar/img/ui/bg-stars.png
--- a/oscar/static/oscar/img/ui/black.png
+++ b/oscar/static/oscar/img/ui/black.png
--- a/oscar/static/oscar/img/ui/icon_arrow_down.png
+++ b/oscar/static/oscar/img/ui/icon_arrow_down.png
--- a/oscar/static/oscar/img/ui/icon_arrow_left.png
+++ b/oscar/static/oscar/img/ui/icon_arrow_left.png
--- a/oscar/static/oscar/img/ui/icon_minus.png
+++ b/oscar/static/oscar/img/ui/icon_minus.png
--- a/oscar/static/oscar/img/ui/icon_plus.png
+++ b/oscar/static/oscar/img/ui/icon_plus.png
--- a/oscar/static/oscar/img/ui/icon_slider_left.png
+++ b/oscar/static/oscar/img/ui/icon_slider_left.png
--- a/oscar/static/oscar/img/ui/icon_slider_right.png
+++ b/oscar/static/oscar/img/ui/icon_slider_right.png
--- a/oscar/static/oscar/img/ui/nav_sprite.png
+++ b/oscar/static/oscar/img/ui/nav_sprite.png
--- a/oscar/static/oscar/js/bootstrap/bootstrap.js
+++ b/oscar/static/oscar/js/bootstrap/bootstrap.js
--- a/oscar/static/oscar/js/bootstrap/bootstrap.min.js
+++ b/oscar/static/oscar/js/bootstrap/bootstrap.min.js
--- a/oscar/static/oscar/js/colorbox/colorbox.css
+++ b/oscar/static/oscar/js/colorbox/colorbox.css
--- a/oscar/static/oscar/js/colorbox/images/border.png
+++ b/oscar/static/oscar/js/colorbox/images/border.png
--- a/oscar/static/oscar/js/colorbox/images/controls.png
+++ b/oscar/static/oscar/js/colorbox/images/controls.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderBottomCenter.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderBottomCenter.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderBottomLeft.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderBottomLeft.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderBottomRight.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderBottomRight.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderMiddleLeft.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderMiddleLeft.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderMiddleRight.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderMiddleRight.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderTopCenter.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderTopCenter.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderTopLeft.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderTopLeft.png
--- a/oscar/static/oscar/js/colorbox/images/ie6/borderTopRight.png
+++ b/oscar/static/oscar/js/colorbox/images/ie6/borderTopRight.png
--- a/oscar/static/oscar/js/colorbox/images/loading.gif
+++ b/oscar/static/oscar/js/colorbox/images/loading.gif
--- a/oscar/static/oscar/js/colorbox/images/loading_background.png
+++ b/oscar/static/oscar/js/colorbox/images/loading_background.png
--- a/oscar/static/oscar/js/colorbox/images/overlay.png
+++ b/oscar/static/oscar/js/colorbox/images/overlay.png
--- a/oscar/static/oscar/js/colorbox/jquery.colorbox-min.js
+++ b/oscar/static/oscar/js/colorbox/jquery.colorbox-min.js
--- a/oscar/static/oscar/js/elastislide/jquery.elastislide.js
+++ b/oscar/static/oscar/js/elastislide/jquery.elastislide.js
--- a/oscar/static/oscar/js/jquery/jquery-1.7.1.min.js
+++ b/oscar/static/oscar/js/jquery/jquery-1.7.1.min.js
--- a/oscar/static/oscar/js/jquery/jquery.easing.1.3.js
+++ b/oscar/static/oscar/js/jquery/jquery.easing.1.3.js
--- a/oscar/static/oscar/js/oscar/dashboard.js
+++ b/oscar/static/oscar/js/oscar/dashboard.js
--- a/oscar/static/oscar/js/oscar/ui.js
+++ b/oscar/static/oscar/js/oscar/ui.js
--- a/oscar/static/oscar/js/responsivegallery/ajax-loader.gif
+++ b/oscar/static/oscar/js/responsivegallery/ajax-loader.gif
--- a/oscar/static/oscar/js/responsivegallery/black.png
+++ b/oscar/static/oscar/js/responsivegallery/black.png
--- a/oscar/static/oscar/js/responsivegallery/gallery.js
+++ b/oscar/static/oscar/js/responsivegallery/gallery.js
--- a/oscar/static/oscar/js/responsivegallery/jquery.tmpl.min.js
+++ b/oscar/static/oscar/js/responsivegallery/jquery.tmpl.min.js
--- a/oscar/static/oscar/js/responsivegallery/views.png
+++ b/oscar/static/oscar/js/responsivegallery/views.png
--- a/oscar/static/oscar/js/snowcone/snowcone.js
+++ b/oscar/static/oscar/js/snowcone/snowcone.js
--- a/oscar/static/oscar/less/bootstrap/accordion.less
+++ b/oscar/static/oscar/less/bootstrap/accordion.less
--- a/oscar/static/oscar/less/bootstrap/alerts.less
+++ b/oscar/static/oscar/less/bootstrap/alerts.less
--- a/oscar/static/oscar/less/bootstrap/bootstrap.less
+++ b/oscar/static/oscar/less/bootstrap/bootstrap.less
--- a/oscar/static/oscar/less/bootstrap/breadcrumbs.less
+++ b/oscar/static/oscar/less/bootstrap/breadcrumbs.less
--- a/oscar/static/oscar/less/bootstrap/button-groups.less
+++ b/oscar/static/oscar/less/bootstrap/button-groups.less
--- a/oscar/static/oscar/less/bootstrap/buttons.less
+++ b/oscar/static/oscar/less/bootstrap/buttons.less
--- a/oscar/static/oscar/less/bootstrap/carousel.less
+++ b/oscar/static/oscar/less/bootstrap/carousel.less
--- a/oscar/static/oscar/less/bootstrap/close.less
+++ b/oscar/static/oscar/less/bootstrap/close.less
--- a/oscar/static/oscar/less/bootstrap/code.less
+++ b/oscar/static/oscar/less/bootstrap/code.less
--- a/oscar/static/oscar/less/bootstrap/component-animations.less
+++ b/oscar/static/oscar/less/bootstrap/component-animations.less
--- a/oscar/static/oscar/less/bootstrap/dropdowns.less
+++ b/oscar/static/oscar/less/bootstrap/dropdowns.less
--- a/oscar/static/oscar/less/bootstrap/forms.less
+++ b/oscar/static/oscar/less/bootstrap/forms.less
--- a/oscar/static/oscar/less/bootstrap/grid.less
+++ b/oscar/static/oscar/less/bootstrap/grid.less
--- a/oscar/static/oscar/less/bootstrap/hero-unit.less
+++ b/oscar/static/oscar/less/bootstrap/hero-unit.less
--- a/oscar/static/oscar/less/bootstrap/labels.less
+++ b/oscar/static/oscar/less/bootstrap/labels.less
--- a/oscar/static/oscar/less/bootstrap/layouts.less
+++ b/oscar/static/oscar/less/bootstrap/layouts.less
--- a/oscar/static/oscar/less/bootstrap/mixins.less
+++ b/oscar/static/oscar/less/bootstrap/mixins.less
--- a/oscar/static/oscar/less/bootstrap/modals.less
+++ b/oscar/static/oscar/less/bootstrap/modals.less
--- a/oscar/static/oscar/less/bootstrap/navbar.less
+++ b/oscar/static/oscar/less/bootstrap/navbar.less
--- a/oscar/static/oscar/less/bootstrap/navs.less
+++ b/oscar/static/oscar/less/bootstrap/navs.less
--- a/oscar/static/oscar/less/bootstrap/pager.less
+++ b/oscar/static/oscar/less/bootstrap/pager.less
--- a/oscar/static/oscar/less/bootstrap/pagination.less
+++ b/oscar/static/oscar/less/bootstrap/pagination.less
--- a/oscar/static/oscar/less/bootstrap/popovers.less
+++ b/oscar/static/oscar/less/bootstrap/popovers.less
--- a/oscar/static/oscar/less/bootstrap/progress-bars.less
+++ b/oscar/static/oscar/less/bootstrap/progress-bars.less
--- a/oscar/static/oscar/less/bootstrap/reset.less
+++ b/oscar/static/oscar/less/bootstrap/reset.less
--- a/oscar/static/oscar/less/bootstrap/scaffolding.less
+++ b/oscar/static/oscar/less/bootstrap/scaffolding.less
--- a/oscar/static/oscar/less/bootstrap/sprites.less
+++ b/oscar/static/oscar/less/bootstrap/sprites.less
--- a/oscar/static/oscar/less/bootstrap/tables.less
+++ b/oscar/static/oscar/less/bootstrap/tables.less
--- a/oscar/static/oscar/less/bootstrap/thumbnails.less
+++ b/oscar/static/oscar/less/bootstrap/thumbnails.less
--- a/oscar/static/oscar/less/bootstrap/tooltip.less
+++ b/oscar/static/oscar/less/bootstrap/tooltip.less
--- a/oscar/static/oscar/less/bootstrap/type.less
+++ b/oscar/static/oscar/less/bootstrap/type.less
--- a/oscar/static/oscar/less/bootstrap/utilities.less
+++ b/oscar/static/oscar/less/bootstrap/utilities.less
--- a/oscar/static/oscar/less/bootstrap/variables.less
+++ b/oscar/static/oscar/less/bootstrap/variables.less
--- a/oscar/static/oscar/less/bootstrap/wells.less
+++ b/oscar/static/oscar/less/bootstrap/wells.less
--- a/oscar/static/oscar/less/dashboard.less
+++ b/oscar/static/oscar/less/dashboard.less
--- a/oscar/static/oscar/less/page/account.less
+++ b/oscar/static/oscar/less/page/account.less
--- a/oscar/static/oscar/less/page/badges.less
+++ b/oscar/static/oscar/less/page/badges.less
--- a/oscar/static/oscar/less/page/checkout.less
+++ b/oscar/static/oscar/less/page/checkout.less
--- a/oscar/static/oscar/less/page/head_foot.less
+++ b/oscar/static/oscar/less/page/head_foot.less
--- a/oscar/static/oscar/less/page/osc_layout.less
+++ b/oscar/static/oscar/less/page/osc_layout.less
--- a/oscar/static/oscar/less/page/osc_mixins.less
+++ b/oscar/static/oscar/less/page/osc_mixins.less
--- a/oscar/static/oscar/less/page/plugins.less
+++ b/oscar/static/oscar/less/page/plugins.less
--- a/oscar/static/oscar/less/page/product_lists.less
+++ b/oscar/static/oscar/less/page/product_lists.less
--- a/oscar/static/oscar/less/page/product_page.less
+++ b/oscar/static/oscar/less/page/product_page.less
--- a/oscar/static/oscar/less/page/promotions.less
+++ b/oscar/static/oscar/less/page/promotions.less
--- a/oscar/static/oscar/less/responsive.less
+++ b/oscar/static/oscar/less/responsive.less
--- a/oscar/static/oscar/less/styles.less
+++ b/oscar/static/oscar/less/styles.less
--- a/oscar/templates/404.html
+++ b/oscar/templates/404.html
@@ -1,7 +1,7 @@
 
				
				 {% extends "base.html" %}
			
 
				
				 {% block extrahead %}
			
 
				
				     <!-- Responsive - will need to be minified -->
			
 
				
				-    <link rel="stylesheet" href="{{ STATIC_URL }}css/responsive.css" />
			
 
				
				+    <link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
			
 
				
				 {% endblock %}
			
 
				
				 {% block layout %}
			
 
				
				 <div class="navbar accounts">
			
--- a/oscar/templates/500.html
+++ b/oscar/templates/500.html
@@ -2,10 +2,10 @@
 
				
				 {% block extrahead %}
			
 
				
				     {% if product %}
			
 
				
				     <!-- Colorbox for image galleries -->
			
 
				
				-    <link rel="stylesheet" href="{{ STATIC_URL }}js/colorbox/colorbox.css" type="text/css" media="screen" charset="utf-8"/>
			
 
				
				+    <link rel="stylesheet" href="{{ STATIC_URL }}oscar/js/colorbox/colorbox.css" type="text/css" media="screen" charset="utf-8"/>
			
 
				
				     {% endif %}
			
 
				
				     <!-- Responsive - will need to be minified -->
			
 
				
				-    <link rel="stylesheet" href="{{ STATIC_URL }}css/responsive.css" />
			
 
				
				+    <link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
			
 
				
				 {% endblock %}
			
 
				
				 {% block layout %}
			
 
				
				 <div class="navbar accounts">
			
--- a/oscar/templates/base.html
+++ b/oscar/templates/base.html
@@ -12,9 +12,9 @@
 
				
				         <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
			
 
				
				         <![endif]-->
			
 
				
				         
			
 
				
				-        <link rel="shortcut icon" href="{{ STATIC_URL }}favicon.ico" />
			
 
				
				+        <link rel="shortcut icon" href="{{ STATIC_URL }}oscar/favicon.ico" />
			
 
				
				         <!-- Main styles - will need to be minified -->
			
 
				
				-        <link rel="stylesheet" href="{{ STATIC_URL }}css/styles.css" />
			
 
				
				+        <link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/styles.css" />
			
 
				
				         {% block extrahead %}{% endblock %}
			
 
				
				     </head>
			
 
				
				     <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
			
@@ -28,12 +28,12 @@
 
				
				 
			
 
				
				         <!-- Jquery -->
			
 
				
				         <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>window.jQuery || document.write('<script src="{{ STATIC_URL }}oscar/js/jquery/jquery-1.7.1.min.js"><\/script>')</script>
			
 
				
				+        <script src="{{ STATIC_URL }}oscar/js/jquery/jquery.easing.1.3.js" type="text/javascript" charset="utf-8"></script>
			
 
				
				         <!-- Bootstrap -->
			
 
				
				-		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js"></script>
			
 
				
				+		<script type="text/javascript" src="{{ STATIC_URL }}oscar/js/bootstrap/bootstrap.min.js"></script>
			
 
				
				 		<!--[if lt IE 8]>
			
 
				
				-        	<script src="{{ STATIC_URL }}js/snowcone/snowcone.js"></script>
			
 
				
				+        	<script src="{{ STATIC_URL }}oscar/js/snowcone/snowcone.js"></script>
			
 
				
				         <![endif]-->
			
 
				
				 		
			
 
				
				 		{# Block for additional scripts #}
			
--- a/oscar/templates/checkout/layout.html
+++ b/oscar/templates/checkout/layout.html
@@ -6,7 +6,7 @@
 
				
				 
			
 
				
				 {% block extrahead %}
			
 
				
				     <!-- Responsive - will need to be minified -->
			
 
				
				-    <link rel="stylesheet" href="{{ STATIC_URL }}css/responsive.css" />
			
 
				
				+    <link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
			
 
				
				 {% endblock %}
			
 
				
				 
			
 
				
				 {% block layout %}
			
--- a/oscar/templates/dashboard/layout.html
+++ b/oscar/templates/dashboard/layout.html