diff options
| -rw-r--r-- | app/views/comment/_comment_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/comment/preview.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 10 | ||||
| -rw-r--r-- | todo.txt | 9 |
4 files changed, 7 insertions, 20 deletions
diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml index 9b2f251cb..434a3ac3b 100644 --- a/app/views/comment/_comment_form.rhtml +++ b/app/views/comment/_comment_form.rhtml @@ -8,7 +8,7 @@ </p> <p> - Don't bother posting up nonsense (<a href="/help/about#moderation">like what sort of nonsense?</a>). + Don't bother annotating with nonsense (<a href="/help/about#moderation">like what sort of nonsense?</a>). </p> <p> diff --git a/app/views/comment/preview.rhtml b/app/views/comment/preview.rhtml index 39f99e889..a724d9117 100644 --- a/app/views/comment/preview.rhtml +++ b/app/views/comment/preview.rhtml @@ -4,15 +4,13 @@ <h1>Now preview your annotation</h1> - <p class="comment_in_request"> - <%= @comment.get_body_for_html_display %> - <%= f.hidden_field(:body) %> - </p> + <%= render :partial => 'comment/single_comment', :locals => { :comment => @comment } %> <p> Your name and annotation will appear in <strong>search engines</strong>. <p> + <%= f.hidden_field(:body) %> <%= hidden_field_tag(:submitted_comment, 1) %> <%= hidden_field_tag(:preview, 0 ) %> <%= submit_tag "Re-edit this annotation", :name => 'reedit' %> diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 2d166b636..e71020312 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -70,15 +70,7 @@ elsif info_request_event.event_type == 'sent' || info_request_event.event_type = <% elsif info_request_event.event_type == 'comment' comment = info_request_event.comment %> - <div class="comment_in_request" id="comment-<%=comment.id.to_s%>"> - <p class=""> - On <%= simple_date(info_request_event.created_at) %>, - <%= user_link(comment.user) %> added an annotation: - </p> - <p> - "<%= comment.get_body_for_html_display %>" - </p> - </div> + <%= render :partial => 'comment/single_comment', :locals => { :comment => comment } %> <% end @@ -27,17 +27,14 @@ doing file RESPONSE/Internal documents/Briefing with Contact Islington/Contact I Search for other extensions that we have now Comments interleaved with body - - Improve display of preview, is rubbish - - "Add an annotation" text appears in sidebar :( + - Check CSS class/id names used in all comment HTML + - Annotation thing too far down when much sidebar e.g. http://localhost:3000/request/heya#outgoing-199 - Email people when comments on their own request - Email people when responses to their own comment, or warn them they need to sign up - - Check CSS class/id names used in all comment HTML - - Think about the "nonsense" text a lot more - - Test spell checker - - List all comments in admin interface? and/or flag bad comments + - Flag bad comments - Delete comments from admin interface - Check annotation email alerts are working (e.g. when subscribed to a request) |