Changeset 8244


Ignore:
Timestamp:
17/04/12 17:07:50 (7 years ago)
Author:
gparton
Message:

modification to cedaObservation record rendering and also index to give some useful description of the catalogue in case users land on this page.

Location:
mauRepo/MolesManager/trunk/src/MolesManager/static
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/static/css/ceda.css

    r8120 r8244  
    6161} 
    6262 
    63 #cedaObsLogo { height: 120px; 
     63#cedaObsLogo { height: 60px; 
    6464background: url(../img/cedaObsLogo.jpg) no-repeat ;  
    6565} 
     
    7070} 
    7171 
    72 #lower_tab1{ 
     72#lower_tab1 { 
    7373margin:0px; 
    7474} 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

    r8242 r8244  
    2525                } 
    2626                 
    27                 pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b> Created: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>'; 
     27                pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b><br /> Created: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>'; 
    2828                return pubDetails 
    2929        } 
     
    242242                                map.addLayer(boxes); 
    243243                                var boxes  = new OpenLayers.Layer.Vector( "boxes" ); 
     244                                 
    244245                 
    245246                } 
     
    262263         
    263264                 
    264 //        map.zoomToMaxExtent(); 
     265        map.zoomToMaxExtent(); 
    265266                 
    266267        } 
     
    300301                         description_id.startup();                        
    301302                          
    302                          var title_id = new dijit.form.Textarea( 
    303                                  { 
    304                                  value: "", 
    305                          }, "title_id"); 
    306                          title_id.startup(); 
    307303                          
    308304                         //var citation_id = new dijit.titlePane( 
     
    331327                                        console.log(coObs) 
    332328                                        console.log(coObs.identifier.length) 
    333                                                                  
     329                                         
     330                                         
     331                                         
     332                                        // var title_id = new dijit.TitlePane( 
     333                                        // { 
     334                                                // title: 'CEDA Dataset Metadat Record', content: '<div class="grid_2"><div id="cedaObsLogo"></div><div id="pubDetails_id"></div></div><div class="grid_7"><h3>'+ids['ceda_title']+'</h3></div>' 
     335                                        // },"title_id"); 
     336                                        // title_id.startup(); 
     337                                         
     338                                        var title_id  = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ids['ceda_title']+'</h3>');  
    334339                                        var rps = getRelatedParties(coObs); 
    335                                         dojo.attr("title_id", 'value', ids['ceda_title']); 
    336340                                        var pubDetails = publicationDetails(coObs); 
    337341                                        var pubDetails_id  = new dojo.html.set(dojo.byId("pubDetails_id"),pubDetails['pubString']);  
     
    339343                                        var citation_id = new dijit.TitlePane( 
    340344                                        { 
    341                                                 title: "Citation", content: createCitation(coObs,ids,rps[0],pubDetails) 
     345                                                title: 'Citation', content: createCitation(coObs,ids,rps[0],pubDetails) 
    342346                                        },"citation_id"); 
    343347                                        citation_id.startup(); 
     
    352356                                         
    353357                                        var dataLink_id = new dojo.html.set(dojo.byId("datalink_id"),downloadLink(coObs.result)); 
    354                                          
    355358                                        var access_id  = new dojo.html.set(dojo.byId("access_id"),accessLink(coObs.permission)); 
    356359                                        var help_id  = new dojo.html.set(dojo.byId("help_id"),rps[1]); 
    357                                         var docLink_id  = new dojo.html.set(dojo.byId("docLink_id"),docLinkObj(ids['moles2url'])); 
    358  
    359                                         //dojo.attr("citation_id", 'content', createCitation(coObs,ids,rps[0],pubDetails)); 
    360                                         dojo.attr("records_dataLineage", 'value', coObs.dataLineage); 
     360                                        drawMap(coObs.geographicExtent,'map'); 
     361                                        var resultTime_id  = new dojo.html.set(dojo.byId("resultTime_id"),resultTime(coObs.phenomenonTime)['timeString']); 
    361362                                        dojo.attr("description_id", 'value', coObs.description); 
    362363                                        dojo.attr("keywords_id", 'value', coObs.keywords); 
    363                                         //dojo.attr("access_id",'value',''); 
    364364                                        dojo.attr("help_id",'value',''); 
    365                                         drawMap(coObs.geographicExtent,'map'); 
    366                                         var resultTime_id  = new dojo.html.set(dojo.byId("resultTime_id"),resultTime(coObs.phenomenonTime)['timeString']); 
    367                                          
     365                                        dojo.attr("records_dataLineage", 'value', coObs.dataLineage); 
     366                                        var docLink_id  = new dojo.html.set(dojo.byId("docLink_id"),docLinkObj(ids['moles2url'])); 
     367 
    368368                                 } 
    369369                 });                                       
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

    r8242 r8244  
    55        {% endblock %} 
    66 
    7 {% block title %} CEDA Observation Record {% endblock %} 
     7{% block title %} 
     8{% endblock %} 
    89     
    910{% block main %} 
     
    1213        require(['ceda/cedaObservation']); 
    1314</script> 
     15<div class="grid_12 whiteFill"> 
     16        <div class="grid_2"> 
     17                <div id="cedaObsLogo"></div> 
     18                <div id='pubDetails_id'></div> 
     19        </div> 
     20        <div class = "grid_8"> 
     21                <div id="title_id"></div> 
     22                <div id="citation_id"></div> 
     23                <div id="pastCitation_id"></div> 
     24                <label for="keywords"><b>Keywords</b></label><div id="keywords_id"></div> 
     25        </div>   
     26</div> 
    1427 
    1528<div id = "upper_section" class="grid_12 whiteFill"> 
    16   <h4>Search Results</h4> 
    17   <div class="grid_2" id="cedaObsLogo"></div> <!-- End of div cedaObsLogo --> 
    18   <div class="grid_8 " id="upper_middle"> 
    19         <div class="grid_8 alpha cedaObs" id="upper_middle_top"> 
    20                 <div id='pubDetails_id'></div> 
    21                 <label for="title"><b>Title</b></label><div id="title_id" class = "coObs_cite"></div>   <br /> 
    22                 <div id="citation_id"></div> 
    23                 <div id="pastCitation_id"></div> 
    24                 <label for="keywords"><b>Keywords</b></label><div id="keywords_id"></div><br /> 
    25         </div> <!-- End of div upper_middle_top --> 
    26  
    27   </div>     
    28 </div>   
    29  
    30  
    31 <div id = "middle_section" class="grid_12 whiteFill"> 
    32         <div class="grid_3 cedaobs alpha" id="middleLeft cedaObs"> 
     29        <div class="grid_4 cedaObs" id="middleLeft cedaObs"> 
    3330                <script type="text/javascript"> 
    3431                        require(["dojo/parser", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane"]); 
     
    3633         
    3734                <div data-dojo-type="dijit.layout.AccordionContainer"> 
    38                         <div data-dojo-type="dijit.layout.ContentPane" title="Sample Data"> 
    39             <p>Link to some Sample Data </p> 
    40         </div> 
    4135                        <div data-dojo-type="dijit.layout.ContentPane" title="Download & Services" selected="true"> 
    42             <div id="datalink_id"><p>Links to download and data services </p></div> 
    43         </div> 
     36                                <div id="datalink_id"><p>Links to download and data services </p></div> 
     37                        </div> 
    4438                        <div data-dojo-type="dijit.layout.ContentPane" title="Apply for Access"> 
    45                         <div id="access_id">Access to these data may be restricted</div> 
     39                                <div id="access_id">Access to these data may be restricted</div> 
     40                        </div> 
     41                        <div data-dojo-type="dijit.layout.ContentPane" title="Help"> 
     42                                <div id="help_id">For assistance contact <a href="mailto:badc@rl.ac.uk">badc@rl.ac.uk</a></div> 
     43                        </div> 
    4644                </div> 
    47                         <div data-dojo-type="dijit.layout.ContentPane" title="Help"> 
    48             <div id="help_id">For assistance contact <a href="mailto:badc@rl.ac.uk">badc@rl.ac.uk</a></div> 
    49         </div> 
    50                 </div> 
    51         </div>   
    52         <div class="grid_5 cedaObs" id="middleMiddle"> 
    53                 <div class="grid_5 alpha" id="description"> 
     45                <label for="geographicExtent">Geographic Extent</label><div id="geographicalExtent_id"></div> <br /> 
     46                <div style="width:300px; height:175px" id="map" class="smallmap"></div> 
     47                <div id="resultTime_id"></div> 
     48        </div>   
     49        <div class="grid_7 cedaObs" id="middleMiddle"> 
     50                <div class="grid_7 alpha" id="description"> 
    5451                        <label for="description">Description</label><div id="description_id"></div> 
    5552                        <br /> 
     
    5855                         <p>News bar</p> 
    5956                </div><!-- End of div news  --> 
    60         </div>     
    61         <div class="grid_3 cedaObs omega" id="middleRight"> 
    62                 <label for="geographicExtent">Geographic Extent</label><div id="geographicalExtent_id"></div> <br /> 
    63                 <!-- begin map test --> 
    64          
    65         <div style="width:220px; height:150px" id="map" class="smallmap"></div> 
    66  
    67                 <!-- end map test --> 
    68  
    69                 <label for="resolution">Resolution</label><div id="resolution_id"></div> <br />  
    70                 <div id="resultTime_id"></div> 
    71    </div> <!-- End of div upper_right --> 
    72 </div> <!-- End of div upper_section --> 
     57        </div> 
     58</div>   
     59         <!-- End of div upper_right --> 
     60 <!-- End of div upper_section --> 
    7361 
    7462 
    7563<div id="lower_section" class="grid_12 whiteFill"> 
    76  
    77    
    78     <div id="lower_tab1" class="grid_7 cedaObs" style="height:300px"> 
     64    <div id="lower_tab1" style="height:300px" class="grid_8 push_2 cedaObs"> 
    7965 
    8066                <script type="text/javascript"> 
     
    9884                 
    9985                        <!-- content panes: title is tab name, make this tab selected --> 
    100                         <div dojoType="dijit.layout.ContentPane" title="Parameters" selected="true">                     
    101                         <p>Parameter List to go in here</p>                      
    102                 </div> 
     86                        <div dojoType="dijit.layout.ContentPane" title="Archive content details" selected="true"> 
     87                                <div id="docLink_id"><p>Links to external documentation and sites</p></div> 
     88                        </div> 
    10389                 
    10490                        <!-- content panes: title is tab name, no special features here --> 
    105                         <div dojoType="dijit.layout.ContentPane" title="Format"> 
    106                         <p>Details of format to go in here</p> 
    107                 </div> 
    10891                 
    10992                        <!-- content panes: title is tab name, make this tab closable --> 
    110                         <div dojoType="dijit.layout.ContentPane" title="Data Quality"> 
    111                         <p>Quality Statement goes in here</p> 
    112                 </div> 
    11393                 
    11494                        <!-- content panes: title is tab name, load content remotely, preload --> 
    11595                        <div dojoType="dijit.layout.ContentPane" title="Data Lineage"> 
    116                         <p><label for="id_dataLineage">Data Lineage</label><div id="records_dataLineage"></div> <br /> <br /></p> 
    117                 </div> 
     96                                <p><label for="id_dataLineage">Data Lineage</label><div id="records_dataLineage"></div> <br /> <br /></p> 
     97                        </div> 
     98                         
    11899                 
    119100                </div> 
    120101 
    121         </div> <!-- End of div lower_tab1 --> 
    122     <div id="lower_side" class="grid_4 cedaObs"> 
    123                 <h5><i>Additional Information:</i></h5> 
    124                  
    125                 <div data-dojo-type="dijit.layout.AccordionContainer"> 
    126                         <div data-dojo-type="dijit.layout.ContentPane" title="Related Data"> 
    127                                 <p>Links to related data products</p> 
    128                         </div> 
    129                         <div data-dojo-type="dijit.layout.ContentPane" title="Project Details"> 
    130                                 <p>Link to Project</p> 
    131                         </div> 
    132                         <div data-dojo-type="dijit.layout.ContentPane" title="Data Production Details"> 
    133                                 <p>Link to Procedure</p> 
    134                         </div> 
    135                         <div data-dojo-type="dijit.layout.ContentPane" title="Documentation and Links"> 
    136                                 <p>Links to external documentation and sites</p> 
    137                         </div> 
    138                         <div data-dojo-type="dijit.layout.ContentPane" title="Archive content details" selected="true"> 
    139                                 <div id="docLink_id"><p>Links to external documentation and sites</p></div> 
    140                         </div> 
    141                         <div data-dojo-type="dijit.layout.ContentPane" title="File list and Checksums"> 
    142                                 <label for="relatedParty">Related Parties</label><div id="relatedParty"></div><br /> 
    143  
    144                         </div> 
    145                 </div>           
     102                         
    146103    </div> <!-- End of div lower_side --> 
    147104</div> <!-- End of div lower_section --> 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/index.html

    r8120 r8244  
    44 
    55 
    6 {% block title %}CEDA Metadata Catalogue Home Page 
     6{% block title %}CEDA Metadata Catalogue (Beta) 
    77{% endblock %} 
    88 
    99{% block main %} 
    10 <div class="grid_12 fillWhite"> 
     10<div class="grid_12 whiteFill"> 
    1111            
    12            <div id="box1" class="grid_3 alpha">  
    13            <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p> 
     12           <div id="box1" class="grid_5">  
     13           <h3>Introduction</h3> 
     14           <p>The Centre for Environmental Data Archival (CEDA) maintains a metadata catalogue to aid data discovery for users. This metadata catalogue has undergone various developments over the years and this catalogue interface is the latest development.</p> 
     15           <h3>Standards</h3> 
     16           <p>The latest version of the CEDA Metadata Catalogue has been built using CEDA's "MOLES 3.4" metadata model which is built on various ISO standards. For further details of MOLES3.4 please <a href="http://www.ceda.ac.uk/contact">contact us</a></p> 
    1417           </div> 
    1518            
    16                 <div id="box2" class="grid_6">  
    17            <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p> 
    18            </div> 
    19                 <div id="box3" class="grid_3 omega">  
    20            <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p> 
     19                <div id="box2" class="grid_5">  
     20                <h3>Using this Catalogue</h3> 
     21           <p>This catalogue is still in its development stage and content may occasionally change and be un-available. Users wishing to explore CEDA's operational metadata catalogue shoudl go to: <a href="http://badc.nerc.ac.uk/discovery?searchString=tet&atomTypeID=All--All&searchTarget=Browse&textTarget=Atom">CEDA Data Catalogue</a></p> 
     22           <p>This catalogue, however, has a finer data granularity  - i.e. has a more detail about the data in our archives - and will still enable users to discover and access data. The first step is to search for data using the search function on the top right of the screen. Entering a character string will search for matching text in the titles of the entries in the catalogue (other search options will be added in due course.</p> 
     23           <h3>Further Information</h3> 
     24           <p>For further informaiton regarding the underlying technology driving this catalogue, the MOLES3.4 model or the catalogue contents please feel free to <a href="http://www.ceda.ac.uk/contact">contact CEDA</a>.</p> 
    2125           </div> 
    2226</div> 
Note: See TracChangeset for help on using the changeset viewer.