diff options
Diffstat (limited to 'app/views/track')
| -rw-r--r-- | app/views/track/_tracking_people_and_link.rhtml | 53 | ||||
| -rw-r--r-- | app/views/track/track_set.rhtml | 33 |
2 files changed, 17 insertions, 69 deletions
diff --git a/app/views/track/_tracking_people_and_link.rhtml b/app/views/track/_tracking_people_and_link.rhtml index 3c8953336..a104010b7 100644 --- a/app/views/track/_tracking_people_and_link.rhtml +++ b/app/views/track/_tracking_people_and_link.rhtml @@ -1,45 +1,26 @@ -<% - existing_track = TrackThing.find_by_existing_track(@user, track_thing) - tracking_people = [] - if list_people - tracking_people = TrackThing.find_tracking_people(track_thing) +<% + if @user + existing_track = TrackThing.find_by_existing_track(@user, track_thing) end %> -<% if (not list_people) or tracking_people.size > 0 %> - <% if tracking_people.size > 0 %> - <ul> - <% for u in tracking_people %> - <li><%=user_link(u)%></li> - <% end %> - </ul> + +<% if own_request %> + <p>This is your own request, so you will be automatically emailed when new responses arrive.</p> +<% elsif existing_track %> + <% form_tag :controller => 'track', :action => 'update', :track_id => existing_track.id 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" %> + </p> <% end %> - <p> - <% if existing_track %> - You are already <%= track_thing.params[:verb_on_page_already] %> - (<%= link_to "alter your subscriptions", user_url(@user) %>). - <% else %> - <% if own_request %> - <p>You will be emailed when there are updates to your own request.</p> - <p>You may also <%= link_to "get an RSS feed", do_track_url(track_thing) %> - <img src="/images/feed-16.png" alt="" class="rss"></p> - <% else %> - <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %> - (by email or RSS feed <img src="/images/feed-16.png" alt="" class="rss">) - <% end %> - <% end %> - </p> <% else %> - <% if own_request %> - <p>You will be emailed when there are updates to your own request.</p> - <p>You may also get an <%= link_to 'RSS feed', do_track_url(track_thing) %> - <img src="/images/feed-16.png" alt="" class="rss"></p> - <% else %> - <p>Be the first to <%= link_to MySociety::Format.lcfirst(track_thing.params[:verb_on_page]), do_track_url(track_thing) %> - (by email or RSS feed <img src="/images/feed-16.png" alt="" class="rss">)</p> - <% end %> + <div class="feed_link"><%= link_to '<img src="/images/email-16.png" alt="" class="rss">', do_track_url(track_thing) %> + <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %></div> <% end %> -<div class="feed_link"><%= link_to '<img src="/images/feed-16.png" alt="" class="rss">', do_track_url(track_thing, 'feed') %> <%= link_to 'RSS feed', do_track_url(track_thing, 'feed') %></div> +<div class="feed_link"><%= link_to '<img src="/images/feed-16.png" alt="" class="rss">', do_track_url(track_thing, 'feed') %> <%= link_to 'RSS feed of updates', do_track_url(track_thing, 'feed') %></div> diff --git a/app/views/track/track_set.rhtml b/app/views/track/track_set.rhtml deleted file mode 100644 index 452938c12..000000000 --- a/app/views/track/track_set.rhtml +++ /dev/null @@ -1,33 +0,0 @@ -<div id="track_set"> - -<% form_tag({:id => "track_set_form"}) do %> - <%= foi_error_messages_for :track_thing %> - - <div class="form_note"> - <h1><%=@title %></h1> - </div> - - <div class="form_note"> - <!--<%= radio_button "track_thing", "track_medium", "email_immediate" %> - <label for="track_track_medium_email">Send me emails shortly after there are updates</label> - <br> --> - <%= radio_button "track_thing", "track_medium", "email_daily" %> - <label for="track_thing_track_medium_email_daily">Send me emails at most once a day</label> - <br> - <%= radio_button "track_thing", "track_medium", "feed" %> - <label for="track_thing_track_medium_feed">Give me a feed to use in my news reader (RSS <img src="/images/feed-14.png" alt="" class="rss">)</label> - </div> - - <p class="form_note"> - <strong>Lack of privacy note:</strong> It will appear publically on your user page that - you are tracking this (<a href="/help/about/#tracking">why?</a>). - </p> - - <div class="form_button"> - <%= hidden_field_tag 'submitted_track', 1 %> - <%= submit_tag "Subscribe" %> - </div> -<% end %> - -</div> - |