Changeset 262:d3952f6bf6d5

Timestamp:

02/08/10 21:52:12 (6 months ago)

Author:

rgrp

Branch:

default

Message:

[templates,controllers/site][s]: change blog link to news and add in word of the week (wotw) proxy.

Location:

shakespeare

Files:

• config/routing.py (modified) (1 diff)
• controllers/site.py (modified) (4 diffs)
• templates/layout_base.html (modified) (1 diff)

shakespeare/config/routing.py

@@ -27 +27 @@
     map.connect('home', '/', controller='site', action='index')
     map.connect('about', '/about/', controller='site', action='about')
+    map.connect('news', '/news/', controller='site', action='news')
+    map.connect('wotw', '/wotw/{url:.*}', controller='site', action='wotw')
     map.connect('guide', '/guide/', controller='site', action='guide')
-    map.connect('news', '/news/', controller='site', action='news')
     map.connect('/resource/{action}/{id}{url:.*}', controller='our_resource')
     map.connect('/material/{action}/{id}', controller='text')

shakespeare/controllers/site.py

@@ -46 +46 @@
   <rule>
     <replace content="children:#content" theme="children:#content" />
+    <!--
     <append content="children:#sidebar" theme="children:#primary" />
+    -->
   </rule>
 </ruleset>
@@ -78 +80 @@
         return render('index.html')
 
+    def guide(self):
+        return render('guide.html')
+
     def about(self):
         if DELIVERANCE_ENABLE:
@@ -83 +88 @@
         else:
             return render('about.html')
-
-    def guide(self):
-        return render('guide.html')
 
     def news(self):
@@ -94 +96 @@
             return self.deliverance(request.environ, self.start_response)
         else:
-            return ''
+            return render('index.html')
+
+    def wotw(self):
+        if DELIVERANCE_ENABLE:
+            # modify path for proxy to strip out /news/
+            currentpath = request.environ['PATH_INFO']
+            request.environ['PATH_INFO'] = '/category' + request.environ['PATH_INFO']
+            return self.deliverance(request.environ, self.start_response)
+        else:
+            return render('index.html')
 
     @property

shakespeare/templates/layout_base.html

@@ -64 +64 @@
       <li><a href="${h.url_for('guide')}">Guide</a></li>
       <li><a href="${h.url_for('about')}">About</a></li>
-      <li><a href="http://blog.openshakespeare.org">Blog</a></li>
+      <li><a href="${h.url_for('news')}">News</a></li>
     </ul>
     <h3 class="hidden">In this section:</h3>