You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/01/23 18:36:38 UTC
[10/10] git commit: [#4395] Add feed action to activity stream page &
widget
[#4395] Add feed action to activity stream page & widget
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a0b99127
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a0b99127
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a0b99127
Branch: refs/heads/cj/4395
Commit: a0b9912775d6f9760bac7917023d6006f1f1f4f1
Parents: e276acf
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Jan 23 16:30:15 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Jan 23 17:36:17 2014 +0000
----------------------------------------------------------------------
Allura/allura/ext/user_profile/user_main.py | 2 +-
Allura/allura/nf/allura/css/site_style.css | 1 +
ForgeActivity/forgeactivity/templates/index.html | 1 +
ForgeActivity/forgeactivity/templates/widgets/profile_section.html | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a0b99127/Allura/allura/ext/user_profile/user_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index a9758e1..52c9985 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -255,5 +255,5 @@ class ProfileSectionBase(object):
if not self.check_display():
return ''
tmpl = g.jinja2_env.get_template(self.template)
- context = self.prepare_context({'h': h, 'c': c})
+ context = self.prepare_context({'h': h, 'c': c, 'g': g})
return Markup(tmpl.render(context))
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a0b99127/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 6c6ff02..94f5d09 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3261,6 +3261,7 @@ ul.dropdown ul li a:hover {
}
.user-activity h3 a {
float: right;
+ margin-left: 8px;
}
.user-activity h3 b.ico {
background-image: url('../images/neo-icon-set-ffffff-256x350.png');
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a0b99127/ForgeActivity/forgeactivity/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/index.html b/ForgeActivity/forgeactivity/templates/index.html
index fef165a..1cadb3f 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -32,6 +32,7 @@
{% endblock %}
{% block actions %}
+ <a href="feed.rss" title="RSS"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}" title="Feed"></b></a>
{% if c.user and c.user != c.user.anonymous() and followee != c.user %}
{{c.follow_toggle.display(following=following)}}
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a0b99127/ForgeActivity/forgeactivity/templates/widgets/profile_section.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/widgets/profile_section.html b/ForgeActivity/forgeactivity/templates/widgets/profile_section.html
index a9e473f..4e1bec2 100644
--- a/ForgeActivity/forgeactivity/templates/widgets/profile_section.html
+++ b/ForgeActivity/forgeactivity/templates/widgets/profile_section.html
@@ -26,6 +26,7 @@
{% if c.user and not c.user.is_anonymous() and c.user != user %}
{{follow_toggle.display(following=following, action=activity_app.url+'follow')}}
{% endif %}
+ <a href="feed.rss" title="RSS"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}" title="Feed"></b></a>
</h3>
{% if not timeline %}
<p class="empty">No activity to display.</p>