Changeset 8090


Ignore:
Timestamp:
16/02/12 16:30:22 (8 years ago)
Author:
mnagni
Message:

Adding in Graham's CEDA views

Location:
mauRepo/MolesManager/trunk
Files:
29 added
5 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/.pydevproject

    r7976 r8090  
    33 
    44<pydev_project> 
    5 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">MolesManagerEnv</pydev_property> 
     5<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python.exe</pydev_property> 
    66<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> 
    77<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION"> 
  • mauRepo/MolesManager/trunk/src/MolesManager/settings.py

    r8089 r8090  
    165165#MOLES3_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 
    166166MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION' 
     167 
     168 
    167169from sqlTables import doTables as doMoles 
    168170MOLES3_DB_SCRIPT = doMoles 
     
    174176 
    175177MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 
     178 
    176179from libs.migration.db.migrationTables import doTables as doMigration 
    177180MIGRATION_DB_SCRIPT = doMigration 
    178181 
    179 RUN_MIGRATION = False 
     182RUN_MIGRATION = True 
    180183#Default to one day 
    181184MIGRATION_INTERVAL = 86400 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

    r8089 r8090  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 
    2 <html> 
     1{% load i18n %} 
     2{% load static %} 
     3{% get_static_prefix as STATIC_URL %} 
     4 
     5<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
     6<html xmlns="http://www.w3.org/1999/xhtml" lang="en"> 
     7 
     8 
     9<!--  Version: Multiflex-5.4 / Overview                     --> 
     10<!--  Type:    Design with sidebar                          --> 
     11<!--  Date:    March 13, 2008                               --> 
     12<!--  Design:  www.1234.info                                --> 
     13<!--  License: Fully open source without restrictions.      --> 
     14<!--           Please keep footer credits with the words    --> 
     15<!--           "Design by 1234.info". Thank you!            --> 
     16 
    317<head> 
    4         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 
    5         <script type="text/javascript"> 
     18 
     19    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />  
     20    <meta name="keywords" content="{% block meta_keywords %}{% endblock %}" />  
     21    <meta name="description" content="{% block meta_description %}{% endblock %}" />  
     22    <title>{% block meta_title %}{% endblock %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %}</title> 
     23 
     24  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/960/reset.css"  /> 
     25  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/960/960_12_col.css"  /> 
     26  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/960/text.css"  /> 
     27  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/ceda.css"  /> 
     28 
     29        <script type="text/javascript"> 
    630                console.log("load dojoConfig"); 
    731        var dojoConfig = { 
     
    1741    </script> 
    1842         
    19         <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"> 
    20         </script> 
    21 <title>{% block title %}{% endblock %}</title> 
     43   
     44    {% block extra_head %}{% endblock %} 
    2245</head> 
     46 
     47<!-- Global IE fix to avoid layout crash when single word size wider than column width --> 
     48<!-- Following line MUST remain as a comment to have the proper effect --> 
     49<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]--> 
     50 
    2351<body> 
    24         <img src="http://media.smashingmagazine.com/images/dojo33.jpg" width="215" height="53" alt="Dojo" /> 
     52  <!-- CONTAINER FOR ENTIRE PAGE --> 
     53  <div class="container_12 fill" id="headerContainer"> 
     54        <div class="corner-page-top"></div>  
     55         
     56    <div class="grid_12 fill" id="header" > 
     57            <div class="header-top"> 
     58         
     59        <!-- A.1 SITENAME --> 
     60        <a class="sitelogo" href="/" title="Home"></a> 
     61          <div class="sitename"> 
     62          </div> 
     63        </div> 
     64         
     65                <div class="header-bottom"> 
     66                        <br /> 
     67                        <br /> 
     68                </div> 
     69        </div> 
     70   
     71   
     72  </div> 
     73  <div class="container_12 corner-page-bottom"></div>  
     74   
     75    <!-- C. MAIN SECTION -->       
     76        <div class="container_12 fill" id="mainContainer"> 
     77                <div class="corner-page-top"></div>     
     78<!-- Place content here --> 
     79                <div class="fill" id="main" >    
     80                        <h1>{% block title %}{% endblock %}</h1>   
     81          
     82                        {% block main %}{% endblock %} 
     83         
     84                </div> 
     85        </div> 
     86<!-- Place content above here --> 
     87</div> 
     88        <div class="container_12 fill" id="footerContainer"> 
     89        <br /> 
     90        <br /> 
     91                <div id="footer" class="grid_12"> 
     92                        <a href="http://www.ncas.ac.uk"><img src="{{ STATIC_URL }}img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a> 
     93                        <a href="http://www.nceo.ac.uk"><img src="{{ STATIC_URL }}img/nceo_logo.jpg" alt="NCEO logo" title="NCEO" align="right"/></a> 
     94                </div> 
     95                <div class="grid_6 push_3" id="footerStatements"> 
     96                        <p>Copyright &copy; 2011 STFC&nbsp;&nbsp;|&nbsp;&nbsp;All Rights Reserved</p> 
     97           
     98                        <p class="credits">Based on 960.gs with design elements from <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a> 
    2599 
    26             <!-- 
    27              
    28     <script> 
    29     $(document).ready(function(){ 
    30            $("a").click(function(event){ 
    31              alert("As you can see, the link no longer took you to jquery.com"); 
    32              event.preventDefault(); 
    33            }); 
    34          }); 
    35                
    36     </script> 
    37         --> 
    38         {% block content %}{% endblock %} 
    39         {% block footer %} 
    40         <p>Thanks!</p> 
    41         {% endblock %} 
     100                </div> 
     101     
     102        </div>   <!-- End of footer div --> 
     103        <div class="container_12 corner-page-bottom"></div>  
     104 
    42105</body> 
    43106</html> 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

    r8089 r8090  
    11{% extends "base.html" %}  
     2        {% block extra_head %} 
     3         
     4        {% endblock %} 
    25 
    3 {% block title %} Current date {% endblock %} 
     6{% block title %} CEDA Observation Record {% endblock %} 
     7     
     8{% block main %} 
    49 
    5 {% block content %} 
     10          <h5>Search</h5> 
     11          <p>Use the search function below to locate your CEDA Observation record</p> 
    612 
    7 <script type="text/javascript"> 
     13<div> 
     14        <script type="text/javascript"> 
    815        require(['dijit/form/TextBox', 'ceda/cedaObservation']); 
    916</script> 
     
    2229        <input type="submit" value="Submit" /> 
    2330 
     31</div> 
     32<div = id"upper_grid"> 
     33 
     34  <h4>Search Results</h4> 
     35  <div class="grid_2 alpha cedaObs"> 
     36  </div> 
     37  <div class="grid_8 "> 
    2438         
     39        <div class="grid_8 alpha cedaObs"> 
     40                <div id="cedaObs.title" > 
     41                        <label for="id_title">Title</label> {{ coObs.identifier }} <br /> 
     42                </div> 
     43                <div id="cedaObs.Citation"> 
     44                        <label for="id_citation">Citation</label> {{ coObs.citation }} <br /> 
     45                </div> 
    2546 
    26         <label for="id_dataLineage">dataLineage</label> 
    27         <input type="text" name="dataLineage" value= "" 
     47                <div id="cedaObs.keywords"> 
     48                        <label for="id_keywords">Keywords</label> <br /> 
     49                                {% for word in coObs.keywords %} 
     50                                            {{ word }} | 
     51                                {% endfor %} 
     52                </div> <!-- end cedaObs keywords -->             
     53        </div> 
     54        <div class="grid_8 alpha cedaObs"> 
     55         <p>News bar</p> 
     56         </div> 
     57         <div class="grid_8 alpha cedaObs"> 
     58         
     59        <label for="id_description">Description</label> <br /> 
     60                                <p>{{ coObs.description }}</p> 
     61        </div> 
     62     
     63  </div> 
     64  </div class="grid_2"> 
     65        <label for="id_geographicExtent">Geographic Extent</label> {{ coObs.geographicExtent }} <br /> 
     66        <label for="id_resolution">Resolution</label> {{ coObs.resolution }} <br /> 
     67         
     68</div> 
     69  
     70 
     71<div id="lower_tab1" class="grid_7 alpha cedaObs "> 
     72                <label for="id_dataLineage">dataLineage</label> <input type="text" name="dataLineage" value= "" 
    2873        data-dojo-type="dijit.form.TextBox" 
    29         data-dojo-props="trim:true, propercase:true" id="records_dataLineage"/> 
     74        data-dojo-props="trim:true, propercase:true" id="records_dataLineage"/> <br /> 
     75                <label for="id_relatedParty">relatedParty</label><br /> 
     76                <ol>{% for par in coObs.relatedParty %} 
     77                 <li>{{ par }} </li> 
     78                {% endfor %} 
     79                </ol> 
     80</div> 
     81<div id="lower_side" class="grid_4 omega cedaObs omega"> 
     82                <p>lower side bar</p> 
     83   </div> 
     84</div> 
    3085 
    31         <div id="relatedParty"></div>    
    32 </form> 
     86<div class="corner-content-1col-bottom"></div>   
    3387 
    3488{% endblock %} 
  • mauRepo/MolesManager/trunk/src/MolesManager/urls.py

    r8089 r8090  
    1919 
    2020urlpatterns += patterns('MolesManager.views.cedaObservationView', 
     21 
    2122    (r'cov/$', 'coView'), 
    2223) 
     24 
     25urlpatterns += patterns('MolesManager.views', 
     26    (r'^$', 'index.home'), 
     27) 
     28 
    2329 
    2430urlpatterns += patterns('', 
    2531    url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT , 'show_indexes': True}), 
    2632) 
     33 
     34 
     35#urlpatterns += staticfiles_urlpatterns() 
Note: See TracChangeset for help on using the changeset viewer.