Changeset 2533 for TI07-MOLES/trunk/PythonCode/wsgi/DiscoveryTemplate.py

Timestamp:

31/05/07 09:59:23 (14 years ago)

Author:

lawrence

Message:

Discovery now defaults to an advanced interface which is getting close
to that required by ticket:731. The first point on ticket:733 is now done too.

File:

• TI07-MOLES/trunk/PythonCode/wsgi/DiscoveryTemplate.py (modified) (2 diffs)

TI07-MOLES/trunk/PythonCode/wsgi/DiscoveryTemplate.py

@@ -13 +13 @@
 # Note that this has been deliberately laid out to be used inside some other page driving format 
 # including headers, footers etc, and css ...
-#
-# V0.0, Bryan Lawrence, September 28, 2006.
 #
 #########################################################################################################
@@ -151 +149 @@
 </div>'''
 
+oneLiner='''<input type="text" size="60" name="searchString"><input type="hidden" value="0" name="advanced">
+            (Target:&nbsp;<select name="textTarget">
+            <option value="Authors">Authors</option>
+            <option value="All" selected="selected">All</option>
+            <option value="Params">Parameters</option> </select>)'''
+
 searchTextOneLine='''
     <div class="searchOneLine"><form action="%(discoveryURL)s">
-        New Search:&nbsp;
-        <input type="text" size="60" name="searchString"><input type="hidden" value="0" name="advanced">
-        (Target:&nbsp;<select name="textTarget">
-            <option value="Authors">Authors</option>
-            <option value="All" selected="selected">All</option>
-            <option value="Params">Parameters</option> </select>) </form>
+        New Search:&nbsp;%(oneLiner)s</form>
     </div>'''
+    
+
+revisedAdvancedSearch='''
+    <div class="AdvancedSearch">
+        <form action="%(advancedURL)s">
+            <table class="SearchBox"><tbody>
+                <tr><td>Free&nbsp;Text&nbsp;Search:&nbsp;<input type="text" size="60" name="searchString"> 
+                (Target:&nbsp;<select name="textTarget">
+                    <option value="Authors">Authors</option>
+                    <option value="All" selected="selected">All</option>
+                    <option value="Params">Parameters</option> </select>)</td></tr>
+                <tr><td align="center"><div class="searchMethod">
+                    <table><tbody>
+                        <tr><td colspan="2"><span class="searchHdr"> Refine by Temporal Coverage </span></td></tr>
+                        <tr><td>Start date: </td>
+                            <td><input type="text" value="%(startDateDay)s" size="2" name="startDateDay"/>
+                                <input type="text" value="%(startDateMon)s" size="3" name="startDateMon"/>
+                                <input type="text" value="%(startDateYear)s" size="4" name="startDateYear"/>
+                            </td>
+                        </tr>      
+                        <tr><td>End date: </td>
+                            <td><input type="text" value="%(endDateDay)s" size="2" name="endDateDay"/>
+                                <input type="text" value="%(endDateMon)s" size="3" name="endDateMon"/>
+                                <input type="text" value="%(endDateYear)s" size="4" name="endDateYear"/>
+                            </td>
+                        </tr>
+                        <tr><td colspan="2">(Format: dd mmm yyyy)</td></tr>
+                    </tbody></table>
+                </div></td></tr>
+                <tr><td align="center"><div class="searchMethod">
+                    <table><tbody>
+                        <tr><td colspan="3"><span class="searchHdr"> Refine by Spatial Coverage</span><br/></td></tr>
+                        <tr><td>Northerly Latitude:</td>
+                            <td colspan="2" align="center">
+                            <input size="7" value="%(bboxN)s" name="bboxN"/></td></tr>
+                        <tr><td>Longitudinal Extent:</td>
+                            <td><input size="8" value="%(bboxW)s" name="bboxW"/></td>
+                            <td><input size="8" value="%(bboxE)s" name="bboxE"/></td> </tr>
+                        <tr><td> Southerly Latitude:</td>
+                        <td colspan="2" align="center">
+                        <input size="7"value="%(bboxS)s" name="bboxS"/></td></tr>
+                        <tr><td colspan="3"> (Units: degrees, north and east positive)</td></tr>
+                     </tbody></table>
+                </div></td></tr>
+                <tr><td align="center"><div class="searchMethod"> 
+                    <table><tbody>
+                        <tr><td colspan="2"><span class="searchHdr"> Refine by Source Data Centres </span></td></tr>
+                        <tr><td> All</td><td><input type="radio" name="source" value="All" checked="checked"></td></tr>
+                        <tr><td> NERC Data Centres</td><td><input type="radio" name="source" value="NERC_DDC"/></td></tr>
+                        <tr><td> Marine Data Partnership (MDIP)</td><td><input type="radio" name="source" value="MDIP"/></td></tr>
+                    </tbody></table>
+                 </div></td></tr>
+                <tr><td align="center"><input type="submit"></td></tr>
+            </tbody></table>
+            <input type="hidden" value="1" name="advanced"/>
+         </form>
+    </div>'''
+    
+    
+