From cd2eeaeed24ee5eb2504f82751ab4d2c3b1e969c Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Thu, 21 Mar 2013 10:25:19 +0100 Subject: [PATCH] do not show description on feedback page, show feedback footer instead; use trusted=True in configure to make fields editable in management interface --- browser/concept_macros.pt | 5 +++-- knowledge/survey/configure.zcml | 36 ++++++++++++++++++++++++++++---- knowledge/survey/interfaces.py | 9 +++++++- knowledge/survey/view_macros.pt | 22 ++++++++++++------- locales/de/LC_MESSAGES/loops.mo | Bin 23379 -> 23558 bytes locales/de/LC_MESSAGES/loops.po | 6 ++++++ 6 files changed, 63 insertions(+), 15 deletions(-) diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt index 78ca2b3..b10081d 100644 --- a/browser/concept_macros.pt +++ b/browser/concept_macros.pt @@ -62,9 +62,10 @@ string:$resourceBase/cybertools.icons/table.png" /> - + -

Description

diff --git a/knowledge/survey/configure.zcml b/knowledge/survey/configure.zcml index 7475adc..dd27bff 100644 --- a/knowledge/survey/configure.zcml +++ b/knowledge/survey/configure.zcml @@ -7,19 +7,47 @@ + provides="loops.knowledge.survey.interfaces.IQuestionnaire" + trusted="True" /> + + + + + provides="loops.knowledge.survey.interfaces.IQuestionGroup" + trusted="True" /> + + + + + provides="loops.knowledge.survey.interfaces.IQuestion" + trusted="True" /> + + + + + provides="loops.knowledge.survey.interfaces.IFeedbackItem" + trusted="True" /> + + + + diff --git a/knowledge/survey/interfaces.py b/knowledge/survey/interfaces.py index 7b634b5..7ce5849 100644 --- a/knowledge/survey/interfaces.py +++ b/knowledge/survey/interfaces.py @@ -24,7 +24,7 @@ from zope.interface import Interface, Attribute from zope import interface, component, schema from cybertools.knowledge.survey import interfaces -from loops.interfaces import IConceptSchema +from loops.interfaces import IConceptSchema, ILoopsAdapter from loops.util import _ @@ -38,6 +38,13 @@ class IQuestionnaire(IConceptSchema, interfaces.IQuestionnaire): default=4, required=True) + feedbackFooter = schema.Text( + title=_(u'Feedback Footer'), + description=_(u'Text that will appear at the end of the feedback page.'), + default=u'', + missing_value=u'', + required=False) + class IQuestionGroup(IConceptSchema, interfaces.IQuestionGroup): """ A group of questions within a questionnaire. diff --git a/knowledge/survey/view_macros.pt b/knowledge/survey/view_macros.pt index 481b82e..49731dc 100644 --- a/knowledge/survey/view_macros.pt +++ b/knowledge/survey/view_macros.pt @@ -5,14 +5,10 @@ - -
-
- -
-
+ + + +

Feedback

@@ -33,10 +29,20 @@ Back to Questionnaire
+

Questionnaire

+
+
+ +
+
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 84d9df9db4bc64c2e78c6b38714a8caf7af56b16..4b3d58f48cda03e924f2cae731cf6cafab0dad90 100644 GIT binary patch delta 8587 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 diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 71a8362..4b39018 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -175,6 +175,12 @@ msgstr "Glossareintrag anlegen." msgid "Answer Range" msgstr "Abstufung Bewertungen" +msgid "Feedback Footer" +msgstr "Auswertungs-Hinweis" + +msgid "Text that will appear at the end of the feedback page." +msgstr "Text, der am Ende der Auswertungsseite erscheinen soll." + msgid "Number of items (answer options) to select from." msgstr "Anzahl der Abstufungen, aus denen bei der Antwort gewählt werden kann."