allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [1/2] allura git commit: [#7978] ticket:870 changed header of user activity
Date Tue, 08 Dec 2015 11:06:12 GMT
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 <dev1dor@ukr.net>
Authored: Mon Dec 7 14:48:51 2015 +0200
Committer: DeV1doR <dev1dor@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 %}


Mime
View raw message