diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/track/_tracking_links.rhtml | 6 | ||||
| -rw-r--r-- | app/views/user/_change_receive_email.rhtml | 8 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 1 | ||||
| -rw-r--r-- | app/views/user/wall.rhtml | 5 |
4 files changed, 11 insertions, 9 deletions
diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index 5d770c742..ac1d302fc 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -9,10 +9,8 @@ <% elsif existing_track %> <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form feed_form_" + location) do %> <p> - <%= track_thing.params[:verb_on_page_already] %> - <%= hidden_field_tag 'track_medium', "delete" %> - <%= hidden_field_tag 'r', request.request_uri %> - <%= submit_tag "unsubscribe" %> + <%= track_thing.params[:verb_on_page_already] %><br><br> + <%= link_to "Unsubscribe", {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %> </p> <% end %> <% elsif track_thing %> diff --git a/app/views/user/_change_receive_email.rhtml b/app/views/user/_change_receive_email.rhtml index 1518dae9b..4de7b8cb0 100644 --- a/app/views/user/_change_receive_email.rhtml +++ b/app/views/user/_change_receive_email.rhtml @@ -1,10 +1,12 @@ <% form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %> <% if @user.receive_email_alerts %> - You are currently receiving notification of new activity on your wall by email. + <%= _('You are currently receiving notification of new activity on your wall by email.', :wall_url => show_user_wall_path) %> <%= hidden_field_tag 'receive_email_alerts', 'false' %> - <%= submit_tag "Turn off email alerts" %> + <%= submit_tag _("Turn off email alerts") %> <% else %> + <%= _('Items matching the following conditions are currently displayed on your wall.') %> <%= hidden_field_tag 'receive_email_alerts', 'true' %> - <%= submit_tag "Send me alerts of new activity by email" %> + <%= submit_tag _("Also send me alerts by email") %> <% end %> <% end %> + diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index e2047f216..d723196d3 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -193,7 +193,6 @@ <% end %> <% if @show_profile && @is_you %> <h2 id="email_subscriptions"> <%= _("Things you're following")%></h2> - <p>You can view everything you're following on <%= link_to "your wall", show_user_wall_path %>.</p> <%= render :partial => 'change_receive_email' %> <br> <% if @track_things.empty? %> diff --git a/app/views/user/wall.rhtml b/app/views/user/wall.rhtml index b48169908..dd45250bd 100644 --- a/app/views/user/wall.rhtml +++ b/app/views/user/wall.rhtml @@ -1,7 +1,10 @@ <% @title = h(@display_user.name) + _(" - wall") %> -<p>This page lists your own activity, and activity you've followed. You can change what you're following on <%= link_to "your profile page", show_user_profile_path %>.</p> +<div class="medium_column"> + <p><%= _('You can change the requests and users you are following on <a href="{{profile_url}}">your profile page</a>.', :profile_url => show_user_profile_path) %> <%= render :partial => 'change_receive_email' %> +</div> + <div id="user_profile_search"> <% if !@feed_results.nil? %> <% for result in @feed_results %> |