diff options
| author | Johan Sørensen <johan@johansorensen.com> | 2010-01-12 13:58:00 +0100 |
|---|---|---|
| committer | Johan Sørensen <johan@johansorensen.com> | 2010-01-12 13:58:00 +0100 |
| commit | 5aecdb43df34f8c0d05d50faf565847acaf2ead2 (patch) | |
| tree | b84cd205bdcd5d66898712701b55dea6fa7c5989 | |
| parent | 1fa7d9a2edc96d96553d7673691d90f90a7c16dc (diff) | |
| download | gitorious-mainline-outdated-5aecdb43df34f8c0d05d50faf565847acaf2ead2.zip gitorious-mainline-outdated-5aecdb43df34f8c0d05d50faf565847acaf2ead2.tar.gz gitorious-mainline-outdated-5aecdb43df34f8c0d05d50faf565847acaf2ead2.tar.bz2 | |
Atom feed for the watchlist feed on the user dashboard
| -rw-r--r-- | app/controllers/site_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/site/dashboard.html.erb | 4 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 3436b59..cee4a6e 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -83,6 +83,7 @@ class SiteController < ApplicationController @messages = @user.messages_in_inbox(3) if @user == current_user @favorites = @user.watched_objects @root = Breadcrumb::Dashboard.new(current_user) + @atom_auto_discovery_url = watchlist_user_path(current_user, :format => :atom) render :template => "site/dashboard" end diff --git a/app/views/site/dashboard.html.erb b/app/views/site/dashboard.html.erb index 97bec42..426f4e2 100644 --- a/app/views/site/dashboard.html.erb +++ b/app/views/site/dashboard.html.erb @@ -55,10 +55,12 @@ <h2 class="activities"> Your Newsfeed + <%= feed_icon @atom_auto_discovery_url -%> </h2> <% if @events.empty? -%> <p class="hint"> - You have no news + You have no news, click on the watch icon + (<%= image_tag("silk/star.png") -%>) to see new activities here </p> <% else -%> <div id="user_events"> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 06b1867..8736d04 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -25,13 +25,6 @@ <% @page_title = h(@user.login) -%> <%= breadcrumbs_from(@user) -%> -<%- content_for(:extra_head) do -%> - <% if is_current_user?(@user) -%> - <%= auto_discovery_link_tag(:atom, watchlist_user_path(@user, :format => :atom), - :title => "Your Newsfeed") -%> - <% end -%> -<% end -%> - <div class="with_divider"> <div id="left"> <div class="user-profile"> |