[Erp5-report] r34937 ivan - in /erp5/trunk/bt5/erp5_discussion: SkinTemplateItem/portal_ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon May 3 15:11:06 CEST 2010
Author: ivan
Date: Mon May 3 15:11:06 2010
New Revision: 34937
URL: http://svn.erp5.org?rev=34937&view=rev
Log:
Add possibility to highlight and cite previous posts.
CSS fixes and form improvements.
Added:
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_redirectCreateNewDiscussionPost.xml
Modified:
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_text_content.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.js.xml
erp5/trunk/bt5/erp5_discussion/bt/revision
Added: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_redirectCreateNewDiscussionPost.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_redirectCreateNewDiscussionPost.xml?rev=34937&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_redirectCreateNewDiscussionPost.xml (added)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_redirectCreateNewDiscussionPost.xml [utf8] Mon May 3 15:11:06 2010
@@ -1,0 +1,147 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+if discussion_post_uid is not None:\n
+ # set title & text_content\n
+ discussion_post = getattr(context, discussion_post_uid)\n
+ author_dict = discussion_post.DiscussionPost_getAuthorDict()\n
+ title = \'Re: %s\' %discussion_post.getTitle()\n
+ text_content = \'<blockquote>From: %s<br/>%s</blockquote>\' %(author_dict[\'author_title\'],\n
+ discussion_post.getTextContent())\n
+ context.REQUEST.set(\'discussion_post_title\', text_content)\n
+ context.REQUEST.set(\'discussion_post_text_content\', text_content)\n
+ context.log(context.getRelativeUrl())\n
+\n
+return context.DiscussionThread_viewCreateNewDiscussionPostDialog()\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>discussion_post_uid=None</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>discussion_post_uid</string>
+ <string>None</string>
+ <string>getattr</string>
+ <string>context</string>
+ <string>discussion_post</string>
+ <string>_getattr_</string>
+ <string>author_dict</string>
+ <string>title</string>
+ <string>_getitem_</string>
+ <string>text_content</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <none/>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>DiscussionThread_redirectCreateNewDiscussionPost</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_text_content.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_text_content.xml?rev=34937&r1=34936&r2=34937&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_text_content.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_text_content.xml [utf8] Mon May 3 15:11:06 2010
@@ -13,11 +13,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>css_class</string>
+ <string>default</string>
+ <string>editable</string>
<string>title</string>
- <string>default</string>
- <string>css_class</string>
- <string>text_editor</string>
- <string>editable</string>
</list>
</value>
</item>
@@ -86,12 +85,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>text_editor</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
@@ -127,10 +120,6 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>text_editor</string> </key>
- <value> <string>fck_editor</string> </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string>Body</string> </value>
</item>
@@ -151,27 +140,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-python: " >%s" % (context.portal_catalog.getObject(here.DiscussionThread_getSelectedPost()).text_content.replace("<br />", "<br /> \\>"))
-
-]]></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:(here.portal_preferences.getPreferredTextFormat() == \'text/html\' and here.portal_preferences.getPreferreTextEditor()) or \'text_area\'d</string> </value>
+ <value> <string>python: context.REQUEST.get(\'discussion_post_text_content\',\'\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml?rev=34937&r1=34936&r2=34937&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml [utf8] Mon May 3 15:11:06 2010
@@ -148,24 +148,28 @@
tal:content="author_signature"/>\n
<hr/>\n
</tal:block>\n
-\n
- <input type="hidden" \n
- name="good_uid" \n
- tal:attributes="value event_uid; id python: \'listbox_cb_%s\' % (event_uid)">\n
<button tal:condition="isUserAllowedToPost" \n
type="submit" \n
title="Reply" \n
name="DiscussionThread_viewCreateNewDiscussionPostDialog:method"\n
class="discussion-post-action-button"\n
- tal:attributes="onClick python: \'getElementById(\\\'listbox_cb_%s\\\').checked = true\' % (event_object.getUid())">\n
- Reply\n
+ tal:attributes="onClick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %event_id">\n
+ Cited Reply\n
</button>\n
+ <button tal:condition="isUserAllowedToPost" \n
+ type="submit" \n
+ title="Reply" \n
+ name="DiscussionThread_redirectCreateNewDiscussionPost:method"\n
+ class="discussion-post-action-button">\n
+ New Reply\n
+ </button>\n
+ \n
<tal:block tal:condition="python:real_context.portal_membership.checkPermission(\'Delete objects\', event_object)">\n
<button type="submit" \n
title="Delete" \n
name="DiscussionThread_deleteDiscussionPost:method"\n
class="discussion-post-action-button"\n
- tal:attributes="onClick python: \'deleteDiscussionPost(\\\'%s\\\')\' %event.getId()">\n
+ tal:attributes="onClick python: \'deleteDiscussionPost(\\\'%s\\\')\' %event_id">\n
Delete\n
</button>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml?rev=34937&r1=34936&r2=34937&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml [utf8] Mon May 3 15:11:06 2010
@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts72458028.86</string> </value>
+ <value> <string>ts72891835.3</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -89,7 +89,7 @@
}\n
\n
div.discussion-post-body-container{\n
- /*float: left;*/\n
+ float: left;\n
margin-left: 10px;\n
margin-top: 10px;\n
margin-bottom: 10px;\n
@@ -105,11 +105,18 @@
}\n
\n
button.discussion-post-action-button{\n
- border: dashed 1px #3D6474; \n
- background-color: #eee; \n
+ /*border: dashed 1px #3D6474; \n
+ background-color: #eee;\n
+ */\n
padding: 3px;\n
}\n
-</string> </value>
+\n
+blockquote {\n
+ background-color:#E9E9E9 ;\n
+ border:1px solid #8CACBB;\n
+ margin:5px;\n
+ padding:10px 15px;\n
+}</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
@@ -117,7 +124,7 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>1333</int> </value>
+ <value> <int>1442</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.js.xml?rev=34937&r1=34936&r2=34937&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.js.xml [utf8] Mon May 3 15:11:06 2010
@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts69330662.3</string> </value>
+ <value> <string>ts72889188.39</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -35,7 +35,19 @@
\'name\': \'delete_discussion_post_id\', \n
\'type\':\'hidden\'}));\n
clickSaveButton(\'DiscussionThread_deleteDiscussionPost\');\n
-}</string> </value>
+}\n
+\n
+function redirectCreateCitedNewDiscussionPost(id){\n
+ /* this will add respective input box for reply post id (so multiple reply buttons can \n
+ safely coexist in one HTML page with one HTML form */\n
+ appendChildNodes(document.forms[0], \n
+ INPUT({\'value\':id, \n
+ \'name\': \'discussion_post_uid\', \n
+ \'type\':\'hidden\'}));\n
+ clickSaveButton(\'DiscussionThread_redirectCreateNewDiscussionPost\');\n
+}\n
+\n
+</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
@@ -43,7 +55,7 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <long>435</long> </value>
+ <value> <int>893</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_discussion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/revision?rev=34937&r1=34936&r2=34937&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] Mon May 3 15:11:06 2010
@@ -1,1 +1,1 @@
-48
+50
More information about the Erp5-report
mailing list