Commit: c4109f62d8436ef507061d932ad94a41fac5637e - allura (git)

allura

Commit MetaInfo

• Revision: c4109f62d8436ef507061d932ad94a41fac5637e (tree)
• Zeit: 2012-06-28 07:33:48
• Autor: Cory Johns <johnsca@geek...>
• Commiter: Cory Johns

Log Message

[#4388] Added UI for watching / following projects / users

Signed-off-by: Cory Johns <[e-mail]>

Ändern Zusammenfassung

• modified: Allura/allura/lib/app_globals.py
• add: ForgeActivity/forgeactivity/config/__init__.py
• add: ForgeActivity/forgeactivity/config/resources.py
• modified: ForgeActivity/forgeactivity/main.py
• modified: ForgeActivity/forgeactivity/templates/index.html
• add: ForgeActivity/forgeactivity/templates/widgets/follow.html
• add: ForgeActivity/forgeactivity/widgets/__init__.py
• add: ForgeActivity/forgeactivity/widgets/follow.py
• add: ForgeActivity/forgeactivity/widgets/resources/js/follow.js
• modified: ForgeActivity/setup.py

Diff

--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -122,6 +122,8 @@ class Globals(object):
             user=Icon('U', 'ico-user'),
             secure=Icon('(', 'ico-lock'),
             unsecure=Icon(')', 'ico-unlock'),
+            star=Icon('S', 'ico-star'),
+            watch=Icon('E', 'ico-watch'),
             # Permissions
             perm_read=Icon('E', 'ico-focus'),
             perm_update=Icon('0', 'ico-sync'),

--- /dev/null
+++ b/ForgeActivity/forgeactivity/config/resources.py
@@ -0,0 +1,5 @@
+import pkg_resources
+
+def register_ew_resources(manager):
+    manager.register_directory(
+        'activity_js', pkg_resources.resource_filename('forgeactivity', 'widgets/resources/js'))

--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -8,13 +8,21 @@ from pylons import c, response
 from tg import expose, validate, config, redirect
 from tg.decorators import with_trailing_slash
 from paste.deploy.converters import asbool
+from formencode import validators as fev
+from webob import exc
 
 from allura.app import Application
 from allura import version
 from allura.controllers import BaseController
+from allura.lib.security import require_authenticated
+
+from activitystream import director
+
+from .widgets.follow import FollowToggle
 
 log = logging.getLogger(__name__)
 
+
 class ForgeActivityApp(Application):
     """Project Activity page for projects."""
     __version__ = version.__version__
@@ -43,6 +51,8 @@ class ForgeActivityApp(Application):
     def uninstall(self, project):
         pass # pragma no cover
 
+class W:
+    follow_toggle = FollowToggle()
 
 class ForgeActivityController(BaseController):
     @expose('jinja:forgeactivity:templates/index.html')
@@ -50,6 +60,36 @@ class ForgeActivityController(BaseController):
     def index(self, **kw):
         activity_enabled = asbool(config.get('activity_stream.enabled', False))
         if not activity_enabled:
-            response.status = 404
-            return dict()
-        return dict()
+            raise HTTPNotFound()
+
+        c.follow_toggle = W.follow_toggle
+        followee = c.project
+        if c.project.is_user_project:
+            followee = c.project.user_project_of
+        following = director().is_connected(c.user, followee)
+        return dict(following=following)
+
+    @expose('json:')
+    @validate(W.follow_toggle)
+    def follow(self, follow, **kw):
+        activity_enabled = asbool(config.get('activity_stream.enabled', False))
+        if not activity_enabled:
+            raise HTTPNotFound()
+
+        require_authenticated()
+        followee = c.project
+        if c.project.is_user_project:
+            followee = c.project.user_project_of
+        try:
+            if follow:
+                director().connect(c.user, followee)
+            else:
+                director().disconnect(c.user, followee)
+        except Exception as e:
+            return dict(
+                success=False,
+                message='Unexpected error: %s' % e)
+        return dict(
+            success=True,
+            message=W.follow_toggle.success_message(follow),
+            following=follow)

--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -3,7 +3,20 @@
 
 {% block title %}{{c.project.name}} Activity{% endblock %}
 
-{% block header %}{{c.project.name}} Activity{% endblock %}
+{% block header %}
+    Activity for
+    {% if c.project.is_user_project %}
+        {{c.project.user_project_of.display_name}}
+    {% else %}
+        {{c.project.name}}
+    {% endif %}
+{% endblock %}
+
+{% block actions %}
+    {% if c.user and c.user != c.user.anonymous() %}
+        {{c.follow_toggle.display(following=following)}}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     <div class="grid-14">

--- /dev/null
+++ b/ForgeActivity/forgeactivity/templates/widgets/follow.html
@@ -0,0 +1,5 @@
+<a  href="{{action}}?follow={{not following}}"
+    class="artifact_follow{{ ' active' if following }}"
+    title="{{'Stop %sing' % action_label if following else action_label|capitalize}} {{thing}}"><b
+        data-icon="{{g.icons[icon].char}}" class="ico {{g.icons[icon].css}}"
+        title="{{'Stop %sing' % action_label if following else action_label|capitalize}} {{thing}}"></b></a>

--- /dev/null
+++ b/ForgeActivity/forgeactivity/widgets/follow.py
@@ -0,0 +1,42 @@
+from pylons import c
+from formencode import validators as fev
+import ew as ew_core
+import ew.jinja2_ew as ew
+
+
+class FollowToggle(ew.SimpleForm):
+    template='jinja:forgeactivity:templates/widgets/follow.html'
+    defaults=dict(
+        ew.SimpleForm.defaults,
+        thing='project',
+        action='follow',
+        action_label='watch',
+        icon='watch',
+        following=False)
+
+    class fields(ew_core.NameList):
+        follow = ew.HiddenField(validator=fev.StringBool())
+
+    def resources(self):
+        yield ew.JSLink('activity_js/follow.js')
+
+    def prepare_context(self, context):
+        default_context = super(FollowToggle, self).prepare_context({})
+        if c.project.is_user_project:
+            default_context.update(
+                thing=c.project.user_project_of.display_name,
+                action_label='follow',
+                icon='star',
+            )
+        else:
+            default_context.update(thing=c.project.name)
+        default_context.update(context)
+        return default_context
+
+    def success_message(self, following):
+        context = self.prepare_context({})
+        return u'You are {state} {action}ing {thing}.'.format(
+            state='now' if following else 'no longer',
+            action=context['action_label'],
+            thing=context['thing'],
+        )

--- /dev/null
+++ b/ForgeActivity/forgeactivity/widgets/resources/js/follow.js
@@ -0,0 +1,34 @@
+$(document).ready(function() {
+    function title_stop_following($elem) {
+        $elem.attr('title', $elem.attr('title').replace(/^([A-Z])(\w+)/, function(p,c,w) {
+            return 'Stop ' + c.toLowerCase() + w + 'ing';
+        }));
+    }
+
+    function title_start_following($elem) {
+        $elem.attr('title', $elem.attr('title').replace(/^Stop ([a-z])(\w+)ing/, function(p,c,w) {
+            return c.toUpperCase() + w;
+        }));
+    }
+
+    $('.artifact_follow').click(function(e) {
+        e.preventDefault();
+        var $link = $(this);
+        $.get(this.href, function(result) {
+            flash(result.message, result.success ? 'success' : 'error');
+            console.log(result.following);
+            if (result.following && !$link.hasClass('active')) {
+                $link.attr('href', $link.attr('href').replace(/True$/i, 'False'));
+                $link.addClass('active');
+                title_stop_following($link);
+                title_stop_following($link.find('b'));
+            } else if (!result.following && $link.hasClass('active')) {
+                $link.attr('href', $link.attr('href').replace(/False$/i, 'True'));
+                $link.removeClass('active');
+                title_start_following($link);
+                title_start_following($link.find('b'));
+            }
+        });
+        return false;
+    });
+});

--- a/ForgeActivity/setup.py
+++ b/ForgeActivity/setup.py
@@ -22,5 +22,8 @@ setup(name='ForgeActivity',
       # -*- Entry points: -*-
       [allura]
       activity=forgeactivity.main:ForgeActivityApp
+
+      [easy_widgets.resources]
+      ew_resources=forgeactivity.config.resources:register_ew_resources
       """,
       )