diff --git a/app/assets/stylesheets/common/inline.css.scss b/app/assets/stylesheets/common/inline.css.scss index 22c1b458f..1c6b20684 100644 --- a/app/assets/stylesheets/common/inline.css.scss +++ b/app/assets/stylesheets/common/inline.css.scss @@ -33,3 +33,7 @@ span.key { @include inline-block; @include border-radius(3px); } + +span.inactive { + color: #AAA; +} diff --git a/app/assets/stylesheets/specific/pools.css.scss b/app/assets/stylesheets/specific/pools.css.scss index 4d1fff9b4..abc8eb69e 100644 --- a/app/assets/stylesheets/specific/pools.css.scss +++ b/app/assets/stylesheets/specific/pools.css.scss @@ -44,10 +44,6 @@ div#c-pools { height: 10em; } - span.inactive { - color: #AAA; - } - a.last-page { color: #666; } diff --git a/app/views/note_versions/index.html.erb b/app/views/note_versions/index.html.erb index dc20624c1..9fa018031 100644 --- a/app/views/note_versions/index.html.erb +++ b/app/views/note_versions/index.html.erb @@ -25,7 +25,12 @@ <%= link_to note_version.post_id, post_path(note_version.post_id) %> <%= link_to "#{note_version.note_id}.#{note_version.version}", note_versions_path(:search => {:note_id => note_version.note_id}) %> - <%= h(note_version.body) %> <% unless note_version.is_active? %>(deleted)<% end %> + + <%= h(note_version.body) %> + <% unless note_version.is_active? %> + (deleted) + <% end %> + <% if CurrentUser.is_janitor? %> <%= note_version.updater_ip_addr %> diff --git a/app/views/notes/index_by_note.html.erb b/app/views/notes/index_by_note.html.erb index 571ba4d38..e21e17978 100644 --- a/app/views/notes/index_by_note.html.erb +++ b/app/views/notes/index_by_note.html.erb @@ -8,7 +8,6 @@ Post Created by Created at - Active? Body @@ -18,8 +17,12 @@ <%= link_to note.post_id, post_path(note.post_id) %> <%= link_to_user note.creator %> <%= compact_time(note.created_at) %> - <%= note.is_active? %> - <%= format_text(note.body) %> + + <%= h(note.body) %> + <% unless note.is_active? %> + (deleted) + <% end %> + <% end %>