[Checkins] SVN: grokapps/kirbi/trunk/ merged philipp's changes to
be compatible with current grok api;
Luciano Ramalho
luciano at ramalho.org
Tue Jan 22 13:35:52 EST 2008
Log message for revision 83095:
merged philipp's changes to be compatible with current grok api;
changed macro invocation in templates to get rid of warnings;
tweaked buildout.cfg for current versions
Changed:
_U grokapps/kirbi/trunk/
U grokapps/kirbi/trunk/buildout.cfg
U grokapps/kirbi/trunk/src/kirbi/app.py
U grokapps/kirbi/trunk/src/kirbi/app_templates/index.pt
U grokapps/kirbi/trunk/src/kirbi/app_templates/login.pt
U grokapps/kirbi/trunk/src/kirbi/book_templates/index.pt
U grokapps/kirbi/trunk/src/kirbi/collection_templates/addbookitems.pt
U grokapps/kirbi/trunk/src/kirbi/collection_templates/index.pt
U grokapps/kirbi/trunk/src/kirbi/form.pt
U grokapps/kirbi/trunk/src/kirbi/ftests/learning.txt
U grokapps/kirbi/trunk/src/kirbi/ftests/xmlrpc.txt
U grokapps/kirbi/trunk/src/kirbi/item_templates/borrow.pt
U grokapps/kirbi/trunk/src/kirbi/pac_templates/addbooks.pt
U grokapps/kirbi/trunk/src/kirbi/pac_templates/index.pt
U grokapps/kirbi/trunk/src/kirbi/user_templates/usersearch.pt
-=-
Property changes on: grokapps/kirbi/trunk
___________________________________________________________________
Name: svn:externals
- bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
+ grok svn://svn.zope.org/repos/main/grok/trunk
bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
Modified: grokapps/kirbi/trunk/buildout.cfg
===================================================================
--- grokapps/kirbi/trunk/buildout.cfg 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/buildout.cfg 2008-01-22 18:35:52 UTC (rev 83095)
@@ -2,7 +2,13 @@
develop = . kirbifetch
parts = app data zopectl test test_kirbifetch devpython-kirbifetch
find-links = http://download.zope.org/distribution/
+versions = versions
+extends = http://grok.zope.org/releaseinfo/grok-0.10.2.cfg
+[versions]
+grok = 0.11.1
+martian = 0.9.2
+
[data]
recipe = zc.recipe.filestorage
Modified: grokapps/kirbi/trunk/src/kirbi/app.py
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/app.py 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/app.py 2008-01-22 18:35:52 UTC (rev 83095)
@@ -43,9 +43,12 @@
PAC_NAME = u'pac'
COLLECTIONS_FOLDER_NAME = u'u'
-grok.define_permission('kirbi.AddCopy')
-grok.define_permission('kirbi.ManageBook')
+class AddCopy(grok.Permission):
+ grok.name('kirbi.AddCopy')
+class ManageBook(grok.Permission):
+ grok.name('kirbi.ManageBook')
+
def setup_pau(pau):
pau['principals'] = PrincipalFolder()
pau.authenticatorPlugins = ('principals',)
Modified: grokapps/kirbi/trunk/src/kirbi/app_templates/index.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/app_templates/index.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/app_templates/index.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">Main</title>
</head>
Modified: grokapps/kirbi/trunk/src/kirbi/app_templates/login.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/app_templates/login.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/app_templates/login.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<body>
Modified: grokapps/kirbi/trunk/src/kirbi/book_templates/index.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/book_templates/index.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/book_templates/index.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">
Book detail: <span tal:replace="view/main_title" />
Modified: grokapps/kirbi/trunk/src/kirbi/collection_templates/addbookitems.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/collection_templates/addbookitems.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/collection_templates/addbookitems.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">
Public Catalog
Modified: grokapps/kirbi/trunk/src/kirbi/collection_templates/index.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/collection_templates/index.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/collection_templates/index.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
</head>
Modified: grokapps/kirbi/trunk/src/kirbi/form.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/form.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/form.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<body>
<span metal:fill-slot="content_title"
Modified: grokapps/kirbi/trunk/src/kirbi/ftests/learning.txt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/ftests/learning.txt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/ftests/learning.txt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -6,7 +6,7 @@
First we setup the app::
- >>> from grok.ftests.xmlrpc_helper import ServerProxy
+ >>> from zope.app.testing.xmlrpc import ServerProxy
>>> from zope.app.component.hooks import setSite
>>> from kirbi.app import Kirbi
>>> root = getRootFolder()
Modified: grokapps/kirbi/trunk/src/kirbi/ftests/xmlrpc.txt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/ftests/xmlrpc.txt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/ftests/xmlrpc.txt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -5,7 +5,7 @@
First we setup the app and XML-RPC proxy to the PAC (the public access
book catalog)::
- >>> from grok.ftests.xmlrpc_helper import ServerProxy
+ >>> from zope.app.testing.xmlrpc import ServerProxy
>>> from kirbi.app import Kirbi
>>> root = getRootFolder()
>>> root['kirbi'] = Kirbi()
Modified: grokapps/kirbi/trunk/src/kirbi/item_templates/borrow.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/item_templates/borrow.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/item_templates/borrow.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<body>
<span metal:fill-slot="content_title"
Modified: grokapps/kirbi/trunk/src/kirbi/pac_templates/addbooks.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/pac_templates/addbooks.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/pac_templates/addbooks.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">
Public Catalog
Modified: grokapps/kirbi/trunk/src/kirbi/pac_templates/index.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/pac_templates/index.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/pac_templates/index.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">
Public Catalog
Modified: grokapps/kirbi/trunk/src/kirbi/user_templates/usersearch.pt
===================================================================
--- grokapps/kirbi/trunk/src/kirbi/user_templates/usersearch.pt 2008-01-22 17:00:25 UTC (rev 83094)
+++ grokapps/kirbi/trunk/src/kirbi/user_templates/usersearch.pt 2008-01-22 18:35:52 UTC (rev 83095)
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/@@master/page">
+<html metal:use-macro="context/@@master/macros/page">
<head>
<title metal:fill-slot="title">
Public Catalog
More information about the Checkins
mailing list