jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up note views

Browse Source 
* Make note deleted notice stand out more
* Use same note deleted notice on both note views
* Don't render notes as dtext
This commit is contained in:
Toks
2013-07-18 12:51:10 -04:00
parent d58721587e
commit ab0b935715
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/inline.css.scss
View File

@@ -33,3 +33,7 @@ span.key {
@include inline-block; @include inline-block;
@include border-radius(3px); @include border-radius(3px);
} }
span.inactive {
color: #AAA;
}

4
app/assets/stylesheets/specific/pools.css.scss
View File

@@ -44,10 +44,6 @@ div#c-pools {
height: 10em; height: 10em;
} }
span.inactive {
color: #AAA;
}
a.last-page { a.last-page {
color: #666; color: #666;
} }

7
app/views/note_versions/index.html.erb
View File

@@ -25,7 +25,12 @@
<td></td> <td></td>
<td><%= link_to note_version.post_id, post_path(note_version.post_id) %></td> <td><%= link_to note_version.post_id, post_path(note_version.post_id) %></td>
<td><%= link_to "#{note_version.note_id}.#{note_version.version}", note_versions_path(:search => {:note_id => note_version.note_id}) %></td> <td><%= link_to "#{note_version.note_id}.#{note_version.version}", note_versions_path(:search => {:note_id => note_version.note_id}) %></td>
<td><%= h(note_version.body) %> <% unless note_version.is_active? %>(deleted)<% end %></td> <td>
<%= h(note_version.body) %>
<% unless note_version.is_active? %>
<span class="inactive">(deleted)</span>
<% end %>
</td>
<% if CurrentUser.is_janitor? %> <% if CurrentUser.is_janitor? %>
<td> <td>
<%= note_version.updater_ip_addr %> <%= note_version.updater_ip_addr %>

9
app/views/notes/index_by_note.html.erb
View File

@@ -8,7 +8,6 @@
<th>Post</th> <th>Post</th>
<th>Created by</th> <th>Created by</th>
<th>Created at</th> <th>Created at</th>
<th>Active?</th>
<th>Body</th> <th>Body</th>
</tr> </tr>
</thead> </thead>
@@ -18,8 +17,12 @@
<td><%= link_to note.post_id, post_path(note.post_id) %></td> <td><%= link_to note.post_id, post_path(note.post_id) %></td>
<td><%= link_to_user note.creator %></td> <td><%= link_to_user note.creator %></td>
<td><%= compact_time(note.created_at) %></td> <td><%= compact_time(note.created_at) %></td>
<td><%= note.is_active? %></td> <td>
<td><%= format_text(note.body) %></td> <%= h(note.body) %>
<% unless note.is_active? %>
<span class="inactive">(deleted)</span>
<% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>