Changeset 8314 for mauRepo/MolesManager

Timestamp:

14/05/12 12:55:53 (9 years ago)

Author:

jhorton

Message:

added additional functions that are found on original page

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• static/templates/cedaBrowse.html (modified) (5 diffs)
• views/cedaBrowse.py (modified) (2 diffs)

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

@@ -102 +102 @@
             show: "blind",
             hide: "explode",
-            title: 'Help'
+            title: 'citation'
         });
         $("#b_cit").click(function() {
           $citationdialog.dialog('open');
+          return false;
+        });
+        var $downloaddialog = $('<div></div>')
+          .html('{{ download_name }} <a href="{{ download_link }}" target="_blank">download</a>')
+          .dialog({
+            autoOpen: false,
+            show: "blind",
+            hide: "explode",
+            title: 'download'
+        });
+        $("#b_download").click(function() {
+          $downloaddialog.dialog('open');
           return false;
         });
@@ -179 +191 @@
           <button id="b1">sample data</button>
           <br/>
-          <button id="b2">download and services</button>
+          <button id="b_download">download and services</button>
           <br/>
           <button id="b3">apply for access</button>
@@ -253 +265 @@
               <li><a href="#tabs-6">Project Details</a></li>
               <li><a href="#tabs-7">Data Production Details</a></li>
-              <li><a href="#tabs-8">documentation and links</a></li>
-              <li><a href="#tabs-9">archive content details</a></li>
+              <li><a href="#tabs-8">Documentation and links</a></li>
+              <li><a href="#tabs-9">Archive content details</a></li>
+              <li><a href="#tabs-10">Keywords</a></li>
+              <li><a href="#tabs-11">Previous Identifiers Used</a></li>
             </ul>
 
@@ -332 +346 @@
             <div id="tabs-9">
               <p>
+For further details see the following link: <br/> 
+                <a href="{{ moles2url }}" target="_blank">CEDA MOLES2 Metadata Catalogue Entry</a>
+              </p>
+<!--
               <textarea readonly="readonly" width="100%" cols="90" rows="4" style="overflow=y:scroll">
 Number Of Files : {{ archive_no_files }}
@@ -338 +356 @@
 {% endfor %}
               </textarea>
-              </p>
+-->
+            </div>
+            <div id="tabs-10">
+            <p>
+Keywords : {{ keywords }}
+            </p>
+            </div>
+            <div id="tabs-11">
+            <p>
+<a href="{{ moles2url }}" target="_blank">{{ moles2url }}</a>
+            </p>
             </div>
           </div>

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaBrowse.py

@@ -23 +23 @@
         if v.authority.title == 'ceda_title':
             c['title'] = v.code
+        if v.authority.title == 'moles2url':
+            c['moles2url'] = v.code
     for v in record.relatedParty:
         if v.role.name == 'cl_author':
@@ -59 +61 @@
     c['related_data'] = record.relatedObservation;
     c['quality_statement'] = record.resultQuality
+    c['keywords'] = record.keywords[0].keyword[0];
+    c['download_link'] = record.result.source[0].linkage
+    c['download_name'] = record.result.source[0].name
     lk = []
     for l in record.result.source: