Changeset 8273


Ignore:
Timestamp:
20/04/12 14:38:11 (7 years ago)
Author:
gparton
Message:

amendment to search page, addition of martian map

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

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

    r8272 r8273  
    4545        function publicationDetails(coObs,ids){ 
    4646                var pubDetails = {}; 
    47                 var typePub=(ids.hasOwnProperty('DOI'))?"Dataset is Citatable <br /> additional metadata fields may be added ": coObs.publicationState.value; 
     47                var typePub=(ids.hasOwnProperty('DOI'))?"Dataset is Citable <br /> additional metadata fields may be added ": coObs.publicationState.value; 
    4848 
    4949                pubDetails['pubType'] = typePub; 
     
    200200        } 
    201201         
    202         function drawMap(extents, map_id){ 
     202        function drawMap(extents, map_id,ids){ 
    203203                map = new OpenLayers.Map(map_id); 
    204         var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} ); 
    205         map.addLayer(ol_wms); 
    206                  
     204                if (ids['ceda_title'].code != 'Data from Mars Analysis Correction Data Assimilation (MACDA)'){ 
     205                        var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} ); 
     206                        map.addLayer(ol_wms); 
     207                } 
     208                else { 
     209                        var mars_wms = new OpenLayers.Layer.WMS( "Mars Basemap", "http://cedawms.badc.rl.ac.uk/marsbasemap?", {layers: 'mars'} );  
     210                        map.addLayer(mars_wms); 
     211                } 
     212 
    207213                var renderer = OpenLayers.Util.getParameters(window.location.href).renderer; 
    208214        renderer = (renderer) ? [renderer] : OpenLayers.Layer.Vector.prototype.renderers; 
     
    380386                                        var help_id  = new dojo.html.set(dojo.byId("help_id"),rps['cl_pointofcontact'][Object.keys(rps['cl_pointofcontact'])[0]].helpString); 
    381387                                         
    382                                         drawMap(coObs.geographicExtent,'map'); 
     388                                        drawMap(coObs.geographicExtent,'map',ids); 
    383389                                         
    384390                                        var resultTime_id  = new dojo.html.set(dojo.byId("resultTime_id"),resultTime(coObs.phenomenonTime)['timeString']); 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

    r8267 r8273  
    2020                <div id='pubDetails_id'></div> 
    2121        </div> 
    22         <div class = "grid_8"> 
     22        <div class = "grid_9"> 
    2323                <div id="title_id"></div> 
    2424        </div>   
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaSearch.html

    r8211 r8273  
    3636                        <input type="text" name="searchTerm" value= "" data-dojo-type="dijit.form.TextBox" data-dojo-props="trim:true, propercase:true" id="coSearchTerm"/> 
    3737                </div> <!-- End of div fieldWrapper --> 
    38                 <button id="search_obs" type="submit"></button> 
     38                <button data-dojo-type="dijit.form.Button" id="search_obs" type="submit" name="submitButton" value="Submit">Search</button> 
     39                <button data-dojo-type="dijit.form.Button" type="reset">Reset</button> 
     40 
     41                 
     42                 
    3943        </div> <!-- End of div myForm --> 
    4044</div> <!-- End of div claro --> 
Note: See TracChangeset for help on using the changeset viewer.