Changeset 584

Timestamp:

10/19/06 11:20:34

Author:

chervol

Message:

fixed post merge incompatibilities

Files:

• SimpleBlog/branches/plone-2.5/config.py (modified) (1 diff)
• SimpleBlog/branches/plone-2.5/content/blog.py (modified) (3 diffs)
• SimpleBlog/branches/plone-2.5/content/blogentry.py (modified) (2 diffs)

SimpleBlog/branches/plone-2.5/config.py

@@ -14 +14 @@
-# use at your own risk. this is not fully tested
-ENTRY_IS_FOLDERISH = 1
+
+
+DIGG_TOPICS = DisplayList(( \
+     ('apple', 'Technology:Apple') \
+    ,('design', 'Technology:Design') \
+    ,('gadgets', 'Technology:Gadgets') \
+    ,('hardware', 'Technology:Hardware') \
+    ,('tech_news', 'Technology:Industry News') \
+    ,('linux_unix', 'Technology:Linux/Unix') \
+    ,('mods', 'Technology:Mods') \
+    ,('programming', 'Technology:Programming') \
+    ,('security', 'Technology:Security') \
+    ,('software', 'Technology:Software') \
+    ,('tech_deals', 'Technology:Tech Deals') \
+    ,('space', 'Science:Space') \
+    ,('environment', 'Science:Environment') \
+    ,('health', 'Science:Health') \
+    ,('general_sciences', 'Science:General Sciences') \
+    ,('business_finance', 'World & Business:Business Finance') \
+    ,('politics', 'World & Business:Political News') \
+    ,('political_opinion', 'World & Business:Political Opinion') \
+    ,('world_news', 'World & Business:World News') \
+    ,('offbeat_news', 'World & Business:Offbeat News') \
+    ,('baseball', 'Sports:Baseball') \
+    ,('basketball', 'Sports:Basketball') \
+    ,('extreme_sports', 'Sports:Extreme Sports') \
+    ,('football', 'Sports:Football - US/Canada') \
+    ,('golf', 'Sports:Golf') \
+    ,('hockey', 'Sports:Hockey') \
+    ,('motorsport', 'Sports:Motorsport') \
+    ,('soccer', 'Sports:Soccer') \
+    ,('tennis', 'Sports:Tennis') \
+    ,('other_sports', 'Sports:Other Sports') \
+    ,('videos_animation', 'Videos:Animation') \
+    ,('videos_comedy', 'Videos:Comedy') \
+    ,('videos_educational', 'Videos:Educational') \
+    ,('videos_gaming', 'Videos:Gaming') \
+    ,('videos_music', 'Videos:Music') \
+    ,('videos_people', 'Videos:People') \
+    ,('videos_sports', 'Videos:Sports') \
+    ,('celebrity', 'Entertainment:Celebrity') \
+    ,('movies', 'Entertainment:Movies') \
+    ,('music', 'Entertainment:Music') \
+    ,('television', 'Entertainment:Television') \
+    ,('gaming_news', 'Gaming:Gaming News') \
+    ,('playable_web_games', 'Gaming:Playable Web Games') \
+)).sortedByValue()

SimpleBlog/branches/plone-2.5/content/blog.py

@@ -9 +9 @@
-from Products.CMFCore.utils import getToolByName
-
-
-
-
+
+
+
+
-
-from Products.ATContentTypes.content.base import ATCTFolder
@@ -48 +49 @@
-                                  i18n_domain="SimpleBlog",
-                                  description='Supply the list of possible categories that can be used in SimpleBlog Entries.')),
-    BooleanField('warnForUnpublishedEntries', 
-             default=1, 
-             widget=BooleanWidget(label='Show unpublished entries warning', 
-                        i18n_domain="SimpleBlog",
-                        label_msgid="label_warnForUnpublishedEntries",
-                        description_msgid="help_warnForUnpublishedEntries",
-                        description='When checked, a warning will be displayed on the blog\'s frontpage if there are entries that are not yet published.')),
-    BooleanField('allowCrossPosting',
-             default=0, 
@@ -68 +62 @@
-                                  description='List of tags.'),
-               ),
+    BooleanField('warnForUnpublishedEntries', 
+               default=1,
+               schemata = 'interface',
+               widget=BooleanWidget(label='Show unpublished entries warning', 
+                      i18n_domain="SimpleBlog",
+                      label_msgid="label_warnForUnpublishedEntries",
+                      description_msgid="help_warnForUnpublishedEntries",
+                      description='When checked, a warning will be displayed on the blog\'s frontpage if there are entries that are not yet published.')),
-    BooleanField('tagsEnabled',
-                  accessor = 'isTagsEnabled',

SimpleBlog/branches/plone-2.5/content/blogentry.py

@@ -1 +1 @@
-from Products.Archetypes.public import BaseSchema, BaseFolderSchema, Schema
-from Products.Archetypes.public import StringField, TextField, LinesField, BooleanField, ReferenceField
-
+, KeywordWidget, SelectionWidget
-from Products.Archetypes.public import RichWidget, BooleanWidget
-from Products.Archetypes.public import BaseContent, registerType, BaseFolder
@@ -18 +18 @@
-from Products.ATContentTypes.content.base import ATCTContent, ATCTFolder
-
+from Products.CMFCore.utils import getToolByName
-import string,os,urllib,httplib,urlparse,re
-import sys
-
-
+Products.SimpleBlog.
+Products.SimpleBlog.
-
-if ENTRY_IS_FOLDERISH: