Changeset 8142


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

    r8141 r8142  
    2222    <title>{% block meta_title %}{% endblock %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %}</title> 
    2323 
    24   <link rel="stylesheet" type="text/css" href="/css/960/reset.css"  /> 
    25   <link rel="stylesheet" type="text/css" href="/css/960/960_12_col.css"  /> 
    26   <link rel="stylesheet" type="text/css" href="/css/960/text.css"  /> 
    27   <link rel="stylesheet" type="text/css" href="/css/ceda.css"  /> 
     24  <link rel="stylesheet" type="text/css" href="/static/css/960/reset.css"  /> 
     25  <link rel="stylesheet" type="text/css" href="/static/css/960/960_12_col.css"  /> 
     26  <link rel="stylesheet" type="text/css" href="/static/css/960/text.css"  /> 
     27  <link rel="stylesheet" type="text/css" href="/static/css/ceda.css"  /> 
    2828  <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.6/dijit/themes/claro/claro.css" /> 
    2929  <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.5/dijit/themes/claro/layout/ContentPane.css" /> 
     
    4444                // Make sure the module path does *not* end in a slash. 
    4545                packages:[ 
    46                                 { 'name': 'ceda', 'location': '/js'} 
     46                                { 'name': 'ceda', 'location': '/static/js'} 
    4747                ] 
    4848        }; 
     
    137137                <div class="grid_12 whiteFill" id="footer"> 
    138138                        <div class="grid_12 alpha" id="footerLogos"> 
    139                                 <p><a href="http://www.ncas.ac.uk"><img src="/img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a> 
    140                                 <a href="http://www.nceo.ac.uk"><img src="/img/nceo_logo.jpg" alt="NCEO logo" title="NCEO" align="right"/></a></p> 
     139                                <p><a href="http://www.ncas.ac.uk"><img src="/static/img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a> 
     140                                <a href="http://www.nceo.ac.uk"><img src="/static/img/nceo_logo.jpg" alt="NCEO logo" title="NCEO" align="right"/></a></p> 
    141141                        </div> <!-- End div footerLogos--> 
    142142                        <div class="grid_6 push_3 whiteFill omega" id="footerStatements"> 
  • mauRepo/MolesManager/trunk/src/MolesManager/urls.py

    r8141 r8142  
    3333) 
    3434 
    35 urlpatterns += patterns('', 
    36     url(r'css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css' , 'show_indexes': True}), 
    37 ) 
     35#urlpatterns += patterns('', 
     36#    url(r'css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css' , 'show_indexes': True}), 
     37#) 
    3838 
    39 urlpatterns += patterns('', 
    40     url(r'css/960/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css/960' , 'show_indexes': True}), 
    41 ) 
     39#urlpatterns += patterns('', 
     40#    url(r'css/960/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css/960' , 'show_indexes': True}), 
     41#) 
    4242 
    43 urlpatterns += patterns('', 
    44     url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}), 
    45 ) 
     43#urlpatterns += patterns('', 
     44#    url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}), 
     45#) 
    4646 
    47 urlpatterns += patterns('', 
    48     url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}), 
    49 ) 
     47#urlpatterns += patterns('', 
     48#    url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}), 
     49#) 
    5050#urlpatterns += staticfiles_urlpatterns() 
Note: See TracChangeset for help on using the changeset viewer.