Changeset 8142 for mauRepo

Timestamp:

05/03/12 15:54:25 (8 years ago)

Author:

mnagni

Message:

Assumes that the /static directory is a symlink in the Apache root directory (done during the deployment)

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• static/templates/base.html (modified) (3 diffs)
• urls.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

@@ -22 +22 @@
     <title>{% block meta_title %}{% endblock %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %}</title>
 
-  <link rel="stylesheet" type="text/css" href="/css/960/reset.css"  />
-  <link rel="stylesheet" type="text/css" href="/css/960/960_12_col.css"  />
-  <link rel="stylesheet" type="text/css" href="/css/960/text.css"  />
-  <link rel="stylesheet" type="text/css" href="/css/ceda.css"  />
+  <link rel="stylesheet" type="text/css" href="/static/css/960/reset.css"  />
+  <link rel="stylesheet" type="text/css" href="/static/css/960/960_12_col.css"  />
+  <link rel="stylesheet" type="text/css" href="/static/css/960/text.css"  />
+  <link rel="stylesheet" type="text/css" href="/static/css/ceda.css"  />
   <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.6/dijit/themes/claro/claro.css" />
   <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.5/dijit/themes/claro/layout/ContentPane.css" />
@@ -44 +44 @@
                 // Make sure the module path does *not* end in a slash.
                 packages:[
-                                { 'name': 'ceda', 'location': '/js'}
+                                { 'name': 'ceda', 'location': '/static/js'}
                 ]
         };
@@ -137 +137 @@
                 <div class="grid_12 whiteFill" id="footer">
                         <div class="grid_12 alpha" id="footerLogos">
-                                <p><a href="http://www.ncas.ac.uk"><img src="/img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a>
-                                <a href="http://www.nceo.ac.uk"><img src="/img/nceo_logo.jpg" alt="NCEO logo" title="NCEO" align="right"/></a></p>
+                                <p><a href="http://www.ncas.ac.uk"><img src="/static/img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a>
+                                <a href="http://www.nceo.ac.uk"><img src="/static/img/nceo_logo.jpg" alt="NCEO logo" title="NCEO" align="right"/></a></p>
                         </div> <!-- End div footerLogos-->
                         <div class="grid_6 push_3 whiteFill omega" id="footerStatements">

mauRepo/MolesManager/trunk/src/MolesManager/urls.py

@@ -33 +33 @@
 )
 
-urlpatterns += patterns('',
-    url(r'css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css' , 'show_indexes': True}),
-)
+#urlpatterns += patterns('',
+#    url(r'css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css' , 'show_indexes': True}),
+#)
 
-urlpatterns += patterns('',
-    url(r'css/960/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css/960' , 'show_indexes': True}),
-)
+#urlpatterns += patterns('',
+#    url(r'css/960/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css/960' , 'show_indexes': True}),
+#)
 
-urlpatterns += patterns('',
-    url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}),
-)
+#urlpatterns += patterns('',
+#    url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}),
+#)
 
-urlpatterns += patterns('',
-    url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}),
-)
+#urlpatterns += patterns('',
+#    url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}),
+#)
 #urlpatterns += staticfiles_urlpatterns()