Changeset 8112


Ignore:
Timestamp:
22/02/12 17:16:41 (8 years ago)
Author:
gparton
Message:
 
Location:
mauRepo/MolesManager/trunk/src/MolesManager
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/settings.py

    r8096 r8112  
    1919PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) 
    2020 
     21PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1] 
     22 
    2123 
    2224MANAGERS = ADMINS 
     
    2527    'default': { 
    2628        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 
    27         'NAME': '/misc/frigid3/humid1/mnagni/workspaces/moles3/MolesManager/src/sqlite.db',                      # Or path to database file if using sqlite3. 
     29        'NAME': 'c:/virtualenvs/www/MolesManager/src/sqlite.db',#'/misc/frigid3/humid1/mnagni/workspaces/moles3/MolesManager/src/sqlite.db',                      # Or path to database file if using sqlite3. 
    2830        'USER': '',                      # Not used with sqlite3. 
    2931        'PASSWORD': '',                  # Not used with sqlite3. 
     
    7981 
    8082 
    81  
    8283# URL prefix for admin static files -- CSS, JavaScript and images. 
    8384# Make sure to use a trailing slash. 
     
    8788# Additional locations of static files 
    8889STATICFILES_DIRS = ( 
    89     () 
    9090    # Put strings here, like "/home/html/static" or "C:/www/django/static". 
    9191    # Always use forward slashes, even on Windows. 
     
    9898    'django.contrib.staticfiles.finders.FileSystemFinder', 
    9999    'django.contrib.staticfiles.finders.AppDirectoriesFinder', 
    100 #    'django.contrib.staticfiles.finders.DefaultStorageFinder', 
    101 ) 
     100    'django.contrib.staticfiles.finders.DefaultStorageFinder', 
     101) 
     102 
     103 
     104 
    102105 
    103106# Make this unique, and don't share it with anybody. 
     
    110113#     'django.template.loaders.eggs.Loader', 
    111114) 
     115 
     116 
    112117 
    113118MIDDLEWARE_CLASSES = ( 
     
    121126ROOT_URLCONF = 'MolesManager.urls' 
    122127 
     128TEMPLATE_CONTEXT_PROCESSORS = ( 
     129    "django.contrib.auth.context_processors.auth", 
     130    "django.core.context_processors.debug", 
     131    "django.core.context_processors.i18n", 
     132    "django.core.context_processors.media", 
     133    "django.core.context_processors.request", 
     134    "django.core.context_processors.static", 
     135) 
     136 
     137 
    123138TEMPLATE_DIRS = ( 
    124139    decodeRelativePath('static/templates')                   
     
    127142    # Don't forget to use absolute paths, not relative paths. 
    128143) 
     144 
    129145 
    130146INSTALLED_APPS = ( 
     
    171187MOLES3 = 'moles3' 
    172188#MOLES3_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 
    173 MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION' 
     189#MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION' 
     190MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION' 
    174191 
    175192 
     
    182199#MIGRATION_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 
    183200 
    184 MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 
     201#MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 
     202MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION' 
    185203 
    186204from libs.migration.db.migrationTables import doTables as doMigration 
    187205MIGRATION_DB_SCRIPT = doMigration 
    188206 
    189 RUN_MIGRATION = True 
     207RUN_MIGRATION = False 
    190208#Default to one day 
    191209MIGRATION_INTERVAL = 86400 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

    r8091 r8112  
    5959            <div class="header-top"> 
    6060         
    61         <!-- A.1 SITENAME --> 
    62         <a class="sitelogo" href="/" title="Home"></a> 
    63           <div class="sitename"> 
    64           </div> 
    65         </div> 
    66          
     61                        <!-- A.1 SITENAME --> 
     62                        <a class="sitelogo" href="/" title="Home"></a> 
     63                          <div class="sitename"> 
     64                          </div> 
     65                        </div> 
     66                 
    6767                <div class="header-bottom"> 
    6868                        <br /> 
     
    7272   
    7373   
    74   </div> 
     74  </div> <!-- end headerContainer --> 
     75 
    7576  <div class="container_12 corner-page-bottom"></div>  
     77<!-- END HEADER SECTION --> 
    7678   
    77     <!-- C. MAIN SECTION -->       
     79<!-- C. MAIN SECTION -->       
    7880        <div class="container_12 fill" id="mainContainer"> 
    7981                <div class="corner-page-top"></div>     
     
    8486                        {% block main %}{% endblock %} 
    8587         
    86                 </div> 
     88                </div> <!--end main --> 
    8789        </div> 
    8890<!-- Place content above here --> 
    89 </div> 
     91 
     92    <!-- Footer section--> 
     93         
    9094        <div class="container_12 fill" id="footerContainer"> 
    91         <br /> 
    92         <br /> 
     95                <br /> 
     96                <br /> 
    9397                <div id="footer" class="grid_12"> 
    9498                        <a href="http://www.ncas.ac.uk"><img src="{{ STATIC_URL }}img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a> 
     
    103107     
    104108        </div>   <!-- End of footer div --> 
    105         <div class="container_12 corner-page-bottom"></div>  
    106  
     109                <div class="container_12 corner-page-bottom"></div>  
     110        </div> 
    107111</body> 
    108112</html> 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/index.html

    r8096 r8112  
    33{% block meta_title %}{% endblock %} 
    44 
    5 <div class="grid_12"> 
    65 
    76{% block title %}CEDA Metadata Catalogue Home Page 
Note: See TracChangeset for help on using the changeset viewer.