Changeset 8141
- Timestamp:
- 05/03/12 14:18:15 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk/src/MolesManager
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js
r8137 r8141 1 1 define(['dojo'], function(dojo){ 2 2 console.log("loads cedaObservation.js") 3 3 // function <nameOfFunction>(parameter, parameter2..etc coming in){ 4 4 // write operations to prepare value to return … … 90 90 value: "" 91 91 }, "keywords_id"); 92 keywords_id.startup(); 93 94 <<<<<<< .mine 95 var description_id = new dijit.form.TextBox({ 96 value: "" 97 }, "description_id"); 98 description_id.startup(); 92 keywords_id.startup(); 99 93 100 94 //---------------------------------------------- … … 102 96 //---------------------------------------------- 103 97 104 =======105 //----------------------------------------------106 //------- Loads the widgets with values --------107 //----------------------------------------------108 109 >>>>>>> .r8136110 98 var json = dojo.byId('coObs_id').value; 111 99 var coObs = dojo.fromJson(json); -
mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html
r8140 r8141 22 22 <title>{% block meta_title %}{% endblock %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %}</title> 23 23 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="/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" /> 28 28 <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.6/dijit/themes/claro/claro.css" /> 29 29 <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.5/dijit/themes/claro/layout/ContentPane.css" /> … … 36 36 console.log("load dojoConfig"); 37 37 var dojoConfig = { 38 asynch:true, 38 39 parseOnLoad: true, 39 40 isDebug: true, … … 41 42 extraLocale: ['it-it'], 42 43 // Register 'ceda' js libs 43 // Make sure the module path does *not* end in a slash. 44 paths: {"ceda": "/static/js"} 44 // Make sure the module path does *not* end in a slash. 45 packages:[ 46 { 'name': 'ceda', 'location': '/js'} 47 ] 45 48 }; 46 49 console.log(dojoConfig); 47 50 </script> 48 <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7. 1/dojo/dojo.js">51 <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.2/dojo/dojo.js"> 49 52 </script> 50 53 … … 134 137 <div class="grid_12 whiteFill" id="footer"> 135 138 <div class="grid_12 alpha" id="footerLogos"> 136 <p><a href="http://www.ncas.ac.uk"><img src=" img/ncas_logo_fullcolour.jpg" alt="NCAS logo" title="NCAS" align="left"/></a>137 <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="/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> 138 141 </div> <!-- End div footerLogos--> 139 142 <div class="grid_6 push_3 whiteFill omega" id="footerStatements"> -
mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html
r8120 r8141 7 7 8 8 {% block main %} 9 10 <script type="text/javascript"> 11 require(['ceda/cedaObservation']); 12 </script> 9 13 10 14 <div id = "upper_section" class="grid_12 whiteFill"> -
mauRepo/MolesManager/trunk/src/MolesManager/urls.py
r8139 r8141 44 44 url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}), 45 45 ) 46 47 urlpatterns += patterns('', 48 url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}), 49 ) 46 50 #urlpatterns += staticfiles_urlpatterns()
Note: See TracChangeset
for help on using the changeset viewer.