Added new L-W class and reorganized search page.

esguerra · Jun 7, 2011 · 30b62fc · 30b62fc
1 parent 8c1e98d
commit 30b62fc
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 268 deletions.
diff --git a/html/info/info.htm b/html/info/info.htm
@@ -197,7 +197,8 @@ <h2><span id="news">News</span></h2>
 
 Wednesday - May 25 2011
 <pre>
-Improved html5 and css3 format for info page (info.css) complying with the new aside, article, and section objects.
+Improved html5 and css3 format for info page (info.css) complying with
+the new aside, article, and section objects.
 </pre>
 
 

diff --git a/html/lwclass/cisww.htm~ b/html/lwclass/cisww.htm~
diff --git a/html/search/search_form.htm b/html/search/search_form.htm
@@ -50,56 +50,51 @@ <h2>Leotis-Westhof Patterns for Base-Pairs</h2>
 	<a href="/lwclass/cisww-view">cis W/W</a>
 	<br/>
 	<a href="/lwclass/transhs-view">trans H/S</a>
-
-</ctb>
-<br/><br/>
-
-<ctb>
-	<h2>Leotis-Westhof Patterns per Base-Pair Step</h2>
-	<br/>
-	<a href="/lwclass/cisww-view">cis W/W</a>
 	<br/>
-	<a href="/lwclass/transhs-view">trans H/S</a>
-
+	<a href="/lwclass/transhw-view">trans H/W</a>
 </ctb>
 <br/><br/>
 
 
 
-<!--
 <ctb>
-	<h2>Leotis-Westhof Patterns per Base-Pair</h2>
-	<br/>
-	<a href="/lwclass/cisww-view">cis W/W</a>
+	<h2>Leotis-Westhof Patterns per Base-Pair Step</h2>
 	<br/>
-	<a href="/lwclass/transhs-view">trans H/S</a>
 
+<table id="newspaper-b" summary="Leontis-Westhof Classification of Base-Pair Steps.">
+  <tr>
+    <th> </th> 
+    <th>cWW</th>
+    <th>tHS</th>
+    <th>tHW</th>
+  </tr>
+
+  <tr>
+    <td>cWW</td>
+    <td>cWW</td>
+    <td>cWW</td>
+    <td>cWW</td>    
+  </tr>
+
+  <tr>
+    <td>tHS</td>
+    <td>tHS</td>
+    <td>tHS</td>
+    <td>tHS</td>    
+  </tr>
+
+  <tr>
+    <td>tHW</td>
+    <td>tHW</td>
+    <td>tHW</td>
+    <td>tHW</td>    
+</tr>  
+</table>
 </ctb>
 <br/><br/>
--->
-
 
 
 
-<!--
-<script language="javascript">
-   function link1()
-    {if (document.lwclass.pickme)
-    location='/lwclass/cisww-view'}
-    function link2()
-    {if (document.lwclass.pickme)
-    location='/lwclass/transhs-view'}
-    function link3()
-    {if (document.lwclass.pickme)
-    location='/lwclass/transhs-view'}
-</script>
-<form name="lwclass">
-<input type="radio" name="pickme" onClick="link1()">cis W/W
-<input type="radio" name="pickme" onClick="link2()">trans H/S
-<input type="radio" name="pickme" onClick="link3()">trans H/S
-</form> 
--->
-
 <br />
 <br />
 <br />

diff --git a/steptables/views.py b/steptables/views.py
@@ -29,16 +29,19 @@ def test_view(request):
 
 def cisww_view(request):
     return render_to_response('lwclass/cisww.htm',
-    {'cisww_list': StepIds.objects.filter(edge3='W')
-     & StepIds.objects.filter(edge1='W')
-     & StepIds.objects.filter(edge2='W')
-     & StepIds.objects.filter(edge4='W')},
+    {'cisww_list': StepIds.objects.filter(gly_orie2='cis')},
     context_instance = RequestContext(request))
 
 def transhs_view(request):
     return render_to_response('lwclass/transhs.htm',
     {'transhs_list': StepIds.objects.filter(edge3='H')
-     & StepIds.objects.filter(edge4='S')},
+     & StepIds.objects.filter(edge4='S') },
+    context_instance = RequestContext(request))
+
+def transhw_view(request):
+    return render_to_response('lwclass/transhw.htm',
+    {'transhw_list': StepIds.objects.filter(edge3='H')
+     & StepIds.objects.filter(edge4='W')},
     context_instance = RequestContext(request))
 
 

diff --git a/urls.py b/urls.py
@@ -22,8 +22,9 @@
     (r'^search/', 'search'),                       
     (r'^steps/', 'step_view'),     # Decoupling
     (r'^tests/', 'test_view'),     # Decoupling
-    (r'^lwclass/cisww-view/$', 'cisww_view'),     # Decoupling
+    (r'^lwclass/cisww-view/$', 'cisww_view'),         # Decoupling
     (r'^lwclass/transhs-view/$', 'transhs_view'),     # Decoupling
+    (r'^lwclass/transhw-view/$', 'transhw_view'),     # Decoupling                       
     (r'^forces/', 'force_view'),   # Decoupling
     (r'^info/', 'info'),           # Decoupling                       
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),