aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/comment/_single_comment.rhtml18
-rw-r--r--public/stylesheets/main.css13
-rw-r--r--todo.txt16
3 files changed, 30 insertions, 17 deletions
diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml
index 9a59b6e83..b31d8f353 100644
--- a/app/views/comment/_single_comment.rhtml
+++ b/app/views/comment/_single_comment.rhtml
@@ -1,10 +1,16 @@
<div class="comment_in_request" id="comment-<%=comment.id.to_s%>">
- <p class="">
- On <%= simple_date(comment.created_at || Time.now) %>,
- <%= comment.user ? user_link(comment.user) : 'you' %> added an annotation:
- </p>
- <p>
- "<%= comment.get_body_for_html_display %>"
+ <h2>
+ Annotation by <%= comment.user ? user_link(comment.user) : 'you' %>
+ <br><br><%= simple_date(comment.created_at || Time.now) %>
+ </h2>
+ <div>
+ <%= comment.get_body_for_html_display %>
+ </div>
+ <p class="event_actions">
+ <% if !comment.id.nil? %>
+ <%= link_to "Link to this", comment_url(comment) %>
+ <!-- | <%= link_to "Report abuse", comment_url(comment) %> -->
+ <% end %>
</p>
</div>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 633191c7a..fe9800c09 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -637,6 +637,7 @@ div.correspondence
}
div.correspondence h2
{ text-align: right; font-size: 1em; }
+
.event_actions
{ text-align: right}
@@ -644,10 +645,16 @@ div.comment_in_request
{
width: 37em;
float: left;
- padding: 0em 0em 0em 0em;
- margin: 0 0 0 0;
+ padding: 0em 0.5em 0em 0.5em;
+ margin: 0 0 1em 0;
overflow: auto;
+ border-color: #5F5F5F;
+ border-width: 1px;
+ border-style: dotted;
}
+div.comment_in_request h2
+{ text-align: right; font-size: 1em; }
+
div#add_annotation
{
clear: both;
@@ -661,7 +668,7 @@ div[id|="incoming"] { background-color: #E7E7E7; font-family: Times New Roman, T
div[id|="incoming"] p { font-size: 1.08em;}
div[id|="comment"] { }
- div[id|="comment"] p { font-size: 1.00em;}
+ div[id|="comment"] p { font-size: 0.95;}
.correspondence_text { margin: 0 1.2em 0 0.8em; }
diff --git a/todo.txt b/todo.txt
index 0c88b4b4a..e36b37bac 100644
--- a/todo.txt
+++ b/todo.txt
@@ -22,12 +22,16 @@ Search for other extensions that we have now
Comments interleaved with body
- Annotation thing too far down when much sidebar e.g. http://localhost:3000/request/heya#outgoing-199
+ - Put classification box above annotation one?
- Test spell checker
- Flag bad comments
- Delete comments from admin interface
- Check annotation email alerts are working (e.g. when subscribed to a request)
+ - Show them on user page
+ - Show them on public body pages
+
http://www.whatdotheyknow.com/request/communications_about_whatdotheyk
Mask all emails from binary attachments
@@ -53,15 +57,8 @@ Clear out all the need admin attention requests
Clear out all the need classifying requests
Admin:
- 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
- Make it easy to go from pages to admin page (perhaps via link as in PB?)
-
-Replace "deep" with admin_... URLs
-
-move stuff from request_controller_spec.rb to request_mailer_spec.rb
-Remove get_last_response_event_id etc.
Later
=====
@@ -207,6 +204,7 @@ Quoting fixing TODO:
http://www.whatdotheyknow.com/request/list_of_public_space_cctv_instal#incoming-2164
http://www.whatdotheyknow.com/request/errors_in_list_of_postbox_locati#incoming-2272
http://localhost:3000/request/cctv_data_retention_and_use#incoming-2093
+ http://www.whatdotheyknow.com/request/stasi_activity_at_climate_camp#incoming-3362
http://www.whatdotheyknow.com/request/public_inspection_periods_for_lo_2#outgoing-1707 # square bracket in link
@@ -238,7 +236,9 @@ Use spelling correction for public bodies search (in addition to substring?)
Editable user profile, including photo upload
-Show documents inline (word docs etc.)
+HTML versions of all attachments, so links like in GMail
+ Somthing.doc
+ 20K View as HTML Open as a Google document Download
Julian's PDF excerpting thing for highlighting paragraphs
and convert Word Docs to PDFs too