Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tomáš Peterka
erp5
Commits
f406fa52
Commit
f406fa52
authored
Jun 01, 2011
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show author thumbnail (if available).
parent
0cf62a74
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
78 additions
and
38 deletions
+78
-38
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getAuthorDict.xml
...al_skins/erp5_discussion/DiscussionPost_getAuthorDict.xml
+5
-1
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml
...skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml
+31
-26
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/listbox.xml
...ns/erp5_discussion/DiscussionThread_viewAsWeb/listbox.xml
+12
-0
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
...Item/portal_skins/erp5_discussion/erp5_discussion.css.xml
+29
-10
bt5/erp5_discussion/bt/revision
bt5/erp5_discussion/bt/revision
+1
-1
No files found.
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getAuthorDict.xml
View file @
f406fa52
...
@@ -58,12 +58,16 @@ portal = context.getPortalObject()\n
...
@@ -58,12 +58,16 @@ portal = context.getPortalObject()\n
author = context.getSourceValue()\n
author = context.getSourceValue()\n
result = {\'author_url\': None,\n
result = {\'author_url\': None,\n
\'author_signature\': None,\n
\'author_signature\': None,\n
\'author_title\': context.Base_translateString(\'Unknown User\')}\n
\'author_title\': context.Base_translateString(\'Unknown User\'),\n
\'author_thumbnail_url\': None}\n
\n
\n
if author is not None:\n
if author is not None:\n
result[\'author_url\'] = \'%s/view\' %author.getAbsoluteUrl()\n
result[\'author_url\'] = \'%s/view\' %author.getAbsoluteUrl()\n
result[\'author_signature\'] = portal.ERP5Site_getUserPreferredForumSettingsDict(author.getReference())[\'preferred_forum_signature\']\n
result[\'author_signature\'] = portal.ERP5Site_getUserPreferredForumSettingsDict(author.getReference())[\'preferred_forum_signature\']\n
result[\'author_title\'] = author.getTitle()\n
result[\'author_title\'] = author.getTitle()\n
thumbnail = author.getDefaultImage()\n
if thumbnail is not None:\n
result[\'author_thumbnail_url\'] = thumbnail.absolute_url()\n
\n
\n
return result\n
return result\n
</string>
</value>
</string>
</value>
...
...
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml
View file @
f406fa52
...
@@ -36,6 +36,8 @@
...
@@ -36,6 +36,8 @@
<key>
<string>
_text
</string>
</key>
<key>
<string>
_text
</string>
</key>
<value>
<unicode
encoding=
"cdata"
>
<![CDATA[
<value>
<unicode
encoding=
"cdata"
>
<![CDATA[
<!-- XXX: include only once not for every post item -->
\n
\n
<script
src=
"erp5_discussion.js"
type=
"text/javascript"
></script>
\n
<script
src=
"erp5_discussion.js"
type=
"text/javascript"
></script>
\n
<link
href=
"erp5_discussion.css"
rel=
"stylesheet"
type=
"text/css"
>
\n
<link
href=
"erp5_discussion.css"
rel=
"stylesheet"
type=
"text/css"
>
\n
\n
\n
...
@@ -44,6 +46,8 @@
...
@@ -44,6 +46,8 @@
author_url author_dict/author_url;\n
author_url author_dict/author_url;\n
author_signature author_dict/author_signature;\n
author_signature author_dict/author_signature;\n
author_title author_dict/author_title;\n
author_title author_dict/author_title;\n
author_thumbnail_url author_dict/author_thumbnail_url;\n
is_author_thumbnai_available python: author_thumbnail_url is not None;\n
discussion_post_id discussion_post_object/getId;\n
discussion_post_id discussion_post_object/getId;\n
discussion_post_uid discussion_post_object/getUid;\n
discussion_post_uid discussion_post_object/getUid;\n
discussion_post_title discussion_post_object/getTitle;\n
discussion_post_title discussion_post_object/getTitle;\n
...
@@ -53,42 +57,43 @@
...
@@ -53,42 +57,43 @@
discussion_post_stripped_html discussion_post_object/asStrippedHTML;\n
discussion_post_stripped_html discussion_post_object/asStrippedHTML;\n
isUserAllowedToPost python: discussion_post_object.getParentValue().DiscussionThread_isUserAllowedToPost()"
>
\n
isUserAllowedToPost python: discussion_post_object.getParentValue().DiscussionThread_isUserAllowedToPost()"
>
\n
\n
\n
<div
class=
"discussion-post-header"
>
\n
<div
class=
"discussion-post-header"
\n
tal:attributes=
"style python: test(is_author_thumbnai_available, \'height:96px\',\'\')"
>
\n
\n
\n
<
a
class=
"discussion-post-title
"
\n
<
div
class=
"thumbnail
"
\n
tal:attributes=
"href string:${discussion_post_url}/view;
\n
tal:condition=
"is_author_thumbnai_available"
>
\n
name discussion_post_uid"
\n
<img
tal:attributes=
"src string:${author_thumbnail_url}?display=thumbnail&format=png"
/>
\n
tal:content=
"discussion_post_title"
></a
>
\n
</div
>
\n
\n
\n
<div
class=
"discussion-post-creator"
>
\n
<div
class=
"title"
>
\n
by \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
by\n
<a
class=
"discussion-post-creator-title-link"
\n
<a
class=
"discussion-post-creator-title-link"
\n
tal:attributes=
"href author_url"
\n
tal:attributes=
"href author_url"
\n
tal:content=
"author_title"
></a>
\n
tal:content=
"author_title"
/>
\n
on
\n
at
\n
<
tal:block
tal:replace
=
"discussion_post_creation_date"
/>
\n
<
span
tal:content
=
"discussion_post_creation_date"
/>
\n
</div>
\n
</div>
\n
\n
\n
</div>
\n
</div>
\n
\n
\n
<!-- Post Body -->
\n
<div
class=
"discussion-post-body-container"
\n
<div
class=
"discussion-post-body-container"
>
\n
tal:content=
"structure discussion_post_stripped_html"
/>
\n
\n
<div
class=
"discussion-post-body"
\n
tal:content=
"structure discussion_post_stripped_html"
></div>
\n
\n
\n
</div>
\n
\n
<!-- Signature -->
\n
<div
tal:condition=
"python: author_signature is not None"
\n
<div
tal:condition=
"python: author_signature is not None"
\n
class=
"discussion-post-author-signature-container"
\n
class=
"discussion-post-author-signature-container"
\n
tal:content=
"author_signature"
></div
>
\n
tal:content=
"author_signature"
/
>
\n
\n
\n
<button
tal:condition=
"isUserAllowedToPost"
type=
"submit"
\n
<div
class=
"discussion-post-actions"
>
\n
title=
"Reply"
\n
<button
tal:condition=
"isUserAllowedToPost"
type=
"submit"
\n
name=
"DiscussionThread_redirectCreateNewDiscussionPost:method"
\n
title=
"Reply"
\n
tal:attributes=
"onClick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %discussion_post_id"
\n
name=
"DiscussionThread_redirectCreateNewDiscussionPost:method"
\n
class=
"discussion-post-action-button"
>
Reply
</button>
\n
tal:attributes=
"onClick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %discussion_post_id"
\n
class=
"discussion-post-action-button"
>
Reply
</button>
\n
</div>
\n
\n
\n
</tal:block>
</tal:block>
...
...
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/listbox.xml
View file @
f406fa52
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
<string>
selection_name
</string>
<string>
selection_name
</string>
<string>
sort
</string>
<string>
sort
</string>
<string>
title
</string>
<string>
title
</string>
<string>
url_columns
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
@@ -157,6 +158,17 @@
...
@@ -157,6 +158,17 @@
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Discussion Posts
</string>
</value>
<value>
<string>
Discussion Posts
</string>
</value>
</item>
</item>
<item>
<key>
<string>
url_columns
</string>
</key>
<value>
<list>
<tuple>
<string>
getSummaryAsHTML
</string>
<string></string>
</tuple>
</list>
</value>
</item>
</dictionary>
</dictionary>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
View file @
f406fa52
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<value>
<string>
ts
89832986.24
</string>
</value>
<value>
<string>
ts
06927933.02
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
__name__
</string>
</key>
<key>
<string>
__name__
</string>
</key>
...
@@ -28,25 +28,41 @@
...
@@ -28,25 +28,41 @@
ERP5 discussion forum.\n
ERP5 discussion forum.\n
*/\n
*/\n
\n
\n
div
.discussion-post-header{\n
.discussion-post-header{\n
background-color: #efefef;\n
background-color: #efefef;\n
color:#000000;\n
color:#000000;\n
padding: 3px; \n
padding: 3px; \n
margin: 0em; \n
margin: 0em;\n
height: 20px;\n
}\n
}\n
\n
\n
div.discussion-post-body-container{\n
.discussion-post-header .thumbnail,\n
.discussion-post-creator .title{\n
float:left;\n
}\n
\n
.discussion-post-header .thumbnail{\n
width:14%;\n
}\n
\n
.discussion-post-header .title{\n
width:85%;\n
}\n
\n
a.discussion-post-title{\n
font-weight: bold;\n
}\n
\n
.discussion-post-body-container{\n
float: left;\n
float: left;\n
margin-left: 10px;\n
margin-left: 10px;\n
margin-top: 10px;\n
margin-top: 10px;\n
margin-bottom: 10px;\n
margin-bottom: 10px;\n
}\n
\n
div.discussion-post-body{\n
color: black;\n
color: black;\n
}\n
}\n
\n
\n
div.discussion-post-author-signature-container{\n
\n
.discussion-post-author-signature-container{\n
margin-left:10px; \n
margin-left:10px; \n
margin-bottom:1em; \n
margin-bottom:1em; \n
color:#aaa;\n
color:#aaa;\n
...
@@ -66,7 +82,10 @@ blockquote {\n
...
@@ -66,7 +82,10 @@ blockquote {\n
margin:5px;\n
margin:5px;\n
padding:10px 15px;\n
padding:10px 15px;\n
}\n
}\n
</string>
</value>
\n
.discussion-post-actions{\n
float:left;\n
}
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
precondition
</string>
</key>
<key>
<string>
precondition
</string>
</key>
...
@@ -74,7 +93,7 @@ blockquote {\n
...
@@ -74,7 +93,7 @@ blockquote {\n
</item>
</item>
<item>
<item>
<key>
<string>
size
</string>
</key>
<key>
<string>
size
</string>
</key>
<value>
<int>
659
</int>
</value>
<value>
<int>
913
</int>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
...
...
bt5/erp5_discussion/bt/revision
View file @
f406fa52
96
97
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment