[Checkins] SVN: Grokstar/trunk/ Updated Grokstar to use Grok 0.13

Graham Stratton gns24 at beasts.org
Wed Jul 30 00:20:24 EDT 2008


Log message for revision 89011:
  Updated Grokstar to use Grok 0.13

Changed:
  U   Grokstar/trunk/buildout.cfg
  U   Grokstar/trunk/src/grokstar/__init__.py
  U   Grokstar/trunk/src/grokstar/blog.py
  U   Grokstar/trunk/src/grokstar/blog_templates/blogindex.pt
  U   Grokstar/trunk/src/grokstar/blog_templates/categories.pt
  U   Grokstar/trunk/src/grokstar/blog_templates/draftsindex.pt
  U   Grokstar/trunk/src/grokstar/blog_templates/recententries.pt
  U   Grokstar/trunk/src/grokstar/blog_templates/search.pt
  U   Grokstar/trunk/src/grokstar/calendar_templates/dateindex.pt
  U   Grokstar/trunk/src/grokstar/entry_templates/entryindex.pt

-=-
Modified: Grokstar/trunk/buildout.cfg
===================================================================
--- Grokstar/trunk/buildout.cfg	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/buildout.cfg	2008-07-30 04:20:22 UTC (rev 89011)
@@ -3,7 +3,7 @@
 parts = app data zopectl test
 find-links = http://download.zope.org/distribution/
 newest = false
-extends= http://grok.zope.org/releaseinfo/grok-0.12.1.cfg
+extends= http://grok.zope.org/releaseinfo/grok-0.13.cfg
 versions = versions
 
 [data]

Modified: Grokstar/trunk/src/grokstar/__init__.py
===================================================================
--- Grokstar/trunk/src/grokstar/__init__.py	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/__init__.py	2008-07-30 04:20:22 UTC (rev 89011)
@@ -20,7 +20,7 @@
 pygments_directive.content = 1
 directives.register_directive('sourcecode', pygments_directive)
 
-from grok import View, Viewlet, Application
+from grok import View, Application
 def application(self, name=None):
     obj = self.context
     while obj is not None:
@@ -31,5 +31,4 @@
 
 
 View.application = property(application)
-Viewlet.application = property(application)
 #XXX You didn't really see me do that, did you?
\ No newline at end of file

Modified: Grokstar/trunk/src/grokstar/blog.py
===================================================================
--- Grokstar/trunk/src/grokstar/blog.py	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog.py	2008-07-30 04:20:22 UTC (rev 89011)
@@ -33,8 +33,6 @@
         self['entries'] = Entries()
 
 
-
-
 @grok.subscribe(Blog, grok.IObjectAddedEvent)
 def registerAsUtility(app, event):
     app.getSiteManager().registerUtility(app, grok.interfaces.IApplication)

Modified: Grokstar/trunk/src/grokstar/blog_templates/blogindex.pt
===================================================================
--- Grokstar/trunk/src/grokstar/blog_templates/blogindex.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog_templates/blogindex.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -1,8 +1,8 @@
-<div tal:condition="not: view/entries">
+<div tal:condition="not: viewlet/entries">
   No published entries. <a tal:attributes="href string:${view/application/@@absolute_url}/edit">Set up Grokstar</a>, then <a tal:attributes="href string:${view/application/@@absolute_url}/addentry">add an entry</a>
 </div>
 <div class="entries">
-  <tal:block repeat="entry view/entries">
+  <tal:block repeat="entry viewlet/entries">
     <tal:block content="structure entry/@@item"/>
 	  	<hr/>
   </tal:block>

Modified: Grokstar/trunk/src/grokstar/blog_templates/categories.pt
===================================================================
--- Grokstar/trunk/src/grokstar/blog_templates/categories.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog_templates/categories.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -1,10 +1,10 @@
-<h4 tal:condition="view/categories">Categories</h4>
+<h4 tal:condition="viewlet/categories">Categories</h4>
 <ul>
-  <li tal:repeat="cat view/categories">
+  <li tal:repeat="cat viewlet/categories">
     <a tal:attributes="href string:${context/@@absolute_url}/?c=${cat}"
        tal:content="cat" />
-    <ul tal:condition="python:cat==view.c">
-      <li tal:repeat="entry view/entries"><a tal:attributes="href string:${entry/@@absolute_url}?c=${view/c}"
+    <ul tal:condition="python:cat==viewlet.c">
+      <li tal:repeat="entry viewlet/entries"><a tal:attributes="href string:${entry/@@absolute_url}?c=${viewlet/c}"
               tal:content="structure entry/title">An entry</a></li>
     </ul>
   </li>

Modified: Grokstar/trunk/src/grokstar/blog_templates/draftsindex.pt
===================================================================
--- Grokstar/trunk/src/grokstar/blog_templates/draftsindex.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog_templates/draftsindex.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -1,6 +1,6 @@
 <a href="../add">Add Blog Entry</a><br />
 <div class="entries">
-  <tal:block repeat="entry view/entries">
+  <tal:block repeat="entry viewlet/entries">
     <tal:block content="structure entry/@@item"/>
   </tal:block>
 </div>
\ No newline at end of file

Modified: Grokstar/trunk/src/grokstar/blog_templates/recententries.pt
===================================================================
--- Grokstar/trunk/src/grokstar/blog_templates/recententries.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog_templates/recententries.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -1,4 +1,4 @@
 <h4>Recent entries</h4>
 <ul>
-<li tal:repeat="entry view/entries"><a tal:content="entry/title" tal:attributes="href entry/@@absolute_url"></a></li>
+<li tal:repeat="entry viewlet/entries"><a tal:content="entry/title" tal:attributes="href entry/@@absolute_url"></a></li>
 </ul>
\ No newline at end of file

Modified: Grokstar/trunk/src/grokstar/blog_templates/search.pt
===================================================================
--- Grokstar/trunk/src/grokstar/blog_templates/search.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/blog_templates/search.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -5,12 +5,12 @@
   </p>
 </form>
 <tal:was_search condition="request/q | nothing">
-  <tal:no_results condition="not:view/results">
+  <tal:no_results condition="not:viewlet/results">
     Sorry, no results for '<span tal:replace="request/q" />'
   </tal:no_results>
-  <div class="search-results" tal:condition="view/results">
+  <div class="search-results" tal:condition="viewlet/results">
     <ol>
-      <li tal:repeat="entry view/results"><a tal:attributes="href string:${entry/@@absolute_url}?q=${request/q}"
+      <li tal:repeat="entry viewlet/results"><a tal:attributes="href string:${entry/@@absolute_url}?q=${request/q}"
           tal:content="structure entry/title">An entry</a></li>
     </ol>
   </div>

Modified: Grokstar/trunk/src/grokstar/calendar_templates/dateindex.pt
===================================================================
--- Grokstar/trunk/src/grokstar/calendar_templates/dateindex.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/calendar_templates/dateindex.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -1,5 +1,5 @@
 <div class="entries">
-  <tal:block repeat="entry view/entries">
+  <tal:block repeat="entry viewlet/entries">
 	<tal:block content="structure entry/@@item"/>
 	<hr/>
   </tal:block>

Modified: Grokstar/trunk/src/grokstar/entry_templates/entryindex.pt
===================================================================
--- Grokstar/trunk/src/grokstar/entry_templates/entryindex.pt	2008-07-30 02:59:10 UTC (rev 89010)
+++ Grokstar/trunk/src/grokstar/entry_templates/entryindex.pt	2008-07-30 04:20:22 UTC (rev 89011)
@@ -4,7 +4,7 @@
 
 <a name="comments"></a>
 <p tal:condition="context/values" class="commenthead">Comments</p>
-<div class="comment" tal:repeat="comment view/comments">
+<div class="comment" tal:repeat="comment viewlet/comments">
   <p class="commenttitle"><span tal:replace="comment/author">Fred</span> wrote on <span tal:replace="python:comment.date.strftime('%e %B %Y')">29 February 1999</span>:</p>
   <tal:block content="structure comment/@@renderedcomment" />
 </div>



More information about the Checkins mailing list