From a7312a0fa0cf5d32dd8162cd348f4ebf4e083b46 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 8 Dec 2008 12:25:03 +0000 Subject: [PATCH] work in progress: comments; use new generic track view git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3052 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/common.py | 8 ++++ browser/concept_macros.pt | 1 + browser/configure.zcml | 4 +- browser/node.py | 18 +++++++- locales/de/LC_MESSAGES/loops.mo | Bin 8234 -> 8657 bytes locales/de/LC_MESSAGES/loops.po | 30 +++++++++++-- organize/browser/configure.zcml | 7 --- organize/comment/__init__.py | 3 ++ organize/comment/browser.py | 50 +++++++++++++++++++++ organize/comment/comment_macros.pt | 34 ++++++++++++++ organize/tracking/browser.py | 9 +++- organize/tracking/configure.zcml | 70 ++++++++++++++++++++++------- 12 files changed, 204 insertions(+), 30 deletions(-) create mode 100644 organize/comment/__init__.py create mode 100644 organize/comment/browser.py create mode 100644 organize/comment/comment_macros.pt diff --git a/browser/common.py b/browser/common.py index dd14e5d..5b94498 100644 --- a/browser/common.py +++ b/browser/common.py @@ -511,6 +511,14 @@ class BaseView(GenericView, I18NView): inlineEditable = False + # comments + + @Lazy + def comments(self): + return [] + + # dojo stuff + def inlineEdit(self, id): self.registerDojo() return 'return inlineEdit("%s", "")' % id diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt index 1c8ae30..2256416 100644 --- a/browser/concept_macros.pt +++ b/browser/concept_macros.pt @@ -7,6 +7,7 @@ + diff --git a/browser/configure.zcml b/browser/configure.zcml index 9b61cd2..234c423 100644 --- a/browser/configure.zcml +++ b/browser/configure.zcml @@ -427,14 +427,14 @@ /> + menu="zmi_views" title="Edit"> diff --git a/browser/node.py b/browser/node.py index 1fa6214..6246b24 100644 --- a/browser/node.py +++ b/browser/node.py @@ -60,6 +60,7 @@ from loops import util from loops.util import _ from loops.browser.common import BaseView from loops.browser.concept import ConceptView +from loops.organize.comment.browser import comment_macros from loops.organize.tracking import access from loops.versioning.util import getVersion @@ -326,7 +327,6 @@ class NodeView(BaseView): def targetView(self, name='index.html', methodName='show'): if '?' in name: name, params = name.split('?', 1) - print '***', name, params target = self.virtualTargetObject if target is not None: if isinstance(target, AdapterBase): @@ -483,6 +483,22 @@ class NodeView(BaseView): self.recordAccess('external_edit') return ExternalEditorView(target, self.request).load(url=url) + # comments + + @Lazy + def comment_macros(self): + return comment_macros.macros + + # better: provide a ``comments`` view on the target object. + + @Lazy + def commentsAllowed(self): + return False + return True + + def addCommentUrlFor(self, target): + return '#' + # inner HTML views diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 592a3cdc3259c83db6e0708c5adc495cead1ff28..86298e7c92f72675d30009c4fd7a090c57486c98 100644 GIT binary patch delta 3556 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 J7TA|w^gmoZ72E&- diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index b691454..d82754c 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2008-12-06 12:00 CET\n" +"PO-Revision-Date: 2008-12-07 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -416,8 +416,20 @@ msgstr "hinzufügen" msgid "modify" msgstr "ändern" +msgid "Comments" +msgstr "Kommentare" + +msgid "Add Comment" +msgstr "Kommentar hinzufügen" + # management interface +msgid "label_type" +msgstr "Typ" + +msgid "Node" +msgstr "Navigationsknoten" + msgid "Top" msgstr "Ganz nach oben" @@ -430,6 +442,18 @@ msgstr "Nach unten" msgid "Bottom" msgstr "Ganz nach unten" -msgid "Edit Node" -msgstr "Bearbeiten" +msgid "Edit Permissions" +msgstr "Berechtigungen bearbeiten" + +msgid "Currently assigned target" +msgstr "Derzeit zugeordnetes Zielobjekt" + +msgid "Create Target" +msgstr "Zielobjekt anlegen" + +msgid "Assign Target" +msgstr "Zielobjekt zuordnen" + +msgid "Search Term" +msgstr "Suchbegriff" diff --git a/organize/browser/configure.zcml b/organize/browser/configure.zcml index 786d35f..e0f0ff5 100644 --- a/organize/browser/configure.zcml +++ b/organize/browser/configure.zcml @@ -55,13 +55,6 @@ permission="zope.View" /> - - + + + + +
+

Comments

+
+ Add Comment +
+ + +
+
+

+ Resource Title

+
+ John, + 2007-03-30 +
+

+

+ + + + + + \ No newline at end of file diff --git a/organize/tracking/browser.py b/organize/tracking/browser.py index 94d5f03..3e31d46 100644 --- a/organize/tracking/browser.py +++ b/organize/tracking/browser.py @@ -30,7 +30,7 @@ from cybertools.tracking.browser import TrackView from loops import util -class ChangeView(TrackView): +class BaseTrackView(TrackView): @Lazy def task(self): @@ -72,6 +72,11 @@ class ChangeView(TrackView): return '%s/@@introspector.html' % absoluteURL(user, self.request) -class AccessView(ChangeView): +class ChangeView(BaseTrackView): + + pass + + +class AccessView(BaseTrackView): pass diff --git a/organize/tracking/configure.zcml b/organize/tracking/configure.zcml index 27d383b..6f7330a 100644 --- a/organize/tracking/configure.zcml +++ b/organize/tracking/configure.zcml @@ -34,7 +34,61 @@ - + + + + + + + + + + + + + + + + + - - - -