You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/08 12:06:12 UTC
[1/2] allura git commit: [#7978] ticket:870 changed header of user
activity
Repository: allura
Updated Branches:
refs/heads/ib/7978b [created] 709c432e1
[#7978] ticket:870 changed header of user activity
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/03bb7472
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/03bb7472
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/03bb7472
Branch: refs/heads/ib/7978b
Commit: 03bb7472d854d274b09b21a934e5be422e60fb96
Parents: 36303a1
Author: DeV1doR <de...@ukr.net>
Authored: Mon Dec 7 14:48:51 2015 +0200
Committer: DeV1doR <de...@ukr.net>
Committed: Mon Dec 7 14:48:51 2015 +0200
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 3 ++-
ForgeActivity/forgeactivity/templates/index.html | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/03bb7472/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index d51b0e2..6049fd0 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -132,7 +132,8 @@ class ForgeActivityController(BaseController):
timeline=filtered_timeline,
page=page,
limit=limit,
- has_more=has_more)
+ has_more=has_more,
+ actor_only=actor_only)
@expose('jinja:forgeactivity:templates/index.html')
@with_trailing_slash
http://git-wip-us.apache.org/repos/asf/allura/blob/03bb7472/ForgeActivity/forgeactivity/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/index.html b/ForgeActivity/forgeactivity/templates/index.html
index c4a57a0..6a78588 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -23,10 +23,15 @@
{% block title %}{{c.project.name}} Activity{% endblock %}
{% block header %}
- Activity for
{% if c.project.is_user_project %}
- {{c.project.user_project_of.display_name}}
+ {% if not actor_only %}
+ Activity from your followers
+ {% else %}
+ Activity for
+ {{c.project.user_project_of.display_name}}
+ {% endif %}
{% else %}
+ Activity for
{{c.project.name}}
{% endif %}
{% endblock %}
[2/2] allura git commit: [#7978] ticket:870 returned link for
'Activity I follow' in /auth/preferences/
Posted by je...@apache.org.
[#7978] ticket:870 returned link for 'Activity I follow' in /auth/preferences/
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/709c432e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/709c432e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/709c432e
Branch: refs/heads/ib/7978b
Commit: 709c432e163ad7e6b206873583f4b18a54a9647a
Parents: 03bb747
Author: DeV1doR <de...@ukr.net>
Authored: Mon Dec 7 15:41:34 2015 +0200
Committer: DeV1doR <de...@ukr.net>
Committed: Mon Dec 7 15:41:34 2015 +0200
----------------------------------------------------------------------
Allura/allura/templates/user_prefs.html | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/709c432e/Allura/allura/templates/user_prefs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index bd593ab..74d5c08 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -32,6 +32,7 @@
<fieldset class="preferences">
<legend>Username: {{ c.user.username }}</legend>
<p><a href="{{ c.user.private_project().url() }}">My profile and my projects</a></p>
+ <p><a href="{{ c.user.url() }}activity/">Activity I follow</a></p>
<p><a href="{{ c.user.private_project().url() }}admin/overview">Set avatar icon</a></p>
{% if h.asbool(tg.config.get('auth.allow_user_to_disable_account', False)) %}
<p><a href="/auth/disable">Disable account</a></p>