aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/helpers/link_to_helper.rb17
-rw-r--r--app/views/admin/index.rhtml14
-rw-r--r--app/views/admin/timeline.rhtml6
-rw-r--r--app/views/admin_public_body/list.rhtml4
-rw-r--r--app/views/admin_public_body/show.rhtml6
-rw-r--r--app/views/admin_request/_some_requests.rhtml6
-rw-r--r--app/views/admin_request/show.rhtml10
-rw-r--r--app/views/admin_track/list.rhtml2
-rw-r--r--app/views/admin_user/list.rhtml2
-rw-r--r--app/views/admin_user/show.rhtml6
-rw-r--r--todo.txt12
11 files changed, 38 insertions, 47 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 722c6a2d7..294390f5f 100644
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -5,7 +5,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: link_to_helper.rb,v 1.37 2008-08-26 22:54:46 francis Exp $
+# $Id: link_to_helper.rb,v 1.38 2008-08-29 12:52:25 francis Exp $
module LinkToHelper
@@ -21,8 +21,8 @@ module LinkToHelper
def request_admin_url(info_request)
return admin_url('request/show/' + info_request.id.to_s)
end
- def request_admin_link(info_request)
- link_to h(info_request.title), request_admin_url(info_request)
+ def request_both_links(info_request)
+ link_to(h(info_request.title), main_url(request_url(info_request))) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
end
def request_similar_url(info_request)
return similar_request_url(:url_title => info_request.url_title, :only_path => true)
@@ -52,11 +52,8 @@ module LinkToHelper
def public_body_admin_url(public_body)
return admin_url('body/show/' + public_body.id.to_s)
end
- def public_body_admin_link(public_body)
- link_to h(public_body.name), public_body_admin_url(public_body)
- end
- def public_body_admin_link_short(public_body)
- link_to h(public_body.short_or_long_name), public_body_admin_url(public_body)
+ def public_body_both_links(public_body)
+ link_to(h(public_body.name), main_url(public_body_url(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
end
# Users
@@ -86,8 +83,8 @@ module LinkToHelper
def user_admin_url(user)
return admin_url('user/show/' + user.id.to_s)
end
- def user_admin_link(user)
- link_to h(user.name), user_admin_url(user)
+ def user_both_links(user)
+ link_to(h(user.name), main_url(user_url(user))) + " (" + link_to("admin", user_admin_url(user)) + ")"
end
# Tracks. feed can be 'track' or 'feed'
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 5dd999e44..6749c263f 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -19,7 +19,7 @@
<ul>
<% for message in @holding_pen_messages %>
<li>
- <%= link_to excerpt(message.get_body_for_quoting, "", 60), "request/show/" + InfoRequest.holding_pen_request.id.to_s + "#incoming-" + message.id.to_s %>
+ <%= link_to excerpt(message.get_body_for_quoting, "", 60), request_admin_url(InfoRequest.holding_pen_request) + "#incoming-" + message.id.to_s %>
(<%=simple_date(message.sent_at)%>)
</li>
<% end %>
@@ -33,8 +33,8 @@
<ul>
<% for @request in @ten_days_old_unclassified %>
<li>
- <%= link_to h(@request.title), "request/show/" + @request.id.to_s %>
- (<%=simple_date(@request.get_last_event.created_at)%>)
+ <%= request_both_links(@request) %>
+ &ndash; <%=simple_date(@request.get_last_event.created_at)%>
</li>
<% end %>
</ul>
@@ -46,8 +46,8 @@
<ul>
<% for @request in @requires_admin_requests %>
<li>
- <%= link_to h(@request.title), "request/show/" + @request.id.to_s %>
- (<%=simple_date(@request.get_last_event.created_at)%>)
+ <%= request_both_links(@request)%>
+ &ndash; <%=simple_date(@request.get_last_event.created_at)%>
</li>
<% end %>
</ul>
@@ -58,8 +58,8 @@
<ul>
<% for @blank_contact in @blank_contacts %>
<li>
- <%= link_to h(@blank_contact.name), "body/show/" + @blank_contact.id.to_s %>
- (<%=simple_date(@blank_contact.updated_at)%>)
+ <%= public_body_both_links(@blank_contact)%>
+ &ndash; <%=simple_date(@blank_contact.updated_at)%>
</li>
<% end %>
</ul>
diff --git a/app/views/admin/timeline.rhtml b/app/views/admin/timeline.rhtml
index f24d0be4b..3b77b5821 100644
--- a/app/views/admin/timeline.rhtml
+++ b/app/views/admin/timeline.rhtml
@@ -23,8 +23,7 @@
<% if event.class.to_s == 'InfoRequestEvent' %>
- '<%= link_to h(event.info_request.title), main_url(request_url(event.info_request)) %>'
- (<%= link_to "admin", "request/show/" + event.info_request.id.to_s %>)
+ <%= request_both_links(event.info_request) %>
<% if event.event_type == 'edit' %>
was edited by administrator <strong><%=h event.params[:editor] %></strong>.
<% for p in ['title', 'prominence', 'described_state', 'awaiting_description']
@@ -68,8 +67,7 @@
had '<%=event.event_type%>' done to it, parameters <%=h event.params_yaml%>.
<% end %>
<% else %>
- <%= link_to event.public_body.name, main_url(public_body_url(event.public_body)) %>
- (<%= link_to "admin", "body/show/" + event.public_body_id.to_s %>)
+ <%= public_body_both_links(event.public_body) %>
was created/updated by administrator <strong><%=h event.last_edit_editor %></strong>
<% end %>
<% end %>
diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml
index 87581bc2c..95ee80def 100644
--- a/app/views/admin_public_body/list.rhtml
+++ b/app/views/admin_public_body/list.rhtml
@@ -25,7 +25,7 @@
</tr>
<% for public_body in @public_bodies_by_tag %>
<tr class="<%= cycle('odd', 'even') %>">
- <td><%= link_to h(public_body.name), 'show/' + public_body.id.to_s %></td>
+ <td><%= public_body_both_links(public_body) %></td>
<% for column in PublicBody.content_columns.map { |c| c.name } - [ "name", "last_edit_comment" ] %>
<td><%=h public_body.send(column) %></td>
<% end %>
@@ -44,7 +44,7 @@
</tr>
<% for public_body in @public_bodies %>
<tr class="<%= cycle('odd', 'even') %>">
- <td><%= link_to h(public_body.name), 'show/' + public_body.id.to_s %></td>
+ <td><%= public_body_both_links(public_body) %></td>
<% for column in PublicBody.content_columns.map { |c| c.name } - [ "name", "last_edit_comment" ] %>
<td><%=h public_body.send(column) %></td>
<% end %>
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index a97b01a1c..2ff28afc0 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -12,8 +12,10 @@
<br/>
</p>
-<p><%= link_to 'Edit', '../edit/' + @public_body.id.to_s %>
-| <%= link_to 'Public page', main_url(public_body_url(@public_body)) %></p>
+<p>
+ <%= link_to 'Public page', main_url(public_body_url(@public_body)) %>
+ | <%= link_to 'Edit', '../edit/' + @public_body.id.to_s %>
+</p>
<h2>History</h2>
<table border="1">
diff --git a/app/views/admin_request/_some_requests.rhtml b/app/views/admin_request/_some_requests.rhtml
index a5b0bab0e..f2b8e7bea 100644
--- a/app/views/admin_request/_some_requests.rhtml
+++ b/app/views/admin_request/_some_requests.rhtml
@@ -10,9 +10,9 @@
<% for info_request in info_requests %>
<tr class="<%= cycle('odd', 'even') %>">
- <td><%= link_to h(info_request.title), (deep ? '../../request/show/' : 'show/') + info_request.id.to_s %></td>
- <td><%= link_to h(info_request.public_body.name), (deep ? '../../body/show/' : '../body/show/') + info_request.public_body.id.to_s %></td>
- <td><%= link_to h(info_request.user.name), (deep ? '../../user/show/' : '../user/show/') + info_request.user.id.to_s %></td>
+ <td><%= request_both_links(info_request) %></td>
+ <td><%= public_body_both_links(info_request.public_body) %></td>
+ <td><%= user_both_links(info_request.user) %></td>
<% for column in InfoRequest.content_columns.map { |c| c.name } - [ "title", "url_title" ] %>
<td><%=h info_request.send(column) %></td>
<% end %>
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index bef2e41de..56539be0a 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -7,14 +7,14 @@
<strong><%= column.human_name %>:</strong> <%=h @info_request.send(column.name) %>
<br/>
<% end %>
-<strong>Created by:</strong> <%= user_admin_link(@info_request.user) %> <br>
-<strong>Public authority:</strong> <%= public_body_admin_link(@info_request.public_body) %> <br>
+<strong>Created by:</strong> <%= user_both_links(@info_request.user) %> <br>
+<strong>Public authority:</strong> <%= public_body_both_links(@info_request.public_body) %> <br>
<strong>Incoming email address:</strong> <%=h @info_request.incoming_email %> <br>
</p>
<p>
-<%= link_to 'Public page', main_url(request_url(@info_request)) %>
-| <%= link_to "Edit", '../edit/' + @info_request.id.to_s %>
+ <%= link_to 'Public page', main_url(request_url(@info_request)) %>
+ | <%= link_to 'Edit', '../edit/' + @info_request.id.to_s %>
</p>
<h2>Events</h2>
@@ -124,7 +124,7 @@
<% for comment in @info_request.comments.find(:all, :order => 'created_at') %>
<tr class="<%= cycle('odd', 'even') %>">
<td><%=h comment.id %></td>
- <td><%= user_admin_link(comment.user) %></td>
+ <td><%= user_both_links(comment.user) %></td>
<% for column in Comment.content_columns.map { |c| c.name } %>
<td><%=h comment.send(column) %></td>
<% end %>
diff --git a/app/views/admin_track/list.rhtml b/app/views/admin_track/list.rhtml
index c2fa4f6aa..1d076edf5 100644
--- a/app/views/admin_track/list.rhtml
+++ b/app/views/admin_track/list.rhtml
@@ -22,7 +22,7 @@
<% for track_thing in @admin_tracks %>
<tr class="<%= cycle('odd', 'even') %>">
<td><%=h track_thing.id %></td>
- <td><%= user_admin_link(track_thing.tracking_user) %></td>
+ <td><%= user_both_links(track_thing.tracking_user) %></td>
<% for column in TrackThing.content_columns.map { |c| c.name } %>
<% if column == 'track_medium' and track_thing.track_medium == 'feed'%>
<td><%= link_to track_thing.track_medium, atom_feed_url(:track_id => track_thing.id) %></td>
diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml
index 3ba26a626..bbd9e82e3 100644
--- a/app/views/admin_user/list.rhtml
+++ b/app/views/admin_user/list.rhtml
@@ -20,7 +20,7 @@
<% for user in @admin_users %>
<tr class="<%= cycle('odd', 'even') %>">
<td><%= user.id.to_s %></td>
- <td><%= link_to h(user.name), 'show/' + user.id.to_s %></td>
+ <td><%= user_both_links(user) %></td>
<td><a href="mailto:<%=h user.email %>"><%=h user.email%></a></td>
<% for column in ['created_at', 'updated_at', 'email_confirmed', 'admin_level'] %>
<td><%=h user.send(column) %></td>
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index aea8c8e3b..b50d20cd1 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -15,8 +15,10 @@
<% end %>
</p>
-<p><%= link_to 'Edit', '../edit/' + @admin_user.id.to_s %>
-| <%= link_to 'Public page', main_url(user_url(@admin_user)) %></p>
+<p>
+ <%= link_to 'Public page', main_url(user_url(@admin_user)) %>
+ | <%= link_to 'Edit', '../edit/' + @admin_user.id.to_s %>
+</p>
<h2>Track things</h2>
diff --git a/todo.txt b/todo.txt
index 289b36a8b..0c88b4b4a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -6,18 +6,12 @@ Site move:
Next
====
-Grrr - so here I wanted to clarify my request, but don't want the timer to be reset!
-http://www.whatdotheyknow.com/request/online_petitions_documents_from#incoming-3248
-
Test: Check where followups are going to now
Test: Check new .zips are being indexed
"Then you will be emailed whenever 'Martin Stabe' requests something or gets a
response" doesn't word wrap in confirmation email, and no full stop.
-Reply links link to form rather than message, but don't actually work
-http://www.whatdotheyknow.com/request/4/response/866#show_response_followup
-
Email subjects badly escaped
Subject: Confirm you want to be emailed about requests to 'HM Revenue &amp; Customs'
@@ -46,8 +40,8 @@ Internal review status/marker?
http://www.whatdotheyknow.com/request/online_petitions_documents_from
(search for it!)
Request withdrawn by user status/marker?
-
-Do something about shared spreadsheet
+Grrr - so here I wanted to clarify my request, but don't want the timer to be reset!
+ http://www.whatdotheyknow.com/request/online_petitions_documents_from#incoming-3248
user/show.rhtml sidebar vs. generic sidebar? (ask Tommy)
There is grey on grey text in header? bad idea?
@@ -59,7 +53,6 @@ Clear out all the need admin attention requests
Clear out all the need classifying requests
Admin:
- Fix two things from Tony
Add accelerator keys e.g. save public body with S
Have internal links to different parts of request page
Somehow fold up the enormous pages on many admin pages
@@ -67,7 +60,6 @@ Admin:
Replace "deep" with admin_... URLs
-is_owning_user is wrong name
move stuff from request_controller_spec.rb to request_mailer_spec.rb
Remove get_last_response_event_id etc.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 02:40:46 +0000