コミット: a07e7448376895f998594023b8bafa6a76ec1524 - allura (git)

allura

コミットメタ情報

• リビジョン: a07e7448376895f998594023b8bafa6a76ec1524 (tree)
• 日時: 2010-04-23 08:10:13
• 作者: Jenny Steele <jsteele@geek...>
• コミッター: Jonathan T. Beard

ログメッセージ

[#246] New theme for discussion.

Also noticed there was some missing functionality depicted by the mockups and added that in:
Sidebar links to reply, flag as spam, follow, and tag a thread.
Rss feeds for threads.
Tags for threads
Recently updated threads in sidebar
Help pages for forum permissions (placeholder) and markdown syntax

変更サマリ

• modified: ForgeDiscussion/forgediscussion/controllers/root.py
• modified: ForgeDiscussion/forgediscussion/forum_main.py
• add: ForgeDiscussion/forgediscussion/templates/help.html
• add: ForgeDiscussion/forgediscussion/templates/markdown_syntax.html
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
• modified: pyforge/pyforge/controllers/discuss.py
• modified: pyforge/pyforge/lib/widgets/discuss.py
• modified: pyforge/pyforge/lib/widgets/templates/thread.html
• modified: pyforge/pyforge/lib/widgets/templates/threads_table.html
• modified: pyforge/pyforge/model/discuss.py
• modified: pyforge/pyforge/templates/style.mak

差分

--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -56,6 +56,16 @@ class RootController(object):
             if results: count=results.hits
         return dict(q=q, history=history, results=results or [], count=count)
 
+    @expose('forgediscussion.templates.markdown_syntax')
+    def markdown_syntax(self):
+        'Static page explaining markdown.'
+        return dict()
+
+    @expose('forgediscussion.templates.help')
+    def help(self):
+        'Static help page.'
+        return dict()
+
     @expose()
     def _lookup(self, id, *remainder):
         return ForumController(id), remainder

--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -1,6 +1,7 @@
 #-*- python -*-
 import logging
 import Image
+import pymongo
 
 # Non-stdlib imports
 import pkg_resources
@@ -119,12 +120,26 @@ class ForgeDiscussionApp(Application):
 
     def sidebar_menu(self):
         try:
-            l = [SitemapEntry('Home', '.')]
+            l = [SitemapEntry('Home', c.app.url, ui_icon='home')]
+            # if we are in a thread, provide placeholder links to use in js
+            if '/thread/' in request.url:
+                l += [
+                    SitemapEntry('Reply to This', '#', ui_icon='comment', className='sidebar_thread_reply'),
+                    SitemapEntry('Tag This', '#', ui_icon='tag', className='sidebar_thread_tag'),
+                    SitemapEntry('Follow This', 'feed.rss', ui_icon='signal-diag'),
+                    SitemapEntry('Mark as Spam', 'flag_as_spam', ui_icon='flag', className='sidebar_thread_spam')
+                ]
+            else:
+                l.append(SitemapEntry('Search', c.app.url+'search', ui_icon='search'))
             if has_artifact_access('admin', app=c.app)():
-                l.append(SitemapEntry('Admin', c.project.url()+'admin/'+self.config.options.mount_point))
-            l.append(SitemapEntry('Search', 'search'))
-            l += [ SitemapEntry(f.name, f.url())
-                   for f in self.top_forums if (not f.deleted or has_artifact_access('configure', app=c.app)()) ]
+                l.append(SitemapEntry('Admin', c.project.url()+'admin/'+self.config.options.mount_point, ui_icon='wrench'))
+            l.append(SitemapEntry('Recent Topics'))
+            l += [ SitemapEntry(thread.subject, thread.url(), className='nav_child')
+                   for thread in model.ForumThread.query.find().sort('mod_date', pymongo.DESCENDING).limit(3)
+                   if (not thread.discussion.deleted or has_artifact_access('configure', app=c.app)()) ]
+            l.append(SitemapEntry('Forum Help'))
+            l.append(SitemapEntry('Forum Permissions', c.app.url + 'help', className='nav_child'))
+            l.append(SitemapEntry('Markdown Syntax', c.app.url + 'markdown_syntax', className='nav_child'))
             return l
         except: # pragma no cover
             log.exception('sidebar_menu')

--- /dev/null
+++ b/ForgeDiscussion/forgediscussion/templates/help.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <xi:include href="${g.pyforge_templates}/master.html"/>
+  <xi:include href="lib.html"/>
+
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+    <title>Forum Permissions</title>
+  </head>
+
+  <body>
+    <h1 class="title">Forum Permissions</h1>
+    <p>Help is coming soon.</p>
+  </body>
+</html>

--- /dev/null
+++ b/ForgeDiscussion/forgediscussion/templates/markdown_syntax.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <xi:include href="${g.pyforge_templates}/master.html"/>
+  <xi:include href="lib.html"/>
+
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+    <title>Markdown Syntax</title>
+  </head>
+
+  <body>
+    <h1 class="title">Markdown Syntax</h1>
+    <p>You can use
+      <a href="http://daringfireball.net/projects/markdown/">MarkDown</a>
+      Syntax here</p>
+    <h4>Example Input</h4>
+    <pre style="background-color:#fff">
+# First-level heading
+
+Some *emphasized* and **strong** text
+
+#### Fourth-level heading
+
+</pre>
+    <h4>Example Rendering</h4>
+    <div style="background-color:#fff">${Markup(g.markdown.convert('''
+# First-level heading
+
+Some *emphasized* and **strong** text
+
+#### Fourth-level heading
+
+'''))}</div>
+    <a href="http://daringfireball.net/projects/markdown/syntax">More Examples</a>
+  </body>
+</html>

--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -212,6 +212,16 @@ class TestForum(TestController):
         r = self.app.get('/discussion/search')
         r = self.app.get('/discussion/search', params=dict(q='foo'))
     
+    def test_render_help(self):
+        summary = 'test render help'
+        r = self.app.get('/discussion/help')
+        assert 'Forum Permissions' in r
+
+    def test_render_markdown_syntax(self):
+        summary = 'test render markdown syntax'
+        r = self.app.get('/discussion/markdown_syntax')
+        assert 'Markdown Syntax' in r
+
     def test_forum_subscribe(self):
         r = self.app.get('/discussion/subscribe', params={
                 'forum-0.shortname':'TestForum',
@@ -254,10 +264,24 @@ class TestForum(TestController):
     def test_sidebar_menu(self):
         r = self.app.get('/discussion/')
         sidebarmenu = str(r.html.find('ul',{'id':'sidebarmenu'}))
-        assert '<a href="." class=" ">Home</a>' in sidebarmenu
-        assert '<a href="/p/test/admin/discussion" class=" ">Admin</a>' in sidebarmenu
-        assert '<a href="search" class=" ">Search</a>' in sidebarmenu
-        assert '<a href="/p/test/discussion/TestForum/" class=" ">Test Forum</a>' in sidebarmenu
+        assert '<a href="/p/test/discussion/" class=" "><span class="ui-icon ui-icon-home"></span>Home</a>' in sidebarmenu
+        assert '<a href="/p/test/admin/discussion" class=" "><span class="ui-icon ui-icon-wrench"></span>Admin</a>' in sidebarmenu
+        assert '<a href="/p/test/discussion/search" class=" "><span class="ui-icon ui-icon-search"></span>Search</a>' in sidebarmenu
+        assert '<span class=" nav_head">Forum Help</span>' in sidebarmenu
+        assert '<a href="/p/test/discussion/help" class="nav_child ">Forum Permissions</a>' in sidebarmenu
+        assert '<a href="/p/test/discussion/markdown_syntax" class="nav_child ">Markdown Syntax</a>' in sidebarmenu
+        assert '<a href="#" class="sidebar_thread_reply "><span class="ui-icon ui-icon-comment"></span>Reply to This</a>' not in sidebarmenu
+        assert '<a href="#" class="sidebar_thread_tag "><span class="ui-icon ui-icon-tag"></span>Tag This</a>' not in sidebarmenu
+        assert '<a href="feed.rss" class=" "><span class="ui-icon ui-icon-signal-diag"></span>Follow This</a>' not in sidebarmenu
+        assert '<a href="flag_as_spam" class="sidebar_thread_spam "><span class="ui-icon ui-icon-flag"></span>Mark as Spam</a>' not in sidebarmenu
+        thread = self.app.get('/discussion/TestForum/post', params=dict(
+                subject='AAA',
+                text='aaa')).follow()
+        thread_sidebarmenu = str(thread.html.find('ul',{'id':'sidebarmenu'}))
+        assert '<a href="#" class="sidebar_thread_reply "><span class="ui-icon ui-icon-comment"></span>Reply to This</a>' in thread_sidebarmenu
+        assert '<a href="#" class="sidebar_thread_tag "><span class="ui-icon ui-icon-tag"></span>Tag This</a>' in thread_sidebarmenu
+        assert '<a href="feed.rss" class=" "><span class="ui-icon ui-icon-signal-diag"></span>Follow This</a>' in thread_sidebarmenu
+        assert '<a href="flag_as_spam" class="sidebar_thread_spam "><span class="ui-icon ui-icon-flag"></span>Mark as Spam</a>' in thread_sidebarmenu
 
 class TestForumAdmin(TestController):
 

--- a/pyforge/pyforge/controllers/discuss.py
+++ b/pyforge/pyforge/controllers/discuss.py
@@ -1,8 +1,9 @@
 from mimetypes import guess_type
 
 from tg import expose, redirect, validate, request, response, flash
-from tg.decorators import before_validate
+from tg.decorators import before_validate, with_trailing_slash, without_trailing_slash
 from pylons import c
+from formencode import validators
 from webob import exc
 
 from ming.base import Object
@@ -11,6 +12,7 @@ from ming.utils import LazyProperty
 from pyforge import model as model
 from pyforge.lib import helpers as h
 from pyforge.lib.security import require, has_artifact_access
+from pyforge.lib.helpers import DateTimeConverter
 
 from pyforge.lib.widgets import discuss as DW
 
@@ -133,11 +135,49 @@ class ThreadController(object):
     @expose()
     @validate(pass_validator, error_handler=index)
     def post(self, **kw):
+        require(has_artifact_access('post', self.thread))
         kw = self.W.edit_post.validate(kw, None)
         p = self.thread.add_post(**kw)
         flash('Message posted')
         redirect(request.referer)
 
+    @expose()
+    def tag(self, labels, **kw):
+        require(has_artifact_access('post', self.thread))
+        self.thread.labels = labels.split(',')
+        redirect(request.referer)
+
+    @expose()
+    def flag_as_spam(self, **kw):
+        require(has_artifact_access('moderate', self.thread))
+        self.thread.first_post.status='spam'
+        flash('Thread flagged as spam.')
+        redirect(request.referer)
+
+    @without_trailing_slash
+    @expose()
+    @validate(dict(
+            since=DateTimeConverter(if_empty=None),
+            until=DateTimeConverter(if_empty=None),
+            offset=validators.Int(if_empty=None),
+            limit=validators.Int(if_empty=None)))
+    def feed(self, since=None, until=None, offset=None, limit=None):
+        if request.environ['PATH_INFO'].endswith('.atom'):
+            feed_type = 'atom'
+        else:
+            feed_type = 'rss'
+        title = 'Recent posts to %s' % self.thread.subject
+        feed = model.Feed.feed(
+            {'artifact_reference':self.thread.dump_ref()},
+            feed_type,
+            title,
+            self.thread.url(),
+            title,
+            since, until, offset, limit)
+        response.headers['Content-Type'] = ''
+        response.content_type = 'application/xml'
+        return feed.writeString('utf-8')
+
 class PostController(object):
     __metaclass__=h.ProxiedAttrMeta
     M=h.attrproxy('_discussion_controller', 'M')

--- a/pyforge/pyforge/lib/widgets/discuss.py
+++ b/pyforge/pyforge/lib/widgets/discuss.py
@@ -67,6 +67,21 @@ class PostFilter(ew.SimpleForm):
                 ])
         ]
 
+class TagPost(ew.SimpleForm):
+
+    # this ickiness is to override the default submit button
+    def __call__(self, **kw):
+        result = super(TagPost, self).__call__(**kw)
+        submit_button = ffw.SubmitButton(label=result['submit_text'])
+        result['extra_fields'] = [submit_button]
+        result['buttons'] = [submit_button]
+        return result
+
+    fields=[ffw.LabelEdit(label='Tags',name='labels', className='title')]
+
+    def resources(self):
+        for r in ffw.LabelEdit(name='labels').resources(): yield r
+
 class EditPost(ew.SimpleForm):
     show_subject=False
 
@@ -253,11 +268,12 @@ class Thread(HierWidget):
     pagesize=None
     total=None
     show_subject=False
-    new_post_text="New Post"
+    new_post_text="+ New Comment"
     widgets=dict(
         thread_header=ThreadHeader(),
         post_thread=PostThread(),
         post=Post(),
+        tag_post=TagPost(),
         edit_post=EditPost(submit_text='Submit'))
     def resources(self):
         for r in super(Thread, self).resources(): yield r
@@ -265,13 +281,50 @@ class Thread(HierWidget):
             for r in w.resources():
                 yield r
         yield ew.JSScript('''
-        $(window).load(function(){
-            if($('#new_post_create')){
-                $('#new_post_create').click(function(e){
-                    $(e.target).hide();
-                    $('#new_post_holder').show();
+        $(document).ready(function(){
+            var thread_reply = $('a.sidebar_thread_reply');
+            var thread_tag = $('a.sidebar_thread_tag');
+            var thread_spam = $('a.sidebar_thread_spam');
+            var new_post_holder = $('#new_post_holder');
+            var new_post_create = $('#new_post_create');
+            var tag_thread_holder = $('#tag_thread_holder');
+            var allow_moderate = $('#allow_moderate');
+            if(new_post_create){
+                new_post_create.click(function(e){
+                    new_post_create.hide();
+                    new_post_holder.show();
                 });
             }
+            if(thread_reply){
+                if(new_post_holder.length){
+                    thread_reply[0].style.display='block';
+                    thread_reply.click(function(e){
+                        new_post_create.hide();
+                        new_post_holder.show();
+                        // focus the submit to scroll to the bottom, then focus the subject for them to start typing
+                        $('input[type="submit"]', new_post_holder).focus();
+                        $('input[type="text"]', new_post_holder).focus();
+                        return false;
+                    });
+                }
+            }
+            if(thread_tag){
+                if(tag_thread_holder.length){
+                    thread_tag[0].style.display='block';
+                    thread_tag.click(function(e){
+                        tag_thread_holder.show();
+                        // focus the submit to scroll to the bottom, then focus the subject for them to start typing
+                        $('input[type="submit"]', tag_thread_holder).focus();
+                        $('input[type="text"]', tag_thread_holder).focus();
+                        return false;
+                    });
+                }
+            }
+            if(thread_spam){
+                if(allow_moderate.length){
+                    thread_spam[0].style.display='block';
+                }
+            }
         });
         ''')
 

--- a/pyforge/pyforge/lib/widgets/templates/thread.html
+++ b/pyforge/pyforge/lib/widgets/templates/thread.html
@@ -15,10 +15,14 @@
       </py:for>
     </div>
   </py:with>
+  <div id="allow_moderate" py:if="has_artifact_access('moderate', value)()"/>
   <py:if test="has_artifact_access('post', value)()">
     <input id="new_post_create" type="button" class="ui-state-default ui-button ui-button-text" value="$new_post_text"/>
     <div id="new_post_holder" style="display:none">
       ${widgets.edit_post.display(submit_text='New Post', action=value.url() + 'post')}
     </div>
+    <div id="tag_thread_holder" style="display:none">
+      ${widgets.tag_post.display(value=value,submit_text='Tag Post', action=value.url() + 'tag')}
+    </div>
   </py:if>
 </div>

--- a/pyforge/pyforge/lib/widgets/templates/threads_table.html
+++ b/pyforge/pyforge/lib/widgets/templates/threads_table.html
@@ -2,7 +2,7 @@
      xmlns:py="http://genshi.edgewall.org/"
      xmlns:xi="http://www.w3.org/2001/XInclude">
      <xi:include href="${g.pyforge_templates}/lib.html" />
-  <table id="forum-list" class="forums clear"> 
+  <table id="forum-list" class="clear">
     <thead> 
       <tr> 
         <th>&nbsp;</th> 

--- a/pyforge/pyforge/model/discuss.py
+++ b/pyforge/pyforge/model/discuss.py
@@ -13,7 +13,7 @@ from ming.orm.property import FieldProperty, RelationProperty, ForeignIdProperty
 
 from pyforge.lib import helpers as h
 from pyforge.lib.security import require, has_artifact_access
-from .artifact import Artifact, VersionedArtifact, Snapshot, Message
+from .artifact import Artifact, VersionedArtifact, Snapshot, Message, Feed
 from .filesystem import File
 from .types import ArtifactReference, ArtifactReferenceType
 
@@ -137,6 +137,7 @@ class Thread(Artifact):
         self.num_replies += 1
         if not self.first_post:
             self.first_post_id = p._id
+        Feed.post(self, title=p.subject, description=p.text)
         return p
 
     def post(self, text, message_id=None, parent_id=None, **kw):

--- a/pyforge/pyforge/templates/style.mak
+++ b/pyforge/pyforge/templates/style.mak
@@ -688,7 +688,7 @@ border-bottom: 4px solid  rgb(215,215,215);}
 .tagEditor li
 {
 	display: inline;
-	background-image: url(https://newforge.sf.geek.net/images/minus_small.png);
+	background-image: url(/images/minus_small.png);
 	background-color: #eef;
 	background-position: right center;
 	background-repeat: no-repeat;
@@ -832,3 +832,6 @@ small.badge:hover {
 
 #tipcca {	text-align: left; height:3em; padding-left: 55px; width: 190px; background-image: url('images/cca.png'); background-position: 5px 50%; background-repeat: no-repeat;}
 
+ul#sidebarmenu li a.sidebar_thread_tag,
+ul#sidebarmenu li a.sidebar_thread_reply,
+ul#sidebarmenu li a.sidebar_thread_spam{display:none;}
\ No newline at end of file