Changeset 8112

Timestamp:

22/02/12 17:16:41 (8 years ago)

Author:

gparton

Message:

 

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• settings.py (modified) (10 diffs)
• static/templates/base.html (modified) (4 diffs)
• static/templates/index.html (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/settings.py

@@ -19 +19 @@
 PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
 
+PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1]
+
 
 MANAGERS = ADMINS
@@ -25 +27 @@
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '/misc/frigid3/humid1/mnagni/workspaces/moles3/MolesManager/src/sqlite.db',                      # Or path to database file if using sqlite3.
+        '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.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
@@ -79 +81 @@
 
 
-
 # URL prefix for admin static files -- CSS, JavaScript and images.
 # Make sure to use a trailing slash.
@@ -87 +88 @@
 # Additional locations of static files
 STATICFILES_DIRS = (
-    ()
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
@@ -98 +98 @@
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
+    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+
+
 
 # Make this unique, and don't share it with anybody.
@@ -110 +113 @@
 #     'django.template.loaders.eggs.Loader',
 )
+
+
 
 MIDDLEWARE_CLASSES = (
@@ -121 +126 @@
 ROOT_URLCONF = 'MolesManager.urls'
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.request",
+    "django.core.context_processors.static",
+)
+
+
 TEMPLATE_DIRS = (
     decodeRelativePath('static/templates')                  
@@ -127 +142 @@
     # Don't forget to use absolute paths, not relative paths.
 )
+
 
 INSTALLED_APPS = (
@@ -171 +187 @@
 MOLES3 = 'moles3'
 #MOLES3_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName'
-MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION'
+#MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION'
+MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION'
 
 
@@ -182 +199 @@
 #MIGRATION_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName'
 
-MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION'
+#MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION'
+MIGRATION_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/ceda_moles3_test'#'PG_MOLES3_DB_CONNECTION'
 
 from libs.migration.db.migrationTables import doTables as doMigration
 MIGRATION_DB_SCRIPT = doMigration
 
-RUN_MIGRATION = True
+RUN_MIGRATION = False
 #Default to one day
 MIGRATION_INTERVAL = 86400

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

@@ -59 +59 @@
             <div class="header-top">
         
-        <!-- A.1 SITENAME -->
-        <a class="sitelogo" href="/" title="Home"></a>
-          <div class="sitename">
-          </div>
-        </div>
-        
+                        <!-- A.1 SITENAME -->
+                        <a class="sitelogo" href="/" title="Home"></a>
+                          <div class="sitename">
+                          </div>
+                        </div>
+                
                 <div class="header-bottom">
                         <br />
@@ -72 +72 @@
   
   
-  </div>
+  </div> <!-- end headerContainer -->
+
   <div class="container_12 corner-page-bottom"></div> 
+<!-- END HEADER SECTION -->
   
-    <!-- C. MAIN SECTION -->      
+<!-- C. MAIN SECTION -->      
         <div class="container_12 fill" id="mainContainer">
                 <div class="corner-page-top"></div>    
@@ -84 +86 @@
                         {% block main %}{% endblock %}
         
-                </div>
+                </div> <!--end main -->
         </div>
 <!-- Place content above here -->
-</div>
+
+    <!-- Footer section-->
+        
         <div class="container_12 fill" id="footerContainer">
-        <br />
-        <br />
+                <br />
+                <br />
                 <div id="footer" class="grid_12">
                         <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 @@
     
         </div>   <!-- End of footer div -->
-        <div class="container_12 corner-page-bottom"></div> 
-
+                <div class="container_12 corner-page-bottom"></div> 
+        </div>
 </body>
 </html>

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

@@ -3 +3 @@
 {% block meta_title %}{% endblock %}
 
-<div class="grid_12">
 
 {% block title %}CEDA Metadata Catalogue Home Page