Changeset 2675

Timestamp:

29/06/07 22:15:47 (14 years ago)

Author:

lawrence

Message:

Interim commit in support of browse and discovery.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/ndgDiscovery.config (modified) (2 diffs)
• controllers/discovery.py (modified) (1 diff)
• controllers/login.py (modified) (2 diffs)
• controllers/retrieve.py (modified) (1 diff)
• lib/base.py (modified) (2 diffs)
• public/layout/ndg2.css (modified) (2 diffs)
• templates/dif.kid (modified) (4 diffs)
• templates/meta.kid (added)
• templates/ndgPage.kid (modified) (4 diffs)
• templates/stubB.kid (modified) (2 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgDiscovery.config

@@ -43 +43 @@
 ###### user customisable:
 localLink:      http://ndg.nerc.ac.uk/
-localImage:     %(layout)sndg_logo.gif
+localImage:     %(layout)sndg_logo_circle.gif
 localAlt:       visit badc
 ###### ought to be the end of the customisations
 ndgLink:        http://ndg.nerc.ac.uk/
-ndgImage:       %(layout)sndg_logo.gif
+ndgImage:       %(layout)sndg_logo_circle.gif
 ndgAlt:         visit ndg
 stfcLink:       http://ceda.stfc.ac.uk/
@@ -57 +57 @@
 printer:        %(layout)sprinter.gif
 helpIcon:       %(layout)shelp_icon.gif
-HdrLeftAlt:     %(layout)sNatural Environment Researhc Council
+HdrLeftAlt:     %(layout)sNatural Environment Research Council
 HdrLeftLogo:    %(layout)sNERC_Logo.gif
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py

@@ -167 +167 @@
                     return render_response('content')
                 c.xml=renderDiscoverySet(difs,state,self.cf)
-                print self.oneLineSearch()
                 f=file('debug-dif.xml','w')
                 f.write(c.xml)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

@@ -8 +8 @@
         #where are we going back to?
         self.inputs=dict(parse_querystring(request.environ))
-        print self.inputs
         if 'r' in self.inputs:
             c.returnTo=self.inputs['r']
@@ -22 +21 @@
         session['panelView']='History'
         session.save()
+        
         # and now go back to whence we had come
-        try:
-            h.redirect_to(c.returnTo)
-        except:
-            #Dom added this try except as the http redirect was failing if controller accessed directly e.g. through http://localhost:8080/login
-            return 'Logged in'
-        
+        if c.returnTo!='':
+            try:
+                h.redirect_to(c.returnTo)
+            except:
+                pass
+        c.xml='<p> Login Successful </p>'
+        return render_response(content)
+            
     def wayf(self):
         ''' NDG equivalent to Shibboleth WAYF '''

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py

@@ -76 +76 @@
             elif self.uri.schema=='DIF':
                 r='dif'
-                c.doc=DIF.DIF(x.tree,et=1)
+                c.doc=DIF.DIF(x.tree,et=1,ndgObj=self.uri)
                 name=c.doc.name
-                print c.doc.parameters
+                print c.doc.ndgObject
             elif self.uri.schema=='NumSim':
                 r='numsim'

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

@@ -5 +5 @@
 from pylons.helpers import abort, redirect_to, etag_cache
 from pylons.i18n import N_, _, ungettext
+from paste.request import construct_url
 import ows_server.models as model
 import ows_server.lib.helpers as h
@@ -26 +27 @@
         # is under environ['pylons.routes_dict'] should you want to check
         # the action or route vars here
+        c.requestURL=construct_url(environ)
         return WSGIController.__call__(self, environ, start_response)
     

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css

@@ -37 +37 @@
 }
 
-.searchBar {
-text-align:right;
-margin-top: 2px; margin-bottom: 2px; background-color:  #f0f0f0;
-font-weight:bold;
-}
-.searchBar #loginBar {text-align:right;}
+.searchBar {margin-top: 2px; background-color:  #f0f0f0; font-weight:bold;}
+.searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;}
 /* .searchOneLine {margin-top: 2px; margin-bottom: 2px; background-color: #f0f0f0; text-align:right; font-size:100%;} */
 
 #Header {color: black; background-color: white; text-align: center; margin-bottom: 10px; padding-top: 3px; padding-right: 0px; padding-left: 0px; padding-bottom: 0px; font-size: medium; font-weight:bold; color:white}
-#Header table {padding:20px;}
+#Header table {margin:0px; padding:20px;}
 
 /* Left Column if Necessary */
@@ -147 +143 @@
 
 /* And now the footer */
-
-#Footer  { color: #999999; background-color: #f4f4f4; margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; clear: both; border-top: 2px solid #3c78b5; margin-top:10px; font-size:80%;}
+#Footer  { color: #999999; background-color: #eeeeee; margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; clear: both; border-top: 2px solid #333333; margin-top:10px; font-size:80%; border-bottom: 2px solid #333333;}
 
 /* Footer not yet checked */

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/dif.kid

@@ -1 @@
-<html py:extends="'ndgPage.kid'" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
+<html py:extends="ndgPage.kid,meta.kid" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
 
     <head py:replace="pagehead()"/>
@@ -5 +5 @@
     <div id="entirepage">
         <div py:replace="header()"/>
+        <div py:replace="searchOneLine()"/>
         <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
         <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
@@ -18 +19 @@
                 </div>
                 <div py:replace="ParameterList(c.doc.parameters)"/> 
+                <div py:replace="Coverage()"/>
+                <div py:replace="Sensors()"/>
+                <div py:replace="Sources()"/>
+                <div py:replace="Curator()"/>
+                <div py:replace="Services()"/>
             </div>
         </div>
@@ -26 +32 @@
         <div py:replace="footer()"/>
     </div>
+    
+    
+    
     </body>
 </html>

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

@@ -28 +28 @@
         <table width="100%"><tr><td align="left">
         <form action="$g.discoveryURL">
-        New Search&nbsp;<input type="text" size="25" name="searchString"/>
+        Free Text Search&nbsp;<input type="text" size="25" name="searchString"/>
             <select name="textTarget">
             <option value="Authors">Authors</option>
@@ -78 +78 @@
     </div>
     
-    <!-- Parameter list class, used in StubB and DIF -->
-    
-    <div py:def="ParameterList(params)" class="ParameterList">
-        <table cellspacing="0" cellpadding="3" border="0" width="100%"><tbody>
-            <tr><td class="linehead"><span class="heading0"> Parameters</span></td></tr>
-            <span py:for="item in params">
-                <tr><td class="rowhead">$item</td></tr>
-                <?python
-                #need to make sure keyword with spaces are not split inappropriately
-                keywords=[]
-                for word in params[item]:
-                    keywords.append(word.replace(' ','&nbsp;'))
-                keywords='; '.join(keywords)
-                ?>
-                <tr py:if="params[item]!=[]"><td>$keywords</td></tr>
-            </span>
-        </tbody></table>
-    </div>
-    
-    
     <!-- Page Footer follows -->
 
@@ -146 +126 @@
     <span py:def="logOut()" class="logOut">
         <form action="$g.logout">
-            <input type="hidden" name="r" value="$g.server${h.url_for()}"/>
+            <input type="hidden" name="r" value="$c.requestURL"/>
             <input type="submit" value="Logout"/>
         </form>
@@ -153 +133 @@
     <span py:def="logIn()" class="logIn">
         <form action="$g.wayfuri">
-            <input type="hidden" name="r" value="$g.server${h.url_for()}"/>
+            <input type="hidden" name="r" value="$c.requestURL"/>
             <input type="submit" value="Login"/>
         </form>

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

@@ -1 @@
-<html py:extends="'ndgPage.kid'" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
+<html py:extends="ndgPage.kid,meta.kid" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
 
     <head py:replace="pagehead()"/>
@@ -61 +61 @@
                 </div> <!-- DeploymentList -->
                 
+                <div py:replace="Services()"/>
                 
-                <div id="ServiceList">
-                    <table cellspacing="0" cellpadding="3" width=" 100%" border="0"><tbody>
-                      <tr><td class="linehead" colspan="3"><span class="headingO">Links and Services</span></td></tr>
-                      <!-- s=renderService(self.config) 
-                      <tr py:for="item in c.doc.services"><td>$s.get(item)<td><tr>
-                      -->
-                      <tr py:if="c.doc.ndgObject is not None">
-                        <td width="20%"><span py:replace="linkimage(c.doc.ndgObject.xmlURL,c.icons_xml,'[XML]')"/></td>
-                        <td>Downloadable XML version of this record</td>
-                      </tr>
-                      <tr py:if="c.doc.ndgObject is not None">
-                        <td width="20%"><span py:replace="linkimage(c.doc.ndgObject.printableURL,c.icons_prn,'[HTML]')"/></td>
-                        <td>Viewable XML version of this record</td>
-                      </tr>
-                    </tbody></table>
-                </div> <!-- ServiceList -->
-      
                 <center>
                 <p>Not all information in this record may be rendered in this view. Please see the XML version for complete