Menu
▾
▴
[Collective-checkins] CMFBoard/skins/cmfboard forum_add_topic_form.cpt,1.19,1.20 forum_blog_widget.pt,1.66,1.67 forum_contact_admin_form.cpt,1.12,1.13 forum_contact_member_form.cpt,1.10,1.11 forum_message.cpt,1.19,1.20 forum_message_delete_form.pt,1.31,1.32 forum_message_edit.cpt,1.45,1.46 forum_poll_edit.cpt,1.36,1.37 forum_quickreply_form.pt,1.41,1.42 forum_reply_form.cpt,1.24,1.25 forum_send_message_form.cpt,1.10,1.11 forum_topic.fpt,1.1,1.2 forum_topic_delete.cpt,1.2,1.3 forum_topic_menu.fpt,1.2,1.3 forum_topic_nested.fpt,1.2,1.3 forum_topic_thread.pt,1.18,1.19 forum_topic_view.pt,1.30,1.31
Update of /cvsroot/collective/CMFBoard/skins/cmfboard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32655/skins/cmfboard Modified Files: forum_add_topic_form.cpt forum_blog_widget.pt forum_contact_admin_form.cpt forum_contact_member_form.cpt forum_message.cpt forum_message_delete_form.pt forum_message_edit.cpt forum_poll_edit.cpt forum_quickreply_form.pt forum_reply_form.cpt forum_send_message_form.cpt forum_topic.fpt forum_topic_delete.cpt forum_topic_menu.fpt forum_topic_nested.fpt forum_topic_thread.pt forum_topic_view.pt Log Message: Index: forum_topic_nested.fpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic_nested.fpt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forum_topic_nested.fpt 7 Sep 2004 18:52:52 -0000 1.2 +++ forum_topic_nested.fpt 8 Sep 2004 11:13:35 -0000 1.3 @@ -7,7 +7,6 @@ </head> <body tal:omit-tag="" tal:define="tree python:here.getObjectsTree(here)"> - <!-- nested tree //--> <div class="nestedTree"> <metal:block metal:define-macro="nested_tree" tal:condition="tree"> <ul> Index: forum_topic_menu.fpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic_menu.fpt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forum_topic_menu.fpt 3 Sep 2004 19:13:18 -0000 1.2 +++ forum_topic_menu.fpt 8 Sep 2004 11:13:35 -0000 1.3 @@ -126,11 +126,21 @@ </ul> </li> - <li tal:condition="menu/editable|nothing"> - <a i18n:attributes="title" title="Edit topic" - tal:attributes="href string:$here_url/base_edit"> - <tal:block i18n:translate="label_edit">Edit</tal:block></a> - </li> + <li tal:condition="menu/actions|nothing" class="dropdownMenu"> + <a href="#" onclick="return cmfboard_buttonClick(event, 'topicActionsMenu');" + onmouseover="return cmfboard_buttonMouseover(event, 'topicActionsMenu');"> + <span i18n:translate="label_actions">Actions</span> + </a> + + <ul class="menuAction" id="topicActionsMenu"> + <li tal:repeat="item menu/actions"> + <a tal:attributes="href item/url"> + <tal:block i18n:translate="" i18n:domain="plone" + content="item/title"></tal:block> + </a> + </li> + </ul> + </li> </ul> </div> Index: forum_topic_delete.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic_delete.cpt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forum_topic_delete.cpt 7 Sep 2004 18:52:52 -0000 1.2 +++ forum_topic_delete.cpt 8 Sep 2004 11:13:35 -0000 1.3 @@ -4,48 +4,50 @@ xmlns:i18n="http://xml.zope.org/namespaces/i18n"> <head> <title tal:content="template/title">The title Yeah</title> - <metal:block fill-slot="top_slot" - tal:define="dummy python:request.set('disable_border',1)" /> </head> <body> - <div metal:fill-slot="forum_main"> - - <tal:block tal:content="structure here/forum_topic_header"></tal:block> - - <div class="spacer" style="clear:both"></div> + <div metal:fill-slot="forum_main" + tal:define="messages here/getObjectsList"> - <fieldset> - <legend i18n:translate="label_delete">Delete</legend> + <h1 i18n:translate="heading_delete_topic"> + Delete topic + </h1> + <p i18n:translate="description_remove_topic"> + Topic and it's replies will be deleted. + </p> - <strong i18n:translate="heading_delete_topic"> - Delete topic - </strong> + <tal:block tal:condition="messages"> + <tal:block content="structure python:here[messages[0]].forum_message_preview_view()"> + </tal:block> - <p i18n:translate="description_remove_topic"> - Topic and it's replies will be deleted. - </p> - - <div class="messageTree" tal:condition="tree" - tal:define="tree here/getObjectsTree"> + <div class="repliesText" i18n:translate="legend_replies_to_this_comment"> + Replies to this comment + </div> + <div class="messageTree" tal:condition="tree" tal:define="tree here/getObjectsTree"> <metal:block metal:define-macro="thread_tree"> <ul tal:condition="tree"> <li tal:repeat="record tree"> - <tal:block content="structure python: - here[record.id].forum_message_thread_view()"></tal:block> + <tal:block content="structure python: + here[record.id].forum_message_thread_view()"></tal:block> - <tal:block tal:define="tree record"> - <ul metal:use-macro="here/forum_topic_widgets/macros/thread_tree"></ul> - </tal:block> - </li> - </ul> + <tal:block tal:define="tree record"> + <ul metal:use-macro="here/forum_topic_widgets/macros/thread_tree"></ul> + </tal:block> + </li> + </ul> </metal:block> </div> + </tal:block> + + <tal:block condition="not:messages"> + <h5 style="text-align:center;" + i18n:translate="text_no_replies">This topic contains no replies</h5> + </tal:block> - </fieldset> <form method="post" tal:attributes="action string:$here_url/${template/id}"> <div class="formControls"> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> <input class="destructive" type="submit" name="form.button.Delete" value="Delete" i18n:attributes="value" /> Index: forum_topic_thread.pt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic_thread.pt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- forum_topic_thread.pt 7 Sep 2004 18:52:52 -0000 1.18 +++ forum_topic_thread.pt 8 Sep 2004 11:13:35 -0000 1.19 @@ -23,7 +23,7 @@ <metal:block metal:define-macro="record"> <metal:block metal:use-macro="here/forum_message_flat/macros/message"> - <metal:block metal:fill-slot="block" + <metal:block metal:fill-slot="block" tal:condition="tree" tal:define="tree record/tree"> <div class="messageTree"> <h4 i18n:translate="legend_replies_to_this_comment"> Index: forum_message_delete_form.pt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_message_delete_form.pt,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- forum_message_delete_form.pt 14 May 2004 07:49:53 -0000 1.31 +++ forum_message_delete_form.pt 8 Sep 2004 11:13:34 -0000 1.32 @@ -20,8 +20,6 @@ dummy python:data.update({'tree':tree}); "> - <metal:block use-macro="here/forum_globals_topic/macros/globals"></metal:block> - <h1 i18n:translate="heading_delete_messages"> Delete message(s) </h1> @@ -54,7 +52,7 @@ <form action="" method="post" tal:attributes="action string:$here_url/forum_message_delete"> <div class="formControls"> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> <input class="destructive" type="submit" name="form.button.Delete" value="Delete" i18n:attributes="value" /> Index: forum_contact_member_form.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_contact_member_form.cpt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- forum_contact_member_form.cpt 7 May 2004 15:55:21 -0000 1.10 +++ forum_contact_member_form.cpt 8 Sep 2004 11:13:34 -0000 1.11 @@ -69,7 +69,7 @@ <div class="formControls"> <input class="context" type="submit" value="Send" name="form.button.Send" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> - <input class="context" type="submit" value="Cancel" name="form.button.Cancel" i18n:attributes="value" + <input class="standalone" type="submit" value="Cancel" name="form.button.Cancel" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> </div> Index: forum_message_edit.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_message_edit.cpt,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- forum_message_edit.cpt 6 Sep 2004 10:04:11 -0000 1.45 +++ forum_message_edit.cpt 8 Sep 2004 11:13:34 -0000 1.46 @@ -56,7 +56,7 @@ <div class="formControls"> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> </div> Index: forum_quickreply_form.pt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_quickreply_form.pt,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- forum_quickreply_form.pt 6 Sep 2004 17:06:51 -0000 1.41 +++ forum_quickreply_form.pt 8 Sep 2004 11:13:35 -0000 1.42 @@ -18,7 +18,7 @@ tal:attributes="action string:$here_url"> <a name="add_comment"> </a> - <input type="hidden" name="reply_to" tal:attributes="value here/UID" /> + <input type="hidden" name="reply_to" tal:attributes="value here/getId" /> <input type="hidden" name="title" tal:define="title here/Title" tal:attributes="value python:test(title[:3]=='Re:',title, 'Re: %s'%title)" /> <input type="hidden" name="text_text_format" value="text/plain" /> @@ -67,7 +67,7 @@ name="form.button.Preview" value="Preview" /> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> </div> </fieldset> Index: forum_reply_form.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_reply_form.cpt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- forum_reply_form.cpt 7 Sep 2004 18:52:51 -0000 1.24 +++ forum_reply_form.cpt 8 Sep 2004 11:13:35 -0000 1.25 @@ -79,7 +79,7 @@ name="form.button.Preview" value="Preview" /> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> <input type="hidden" name="form.submitted" value="1" /> <br /> Index: forum_message.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_message.cpt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- forum_message.cpt 25 Aug 2004 19:13:41 -0000 1.19 +++ forum_message.cpt 8 Sep 2004 11:13:34 -0000 1.20 @@ -1,38 +1,27 @@ -<html i18n:domain="CMFBoard" tal:omit-tag="" - xmlns:metal="http://xml.zope.org/namespaces/metal" - xmlns:tal="http://xml.zope.org/namespaces/tal" - xmlns:i18n="http://xml.zope.org/namespaces/i18n"> - <body tal:omit-tag=""> - <tal:block tal:content="structure here/forum_topic_header"></tal:block> - - <div class="small" tal:condition="python: - wtool.getInfoFor(topic.getForum(),'review_state','')=='public1' and isAnon"> - <tal:block i18n:translate="description_registered_member"> - You need to be a registered member to post to this forum.</tal:block> - <a tal:condition="python: checkPermission('Add portal member', here)" - tal:attributes="href string:$portal_url/join_form" - i18n:translate="label_register_now">Register now.</a> - </div> - - <metal:block use-macro="here/forum_topic_widgets/macros/topicMenu"> - </metal:block> +<div class="topicView" tal:define="topic here/getTopic; id here/getId"> + <tal:block content="structure here/forum_topic_header"></tal:block> + <tal:block content="structure here/forum_topic_menu"></tal:block> + <tal:block content="structure here/forum_topic_content"></tal:block> + + <tal:block content="structure here/forum_message_view"></tal:block> - <metal:block tal:condition="python:view_mode in ('full_thread', 'thread')"> - <tal:block tal:condition="data/hits_counter"> - <img tal:attributes="src string:${data/topic_url}/HitsImg" - width="1" height="1" alt="" /> - </tal:block> - <tal:block> - <metal:block metal:use-macro="here/forum_topic_thread/macros/topic"> - </metal:block> - </tal:block> + <div class="messageTree" tal:condition="tree" tal:define="tree topic/getObjectsTree"> + <metal:block metal:define-macro="thread_tree"> + <ul tal:condition="tree"> + <li tal:repeat="record tree"> + <strong tal:omit-tag="python:id != record.id"> + <tal:block content="structure python: + topic[record.id].forum_message_thread_view()"></tal:block> + </strong> + <tal:block tal:define="tree record"> + <ul metal:use-macro="here/forum_message/macros/thread_tree"></ul> + </tal:block> + </li> + </ul> </metal:block> + </div> - <br /> - - <metal:block use-macro="here/forum_quickreply_widget/macros/quickreply"> - </metal:block> + <tal:block content="structure python: + topic.forum_quickreply_widget(REQUEST=request)"></tal:block> - </tal:block> - </body> -</html> +</div> Index: forum_topic_view.pt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic_view.pt,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- forum_topic_view.pt 7 Sep 2004 14:03:11 -0000 1.30 +++ forum_topic_view.pt 8 Sep 2004 11:13:35 -0000 1.31 @@ -57,21 +57,6 @@ <span class="postDate" tal:content="record/created">8/23/2001 12:40:44 PM</span> </div> - - <div class="forumMenu messageMenu"> - <div class="menuActionsList"> - <ul> - <li tal:condition="python:mtool.checkPermission('CMFBoard: Add forum reply',here)"> - <a tal:attributes="href string:${record/url}/forum_reply_form" - i18n:translate="label_reply">Reply</a> - </li> - <li tal:condition="python:mtool.checkPermission('CMFBoard: Modify forum topic',here)"> - <a tal:attributes="href string:${record/url}/forum_topic_delete" - i18n:translate="label_delete">Delete</a> - </li> - </ul> - </div> - </div> <div class="messageBody"> <p tal:content="structure string:${record/topicDesc}"></p> Index: forum_poll_edit.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_poll_edit.cpt,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- forum_poll_edit.cpt 3 Sep 2004 19:13:18 -0000 1.36 +++ forum_poll_edit.cpt 8 Sep 2004 11:13:34 -0000 1.37 @@ -114,7 +114,7 @@ name="form.button.Preview" value="Preview" /> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> </div> <input type="hidden" name="form.submitted" value="1" /> Index: forum_contact_admin_form.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_contact_admin_form.cpt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- forum_contact_admin_form.cpt 1 May 2004 21:30:36 -0000 1.12 +++ forum_contact_admin_form.cpt 8 Sep 2004 11:13:34 -0000 1.13 @@ -88,7 +88,7 @@ <input class="context" type="submit" name="form.button.Send" value="Send" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> - <input class="context" type="submit" + <input class="standalone" type="submit" value="Cancel" name="form.button.Cancel" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> </div> Index: forum_blog_widget.pt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_blog_widget.pt,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- forum_blog_widget.pt 5 May 2004 05:14:47 -0000 1.66 +++ forum_blog_widget.pt 8 Sep 2004 11:13:34 -0000 1.67 @@ -58,7 +58,7 @@ name="form.button.Preview" value="Preview" /> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> </div> </fieldset> Index: forum_topic.fpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_topic.fpt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- forum_topic.fpt 7 Sep 2004 18:52:52 -0000 1.1 +++ forum_topic.fpt 8 Sep 2004 11:13:35 -0000 1.2 @@ -15,11 +15,6 @@ <metal:block tal:content="structure here/forum_topic_nested"></metal:block> </tal:block> - <tal:block condition="python:view_mode in ('thread','full_thread')"> - <metal:block tal:content="structure here/forum_topic_thread"></metal:block> - </tal:block> - <tal:block content="structure python: here.forum_quickreply_widget(REQUEST=request)"></tal:block> </div> - \ No newline at end of file Index: forum_send_message_form.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_send_message_form.cpt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- forum_send_message_form.cpt 7 May 2004 15:55:21 -0000 1.10 +++ forum_send_message_form.cpt 8 Sep 2004 11:13:35 -0000 1.11 @@ -71,7 +71,7 @@ <div class="formControls"> <input class="context" type="submit" value="Send" name="form.button.Send" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> - <input class="context" type="submit" value="Cancel" name="form.button.Cancel" i18n:attributes="value" + <input class="standalone" type="submit" value="Cancel" name="form.button.Cancel" i18n:attributes="value" tal:attributes="tabindex tabindex/next;" /> </div> Index: forum_add_topic_form.cpt =================================================================== RCS file: /cvsroot/collective/CMFBoard/skins/cmfboard/forum_add_topic_form.cpt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- forum_add_topic_form.cpt 6 Sep 2004 10:04:11 -0000 1.19 +++ forum_add_topic_form.cpt 8 Sep 2004 11:13:34 -0000 1.20 @@ -69,7 +69,7 @@ <div class="formControls"> <input class="context" type="submit" name="form.button.Save" value="Save" i18n:attributes="value" /> - <input class="context" type="submit" name="form.button.Cancel" + <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value" /> </div> |