Skip to content

erp5
erp5
Commit de9790c4 authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Clean up and improve. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40276 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2bc32461
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 84 deletions
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml
View file @ de9790c4
......@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
......@@ -37,12 +34,12 @@
</item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<value> <unicode encoding="cdata"><![CDATA[
<script src="erp5_discussion.js" type="text/javascript"></script>\n
<link href="erp5_discussion.css" rel="stylesheet" type="text/css">\n
<script src="erp5_discussion.js" type="text/javascript"></script>\n
<link href="erp5_discussion.css" rel="stylesheet" type="text/css">\n
\n
<div class="discussion-post-listbox-row" \n
<tal:block \n
tal:define="discussion_post_object here/getObject;\n
author_dict discussion_post_object/DiscussionPost_getAuthorDict;\n
author_url author_dict/author_url;\n
......@@ -59,49 +56,34 @@
\n
<div class="discussion-post-header">\n
\n
<div class="discussion-post-title-container">\n
<a class="discussion-post-title"\n
tal:attributes="href string:${discussion_post_url}/view;\n
name discussion_post_uid"\n
tal:content="discussion_post_title"/>\n
\n
<a tal:attributes="href string:${discussion_post_url}/view;\n
name discussion_post_uid">\n
<div class="discussion-post-title"\n
tal:content="discussion_post_title"/>\n
</a>\n
</div>\n
\n
<div class="discussion-post-state-container">\n
<!-- <div class="discussion-post-state"\n
tal:content="discussion_post_validation_state_title"/>-->\n
</div>\n
\n
<div class="discussion-post-creator-container">\n
<div class="discussion-post-creator">\n
<div class="discussion-post-creator">\n
by \n
<a class="discussion-post-creator-title-link"\n
tal:attributes="href author_url"\n
tal:content="author_title"/> \n
\n
on \n
<tal:block tal:replace="discussion_post_creation_date"/>\n
\n
</div>\n
\n
</div>\n
</div>\n
\n
<hr>\n
\n
<!-- Post Body -->\n
<div class="discussion-post-body-container">\n
<div class="discussion-post-body"\n
tal:content="structure discussion_post_stripped_html"/>\n
<br/>\n
\n
<div class="discussion-post-body"\n
tal:content="structure discussion_post_stripped_html"/>\n
\n
</div>\n
\n
<tal:block tal:condition="python: author_signature is not None">\n
<hr>\n
<div class="discussion-post-author-signature-container" \n
<!-- Signature -->\n
<div tal:condition="python: author_signature is not None"\n
class="discussion-post-author-signature-container" \n
tal:content="author_signature"/>\n
<hr/>\n
</tal:block>\n
\n
<button tal:condition="isUserAllowedToPost" \n
type="submit" \n
......@@ -110,14 +92,18 @@
tal:attributes="onClick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %discussion_post_id"\n
class="discussion-post-action-button">Reply</button>\n
\n
</div>
</tal:block>
]]></string> </value>
]]></unicode> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>DiscussionPost_getSummaryAsHTML</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAuthorWidget.xml
View file @ de9790c4
......@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
......@@ -37,7 +34,7 @@
</item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<value> <unicode encoding="cdata"><![CDATA[
<tal:block tal:define="author_dict python: here.DiscussionPost_getAuthorDict()">\n
<a class="listbox-row-discussion-thread-author-link"\n
......@@ -46,7 +43,7 @@
</tal:block>\n
]]></string> </value>
]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -60,9 +57,13 @@
<key> <string>id</string> </key>
<value> <string>DiscussionThread_viewAuthorWidget</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewLastPostWidget.xml
View file @ de9790c4
......@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
......@@ -37,7 +34,7 @@
</item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<value> <unicode encoding="cdata"><![CDATA[
<tal:block tal:define="last_post here/DiscussionThread_getLastPost;\n
author_dict last_post/DiscussionPost_getAuthorDict;\n
......@@ -53,7 +50,7 @@
</tal:block>\n
]]></string> </value>
]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -67,9 +64,13 @@
<key> <string>id</string> </key>
<value> <string>DiscussionThread_viewLastPostWidget</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
View file @ de9790c4
......@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="File" module="OFS.Image"/>
<tuple/>
</tuple>
<global name="File" module="OFS.Image"/>
</pickle>
<pickle>
<dictionary>
......@@ -15,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts89827363.18</string> </value>
<value> <string>ts89832986.24</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -31,11 +28,6 @@
ERP5 discussion forum.\n
*/\n
\n
div.discussion-post-listbox-row{\n
padding: 10px; \n
background-color: #ffffff; \n
}\n
\n
div.discussion-post-header{\n
background-color: #efefef;\n
color:#000000;\n
......@@ -43,26 +35,6 @@ div.discussion-post-header{\n
margin: 0em; \n
}\n
\n
div.discussion-post-state-container{\n
float: left;\n
margin-top: 3px;\n
}\n
\n
div.discussion-post-creator-container{\n
float: right; \n
}\n
\n
div.discussion-post-creator-title{\n
color: #333; \n
font-size: 90%; \n
margin: 2px 0;\n
}\n
\n
a.discussion-post-creator-title-link{\n
color: #a40;\n
font-size: 90%;\n
}\n
\n
div.discussion-post-body-container{\n
float: left;\n
margin-left: 10px;\n
......@@ -102,7 +74,7 @@ blockquote {\n
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1040</int> </value>
<value> <int>659</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_discussion/bt/revision
View file @ de9790c4
74
\ No newline at end of file
75
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7