[Zope3-checkins] CVS: zopeproducts/zwiki - INSTALL.txt:1.8 README.txt:1.2 configure.zcml:1.25 interfaces.py:1.12

[Stephan Richter]

Update of /cvs-repository/zopeproducts/zwiki
In directory cvs.zope.org:/tmp/cvs-serv22122/src/zopeproducts/zwiki

Modified Files:
	INSTALL.txt README.txt configure.zcml interfaces.py 
Log Message:
Removed last elements of STX.

Renamed Permissions!!!

Cleanup


=== zopeproducts/zwiki/INSTALL.txt 1.7 => 1.8 ===
--- zopeproducts/zwiki/INSTALL.txt:1.7	Tue Apr 22 07:07:51 2003
+++ zopeproducts/zwiki/INSTALL.txt	Tue Aug 12 22:44:34 2003
@@ -14,11 +14,11 @@
   - You need to define the following role declarations to your user in order
     to use the zwiki product effectively.
 
-     <grant role="WikiAdmin" principal="user" />
-     <grant role="WikiEditor" principal="user" />
-     <grant role="WikiUser" principal="user" />
+     <grant role="zwiki.Admin" principal="user" />
+     <grant role="zwiki.Editor" principal="user" />
+     <grant role="zwiki.User" principal="user" />
 
-     <grant role="WikiUser" principal="anybody" />
+     <grant role="zwiki.User" principal="anybody" />
 
 
   - (Optional) If you want restructured text support, you need to install the


=== zopeproducts/zwiki/README.txt 1.1 => 1.2 ===
--- zopeproducts/zwiki/README.txt:1.1	Wed Jul 30 00:31:47 2003
+++ zopeproducts/zwiki/README.txt	Tue Aug 12 22:44:34 2003
@@ -12,8 +12,6 @@
 
       - Plain Text
 
-      - Structured Text (STX)
-
       - reStructured Text (reST)
 
 


=== zopeproducts/zwiki/configure.zcml 1.24 => 1.25 ===
--- zopeproducts/zwiki/configure.zcml:1.24	Sun Aug  3 14:36:10 2003
+++ zopeproducts/zwiki/configure.zcml	Tue Aug 12 22:44:34 2003
@@ -8,88 +8,73 @@
   <!-- Security definitions -->
 
   <role
-      id="WikiUser"
+      id="zwiki.User"
       title="Wiki User"
-      description="Wiki visitors, which can only view and comment on wikis." 
-      />
+      description="Wiki visitors, which can only view and comment on wikis." />
 
   <role
-      id="WikiEditor"
+      id="zwiki.Editor"
       title="Wiki Editor"
-      description="The Wiki Editor can create and edit wikis." 
-      />
+      description="The Wiki Editor can create and edit wikis." />
 
   <role
-      id="WikiAdmin"
+      id="zwiki.Admin"
       title="Wiki Administrator"
-      description="The Wiki Admin can fully manage wiki pages." 
-      />
+      description="The Wiki Admin can fully manage wiki pages." />
 
   <permission
       id="zopeproducts.zwiki.ViewWikiPage"
       title="View Wiki Page"
-      description="View a Wiki Page."
-      />
+      description="View a Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.ViewWikiPage"
-      role="WikiUser"
-      />
+      role="zwiki.User" />
 
   <permission
       id="zopeproducts.zwiki.CommentWikiPage"
       title="Comment on Wiki Page"
-      description="Make a comment on Wiki Page."
-      />
+      description="Make a comment on Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.CommentWikiPage"
-      role="WikiUser"
-      />
+      role="zwiki.User" />
 
   <permission
       id="zopeproducts.zwiki.AddWikiPage"
       title="Add Wiki Page"
-      description="Add Wiki Page."
-      />
+      description="Add Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.AddWikiPage"
-      role="WikiEditor"
-      />
+      role="zwiki.Editor" />
 
   <permission
       id="zopeproducts.zwiki.EditWikiPage"
       title="Edit Wiki Page"
-      description="Edit Wiki Page."
-      />
+      description="Edit Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.EditWikiPage"
-      role="WikiEditor"
-      />
+      role="zwiki.Editor" />
 
   <permission
       id="zopeproducts.zwiki.DeleteWikiPage"
       title="Delete Wiki Page"
-      description="Delete Wiki Page."
-      />
+      description="Delete Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.DeleteWikiPage"
-      role="WikiAdmin"
-      />
+      role="zwiki.Admin" />
 
   <permission
       id="zopeproducts.zwiki.ReparentWikiPage"
       title="Reparent Wiki Page"
-      description="Reparent a Wiki Page."
-      />
+      description="Reparent a Wiki Page." />
 
   <grant
       permission="zopeproducts.zwiki.ReparentWikiPage"
-      role="WikiAdmin"
-      />
+      role="zwiki.Admin"/>
 
 
   <!-- Content declarations -->
@@ -107,13 +92,11 @@
         description="Minimal Wiki Page Container implementation " />
 
     <allow
-        interface="zope.app.interfaces.services.service.Read"
-        />
+        interface="zope.app.interfaces.services.service.Read" />
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.services.service.Write"
-        />
+        interface="zope.app.interfaces.services.service.Write" />
 
     <require
         permission="zope.View"


=== zopeproducts/zwiki/interfaces.py 1.11 => 1.12 ===
--- zopeproducts/zwiki/interfaces.py:1.11	Thu Jul 31 14:54:35 2003
+++ zopeproducts/zwiki/interfaces.py	Tue Aug 12 22:44:34 2003
@@ -18,7 +18,7 @@
 $Id$
 """
 from zope.interface import Interface
-from zope.schema import Text, TextLine, List
+from zope.schema import TextLine, List, SourceText
 from zope.schema.vocabulary import VocabularyField
 
 from zope.app.interfaces.container import IContentContainer
@@ -40,7 +40,7 @@
     The Wiki page is a simple content object that stores the content
     (source) and the source type of the wiki page."""
 
-    source = Text(
+    source = SourceText(
         title=_(u"Source Text"),
         description=_(u"Renderable source text of the Wiki Page."),
         default=u"",