Changeset 8112
- Timestamp:
- 22/02/12 17:16:41 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk/src/MolesManager
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/settings.py
r8096 r8112 19 19 PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) 20 20 21 PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1] 22 21 23 22 24 MANAGERS = ADMINS … … 25 27 'default': { 26 28 '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. 28 30 'USER': '', # Not used with sqlite3. 29 31 'PASSWORD': '', # Not used with sqlite3. … … 79 81 80 82 81 82 83 # URL prefix for admin static files -- CSS, JavaScript and images. 83 84 # Make sure to use a trailing slash. … … 87 88 # Additional locations of static files 88 89 STATICFILES_DIRS = ( 89 ()90 90 # Put strings here, like "/home/html/static" or "C:/www/django/static". 91 91 # Always use forward slashes, even on Windows. … … 98 98 'django.contrib.staticfiles.finders.FileSystemFinder', 99 99 'django.contrib.staticfiles.finders.AppDirectoriesFinder', 100 # 'django.contrib.staticfiles.finders.DefaultStorageFinder', 101 ) 100 'django.contrib.staticfiles.finders.DefaultStorageFinder', 101 ) 102 103 104 102 105 103 106 # Make this unique, and don't share it with anybody. … … 110 113 # 'django.template.loaders.eggs.Loader', 111 114 ) 115 116 112 117 113 118 MIDDLEWARE_CLASSES = ( … … 121 126 ROOT_URLCONF = 'MolesManager.urls' 122 127 128 TEMPLATE_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 123 138 TEMPLATE_DIRS = ( 124 139 decodeRelativePath('static/templates') … … 127 142 # Don't forget to use absolute paths, not relative paths. 128 143 ) 144 129 145 130 146 INSTALLED_APPS = ( … … 171 187 MOLES3 = 'moles3' 172 188 #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' 190 MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION' 174 191 175 192 … … 182 199 #MIGRATION_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 183 200 184 MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 201 #MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 202 MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION' 185 203 186 204 from libs.migration.db.migrationTables import doTables as doMigration 187 205 MIGRATION_DB_SCRIPT = doMigration 188 206 189 RUN_MIGRATION = True207 RUN_MIGRATION = False 190 208 #Default to one day 191 209 MIGRATION_INTERVAL = 86400 -
mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html
r8091 r8112 59 59 <div class="header-top"> 60 60 61 62 63 64 65 66 61 <!-- A.1 SITENAME --> 62 <a class="sitelogo" href="/" title="Home"></a> 63 <div class="sitename"> 64 </div> 65 </div> 66 67 67 <div class="header-bottom"> 68 68 <br /> … … 72 72 73 73 74 </div> 74 </div> <!-- end headerContainer --> 75 75 76 <div class="container_12 corner-page-bottom"></div> 77 <!-- END HEADER SECTION --> 76 78 77 79 <!-- C. MAIN SECTION --> 78 80 <div class="container_12 fill" id="mainContainer"> 79 81 <div class="corner-page-top"></div> … … 84 86 {% block main %}{% endblock %} 85 87 86 </div> 88 </div> <!--end main --> 87 89 </div> 88 90 <!-- Place content above here --> 89 </div> 91 92 <!-- Footer section--> 93 90 94 <div class="container_12 fill" id="footerContainer"> 91 <br />92 <br />95 <br /> 96 <br /> 93 97 <div id="footer" class="grid_12"> 94 98 <a href="http://www.ncas.ac.uk"><img src="{{ STATIC_URL }}img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a> … … 103 107 104 108 </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> 107 111 </body> 108 112 </html> -
mauRepo/MolesManager/trunk/src/MolesManager/static/templates/index.html
r8096 r8112 3 3 {% block meta_title %}{% endblock %} 4 4 5 <div class="grid_12">6 5 7 6 {% block title %}CEDA Metadata Catalogue Home Page
Note: See TracChangeset
for help on using the changeset viewer.