Changeset 5314

Timestamp:

19/05/09 16:44:06 (12 years ago)

Author:

cbyrom

Message:

Improve look and feel of UI with tweaks to css + fix radio button
on search panel - set this explicitly as an input since htmlfill
doesn't handle the radio button defaults well + simplify template
logic for semantic search results + fix constraint summary string.

Location:

MILK/trunk/milk_server/milk_server

Files:

• controllers/browse/discovery.py (modified) (1 diff)
• controllers/home.py (modified) (1 diff)
• models/DiscoveryState.py (modified) (2 diffs)
• public/layout/style/ndg2.css (modified) (2 diffs)
• templates/browse/browse_functions.html (modified) (2 diffs)
• templates/browse/discovery_search.html (modified) (1 diff)
• templates/browse/semantic.kid (modified) (1 diff)
• templates/vocabsearch/vocabsearch.html (modified) (1 diff)

MILK/trunk/milk_server/milk_server/controllers/browse/discovery.py

@@ -450 +450 @@
             if searchConstraints['geoSearchType']:
                 c.geoSearchType = searchConstraints['geoSearchType']
+                
+        # NB, htmlfill doesn't handle the checked property correctly, so need
+        # to add this explicitly here
+        if 'source' not in self.inputs:
+            self.inputs['source'] = 'NERC_DDC'
         
         return self.savePageAndRender("browse/discovery_search", **self.inputs)

MILK/trunk/milk_server/milk_server/controllers/home.py

@@ -53 +53 @@
             # replace any browse links with to links to editor
             html = html.replace(VTD.BROWSE_SERVER_URL, g.server)
-            
+
             # NB, need html in unicode for for htmlfill.render
             html = unicode(html, 'utf-8', 'xmlcharrefreplace')

MILK/trunk/milk_server/milk_server/models/DiscoveryState.py

@@ -84 +84 @@
         if c:
             c += ', '
+
         c += 'Bounding box: '
         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' \
                 %(overlaps,bbox[3],bbox[0],bbox[1],bbox[2])
-        if self.values['scope']: 
+                
+        if self.values['scope']:
+            if c:
+                c += ', ' 
             c += 'Scope: %s'%self.values['scope']
         if self.values['textTarget']:
+            if c:
+                c += ', ' 
             c += 'Target: %s'%self.values['textTarget']
         return c

MILK/trunk/milk_server/milk_server/public/layout/style/ndg2.css

@@ -39 +39 @@
 }
 
+#pageTitle
+{
+        padding:5px;
+}
+
 .working 
 {
@@ -103 +108 @@
         font-size:small;
 }
+
 .searchBar {margin-top: 2px; background-color:  #f0f0f0; } /* Change this color and you need to change the color in the pagetab current */
 .searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;font-weight:bold;}

MILK/trunk/milk_server/milk_server/templates/browse/browse_functions.html

@@ -30 +30 @@
                 </div>
             </div>
-                    <div py:replace="vocabSearchAutoComplete(showInfo = False)" />
+                    <div py:replace="vocabSearchAutoComplete(showInfo = False)"/>
             <div class="searchHdr">Free text search <span py:replace="helpIcon('fts_help')"/></div>
             <div id="fts_help" class="hidden" >
@@ -77 +77 @@
                <label for="All"><input type="radio" name="source" value="All" id="All" />All</label>
                &nbsp;&nbsp;&nbsp;
-               <label for="nercddc"><input type="radio" name="source" value="NERC_DDC" id="nercddc" checked="checked"/>NERC Data Centres only</label>
+               <label for="nercddc"><input type="radio" name="source" value="NERC_DDC" id="nercddc"/>NERC Data Centres only</label>
            </div><br/>                  
            <div id="SearchSubmit">

MILK/trunk/milk_server/milk_server/templates/browse/discovery_search.html

@@ -44 +44 @@
     <div id="entirepage">
         <div py:if="c.inputErrors" py:replace="displayErrorDict(c.inputErrors)"/>
-                <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>
+                <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>
         <div class="outer">
             <div class="inner">

MILK/trunk/milk_server/milk_server/templates/browse/semantic.kid

@@ -3 +3 @@
         <div id="SemanticSearchResults">
             <span py:if="c.semAvailable">You could also try -
-                <span py:if="c.synonyms !=[]"> 
+                <span py:if="c.synonyms"> 
                     synonym(s): <span py:for="i,url in c.synonyms"><a href="$url">$i</a>&nbsp;</span>
-                    <span py:if="c.narrower!=[] or c.broader!=[]">;</span>
+                    <span py:if="c.narrower or c.broader">;</span>
                 </span>
-                <span py:if="c.narrower !=[]"> 
+                <span py:if="c.narrower"> 
                     narrower search(s): <span py:for="i,url in c.narrower"><a href="$url">$i</a>&nbsp;</span>
-                    <span py:if="c.broader!=[]">;</span>
+                    <span py:if="c.broader">;</span>
                 </span>
-                <span py:if="c.broader !=[]"> 
+                <span py:if="c.broader"> 
                     broader search(s): <span py:for="i,url in c.broader"><a href="$url">$i</a>&nbsp;</span>
-                </span>.
+                </span>
             </span>
             <span py:if="not c.semAvailable">No alternatives available$c.semError</span>

MILK/trunk/milk_server/milk_server/templates/vocabsearch/vocabsearch.html

@@ -4 +4 @@
         <xi:include href="../utils.html" />
 
-        <div py:def="vocabSearchAutoComplete(showInfo = True)">
+        <div py:def="vocabSearchAutoComplete(showInfo = True)" class="SearchBox">
 
                 <link rel="stylesheet" type="text/css" href="$g.server/js/yui/autocomplete/assets/skins/sam/autocomplete.css" />