Changeset 5314
- Timestamp:
- 19/05/09 16:44:06 (12 years ago)
- Location:
- MILK/trunk/milk_server/milk_server
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
MILK/trunk/milk_server/milk_server/controllers/browse/discovery.py
r5306 r5314 450 450 if searchConstraints['geoSearchType']: 451 451 c.geoSearchType = searchConstraints['geoSearchType'] 452 453 # NB, htmlfill doesn't handle the checked property correctly, so need 454 # to add this explicitly here 455 if 'source' not in self.inputs: 456 self.inputs['source'] = 'NERC_DDC' 452 457 453 458 return self.savePageAndRender("browse/discovery_search", **self.inputs) -
MILK/trunk/milk_server/milk_server/controllers/home.py
r5299 r5314 53 53 # replace any browse links with to links to editor 54 54 html = html.replace(VTD.BROWSE_SERVER_URL, g.server) 55 55 56 56 # NB, need html in unicode for for htmlfill.render 57 57 html = unicode(html, 'utf-8', 'xmlcharrefreplace') -
MILK/trunk/milk_server/milk_server/models/DiscoveryState.py
r5306 r5314 84 84 if c: 85 85 c += ', ' 86 86 87 c += 'Bounding box: ' 87 88 if bbox is None or bbox==['90.0','-180.0','180.0','-90.0']: … … 91 92 c+='%s latitude %s to %sN and longitude %s to %sE' \ 92 93 %(overlaps,bbox[3],bbox[0],bbox[1],bbox[2]) 93 if self.values['scope']: 94 95 if self.values['scope']: 96 if c: 97 c += ', ' 94 98 c += 'Scope: %s'%self.values['scope'] 95 99 if self.values['textTarget']: 100 if c: 101 c += ', ' 96 102 c += 'Target: %s'%self.values['textTarget'] 97 103 return c -
MILK/trunk/milk_server/milk_server/public/layout/style/ndg2.css
r5306 r5314 39 39 } 40 40 41 #pageTitle 42 { 43 padding:5px; 44 } 45 41 46 .working 42 47 { … … 103 108 font-size:small; 104 109 } 110 105 111 .searchBar {margin-top: 2px; background-color: #f0f0f0; } /* Change this color and you need to change the color in the pagetab current */ 106 112 .searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;font-weight:bold;} -
MILK/trunk/milk_server/milk_server/templates/browse/browse_functions.html
r5261 r5314 30 30 </div> 31 31 </div> 32 <div py:replace="vocabSearchAutoComplete(showInfo = False)" 32 <div py:replace="vocabSearchAutoComplete(showInfo = False)"/> 33 33 <div class="searchHdr">Free text search <span py:replace="helpIcon('fts_help')"/></div> 34 34 <div id="fts_help" class="hidden" > … … 77 77 <label for="All"><input type="radio" name="source" value="All" id="All" />All</label> 78 78 79 <label for="nercddc"><input type="radio" name="source" value="NERC_DDC" id="nercddc" checked="checked"/>NERC Data Centres only</label>79 <label for="nercddc"><input type="radio" name="source" value="NERC_DDC" id="nercddc"/>NERC Data Centres only</label> 80 80 </div><br/> 81 81 <div id="SearchSubmit"> -
MILK/trunk/milk_server/milk_server/templates/browse/discovery_search.html
r5299 r5314 44 44 <div id="entirepage"> 45 45 <div py:if="c.inputErrors" py:replace="displayErrorDict(c.inputErrors)"/> 46 <h3 >$c.title <a href="$g.server/getFeed/discovery"><img border="0" src="$g.feedIcon" alt="Atom feed for discovery service" title="Atom feed for discovery service"/></a> </h3>46 <h3 id="pageTitle">$c.title <a href="$g.server/getFeed/discovery"><img border="0" src="$g.feedIcon" alt="Atom feed for discovery service" title="Atom feed for discovery service"/></a> </h3> 47 47 <div class="outer"> 48 48 <div class="inner"> -
MILK/trunk/milk_server/milk_server/templates/browse/semantic.kid
r4487 r5314 3 3 <div id="SemanticSearchResults"> 4 4 <span py:if="c.semAvailable">You could also try - 5 <span py:if="c.synonyms !=[]">5 <span py:if="c.synonyms"> 6 6 synonym(s): <span py:for="i,url in c.synonyms"><a href="$url">$i</a> </span> 7 <span py:if="c.narrower !=[] or c.broader!=[]">;</span>7 <span py:if="c.narrower or c.broader">;</span> 8 8 </span> 9 <span py:if="c.narrower !=[]">9 <span py:if="c.narrower"> 10 10 narrower search(s): <span py:for="i,url in c.narrower"><a href="$url">$i</a> </span> 11 <span py:if="c.broader !=[]">;</span>11 <span py:if="c.broader">;</span> 12 12 </span> 13 <span py:if="c.broader !=[]">13 <span py:if="c.broader"> 14 14 broader search(s): <span py:for="i,url in c.broader"><a href="$url">$i</a> </span> 15 </span> .15 </span> 16 16 </span> 17 17 <span py:if="not c.semAvailable">No alternatives available$c.semError</span> -
MILK/trunk/milk_server/milk_server/templates/vocabsearch/vocabsearch.html
r5261 r5314 4 4 <xi:include href="../utils.html" /> 5 5 6 <div py:def="vocabSearchAutoComplete(showInfo = True)" >6 <div py:def="vocabSearchAutoComplete(showInfo = True)" class="SearchBox"> 7 7 8 8 <link rel="stylesheet" type="text/css" href="$g.server/js/yui/autocomplete/assets/skins/sam/autocomplete.css" />
Note: See TracChangeset
for help on using the changeset viewer.