Changeset 8280

Timestamp:

20/04/12 19:12:07 (7 years ago)

Author:

gparton

Message:

 

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• static/js/cedaObservation.js (modified) (1 diff)
• static/js/cedaSearch.js (modified) (1 diff)
• static/templates/cedaSearch.html (modified) (1 diff)
• urls.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

@@ -322 +322 @@
                          //obs_id.startup();
                          
-                         var button = new dijit.form.Button({
-                                 type: "submit",
-                         label: "Search",
+                         // var button = new dijit.form.Button({
+                                 // type: "submit",
+                         // label: "Search",
                          //onClick: function(){ console.log("First button was clicked!"); }
-                     }, "search_obs");
-                     button.startup();
+                     // }, "search_obs");
+                     // button.startup();
                          
                          

mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaSearch.js

@@ -37 +37 @@
                          var json = dojo.byTitle('coSearch_id').value;
                                  var coObs = dojo.fromJson(json);
-
-                                 console.log(coObs.identifier.length)
-
-                                 console.log(coObs)
-
                                  dojo.attr("title_id", 'value', '');
                  });                                      

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

@@ -9 +9 @@
 <div class="grid_12">
           <h5>Search</h5>
-          <p>Use the search function below to locate your CEDA Observation record</p>
+          <p>This search function is designed for the new CEDA metadata database and is under development.</p>
+                  <p>External users are <b>strongly</b> advised to make use of the search function at the top of this page to search the existing CEDA Metadata catalogue or the NERC Data Discovery Service.</p>
 </div> <!-- End of div stuff -->
 <div class="grid_12 claro fillWhite">

mauRepo/MolesManager/trunk/src/MolesManager/urls.py

@@ -22 +22 @@
 
     (r'cov/(\d+)$', 'coView'),
+)
+
+urlpatterns += patterns('MolesManager.views.index',
+
+    (r'cov/$', 'home'),
 )