Changeset 2800

Timestamp:

13/08/07 16:01:08 (14 years ago)

Author:

lawrence

Message:

Changing to the new tab layout ... (incomplete)

Location:

TI05-delivery/ows_framework/trunk/ows_server

Files:

• ndgDiscovery.config (modified) (1 diff)
• ows_server/controllers/discovery.py (modified) (1 diff)
• ows_server/controllers/retrieve.py (modified) (2 diffs)
• ows_server/lib/base.py (modified) (1 diff)
• ows_server/public/layout/ndg2.css (modified) (2 diffs)
• ows_server/templates/advanced.kid (modified) (1 diff)
• ows_server/templates/dif.kid (modified) (2 diffs)
• ows_server/templates/ndgPage.kid (modified) (2 diffs)
• ows_server/templates/results.kid (modified) (1 diff)
• ows_server/templates/stubB.kid (modified) (1 diff)

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

@@ -49 +49 @@
 stfcLink:       http://ceda.stfc.ac.uk/
 stfcImage:      %(layout)sstfc-circle-sm.gif
-key:            %(layout)skeySm.gif
+key:            %(layout)skey.gif
 keyGrey:        %(layout)skeyG.gif
 selectI:        %(layout)stick.png

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

@@ -188 +188 @@
                     else:
                         c.querystring=''
+                    session['results']=h.current_url()
+                    session.save()
                     return render_response('results')
                 

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

@@ -98 +98 @@
             c.xml='<div class="error">%s</div>'%x
             r='error'
-            
+        
+        if status: session['lastViewed']=h.current_url()
+        
         if status and 'ndgSec' in session:
             #we can update the history
@@ -110 +112 @@
                 rb.append((name,uri))
                 session['history']=rb.tolist()
-            session.save()
+        
+        if status: session.save()
        
         if r=='content':

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

@@ -42 +42 @@
             cc=construct_url(environ,querystring=qs)
             h.redirect_to(cc)
+        
+        c.pageTabs=[('Search',g.discoveryURL)]
+        if 'results' in session: c.pageTabs.append(('Results',session['results']))
+        if 'lastViewed' in session: c.pageTabs.append(('Display',session['lastViewed']))
+        
+        if 'ndgSec' in session:
+            c.pageTabs.append(('Selections','Blah'))
+            c.pageTabs.append(('Visualise','Blah'))
 
         return WSGIController.__call__(self, environ, start_response)

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

@@ -37 +37 @@
 }
 
-.searchBar {margin-top: 2px; background-color:  #f0f0f0; }
+.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;}
 .searchBar .hidden {display:none}
@@ -44 +44 @@
 #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 {margin:0px; padding:20px;}
+
+/* Main Tabs First Cut */
+/* Reminder: top, right, bottom, left */
+#PageTabs {margin: 5px 0px 0px 0px; line-height:normal;border: solid black; border-width: 0px 0px 0px 0px;}
+#PageTabRow {width:100%; }
+#PageTabRow ul {margin:0 0 0 10px; padding:0; list-style:none; }
+#PageTabRow li {float:left; margin-right:10px; padding: 2px 10px; border: solid black; border-width:1px 1px 0px 1px; }
+#PageTabRow li.current {position:relative; top:1px; background-color: #f0f0f0; } /* color should be same as searchBar! */
+#PageTabRow li.hidden {}
+#PageTabRow a {display:block; text-decoration:none;}
+.line {border-top: 1px solid black; clear:both;}
+
 
 /* Left Column if Necessary */

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

@@ -5 +5 @@
     <div id="entirepage">
         <div py:replace="header1(0)"/>
-        <!--! 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"/>
+        <!--! 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"/>-->
+        <div py:replace="PageTabs('Search')"/>
         <div class="outer">
             <div class="inner">

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

@@ -5 +5 @@
     <div id="entirepage">
         <div py:replace="header()"/>
+        <div py:replace="PageTabs('Display')"/>
         <div py:replace="searchOneLine()"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
+        <!--! 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"/>
         <?python
@@ -12 +13 @@
         if "ndgSec" in session: id="contentsRight"
         ?> 
-        <div id="${id}">
+        <div id="${id}">-->
+        <div id="contents">
             <div class="metadata">
                 <div class="headingblock">

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

@@ -49 +49 @@
             <input type="submit" value="Search"/>
          </form>
-         </td><td align="right">
+         </td><!--<td align="right">
          <form action="$g.discoveryURL">
             <input type="submit" value="New Search"/>
             <span py:replace="helpIcon('ns_help')"/>
          </form>
-         </td><td align="right">
+         </td>--><td align="right">
             <span py:if="'ndgSec' in session" id="loginBar">
             <span py:replace="logOut()"/></span>
@@ -67 +67 @@
             <div class="helptxt"><p> This will return you to the new search page</p></div>
           </div>
+    </div>
+    
+    <div py:def="PageTabs(tabv)" id="PageTabs">
+        <div id="PageTabRow">
+            <ul>
+                <span py:for="tab in c.pageTabs">
+                    <?python
+                    linkto=True
+                    if tab[0] == tabv: 
+                        status='current'
+                        linkto=False
+                    else: status='hidden'
+                    ?>
+                    <li class="$status"><span class="pagetab">
+                        ${XML(h.link_to_if(linkto,tab[0],tab[1]))}
+                    </span></li> 
+                 </span>
+                <!--<li py:for="i in enumerate()" class="${status[i[0]]}">
+                    <span class="pagetab">${i[1]}</span>
+                </li>-->
+                <!--    <li class="${status[i[0]]}">
+                        <span class="pagetab"> ${i[1]}</span>
+                    </li>
+                    <li> $i </li>
+                </span>-->
+            </ul>
+        </div>
+        <div class="line"/>
+        <div class="clear"/>
     </div>
 

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

@@ -5 +5 @@
     <div id="entirepage">
         <div py:replace="header()"/>
+        <!--<?python
+            tlist=['Search Page','Results','Selections','WMS','WCS']
+            status=['hidden','current','hidden','hidden','hidden']
+        ?>
+        <div py:replace="PageTabs(tlist,status)"/>-->
+        <div py:replace="PageTabs('Results')"/>
         <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"/>
+        <!-- <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>-->
         <?python
         id="contents"

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

@@ -5 +5 @@
     <body>
         <div id="entirepage"> ${XML(c.tbinfo)} <div py:replace="header()"/>
+            <div py:if="'ndgSec'in session" py:replace="PageTabs('Display')"/>
             <div py:replace="searchOneLine()"/>
-            <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
+            <!--! 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"/>
             <?python id="contents"
             if "ndgSec" in session: id="contentsRight"
             ?>
-            <div id="${id}">
-
+            <div id="${id}">-->
+            <div id="contents">
                 <div class="metadata">
                     <div class="headingblock">