Permalink
Browse files

Improve styling of the per-user notes list view

  • Loading branch information...
1 parent 2ef58f4 commit 9d3b419aad3069db13fc0169049a30fbc2b2a288 @tomhughes committed Feb 2, 2013
@@ -1642,6 +1642,22 @@ a.button.submit {
}
}
+/* Rules for the user notes list */
+
+.note_list {
+ tr.creator {
+ background-color: #eeeeee;
+ }
+
+ td {
+ padding: 3px;
+ }
+
+ p {
+ margin-bottom: 0px;
+ }
+}
+
/* Rules for the notes interface */
.note {
@@ -236,7 +236,7 @@ def mine
if @this_user = User.active.find_by_display_name(params[:display_name])
@title = t 'note.mine.title', :user => @this_user.display_name
@heading = t 'note.mine.heading', :user => @this_user.display_name
- @description = t 'note.mine.description', :user => render_to_string(:partial => "user", :object => @this_user)
+ @description = t 'note.mine.subheading', :user => render_to_string(:partial => "user", :object => @this_user)
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @this_user.notes.order("updated_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
@@ -8,6 +8,10 @@ def note_event(at, by)
end
def note_author(author, link_options = {})
- link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
+ if author.nil?
+ ""
+ else
+ link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
+ end
end
end
@@ -1,19 +1,21 @@
-<h1><%= @heading %></h1>
-<p><%= raw @description %></p>
+<% content_for :heading do %>
+ <h2><%= @heading %></h2>
+ <p><%= raw @description %></p>
+<% end %>
<%= render :partial => 'notes_paging_nav' %>
-<table id="note_list" cellpadding="3">
+<table class="note_list">
<tr>
<th></th>
<th><%= t'note.mine.id' %></th>
- <th><%= t'changeset.changesets.user' %></th>
- <th><%= t'changeset.changesets.comment' %></th>
- <th><%= t'changeset.changesets.saved_at' %></th>
+ <th><%= t'note.mine.creator' %></th>
+ <th><%= t'note.mine.description' %></th>
+ <th><%= t'note.mine.created_at' %></th>
<th><%= t'note.mine.last_changed' %></th>
</tr>
<% @notes.each do |note| -%>
- <tr<% if note.author != @user2 %> bgcolor="#EEEEEE"<% end %>>
+ <tr<% if note.author != @user2 %> class="creator"<% end %>>
<td>
<% if note.status == "closed" %>
<%= image_tag("closed_note_marker.png", :alt => 'closed') %>
@@ -22,14 +24,10 @@
<% end %>
</td>
<td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
- <% if note.author.nil? %>
- <td></td>
- <% else %>
- <td><%= link_to h(note.author.display_name), user_url(:display_name => note.author.display_name) %></td>
- <% end %>
- <td> <%= note.comments.first.body.to_html %> </td>
- <td><%= l note.created_at %></td>
- <td><%= l note.updated_at %></td>
+ <td><%= note_author(note.author) %></td>
+ <td><%= note.comments.first.body.to_html %></td>
+ <td><%= friendly_date(note.created_at) %></td>
+ <td><%= friendly_date(note.updated_at) %></td>
</tr>
<% end -%>
</table>
View
@@ -1998,8 +1998,11 @@ en:
mine:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s notes"
- description: "Notes submitted or commented on by %{user}"
+ subheading: "Notes submitted or commented on by %{user}"
id: "Id"
+ creator: "Creator"
+ description: "Description"
+ created_at: "Created at"
last_changed: "Last changed"
javascripts:
map:

0 comments on commit 9d3b419

Please sign in to comment.