app/views/families/_map.erb app/views/families/_map_link.erb @@ -5,11 +5,19 @@ <% end %> <% end %> +<% if @family.has_photo? %> + <% content_for :sidebar do %> + <%= render :partial => 'families/photo' %> + <% end %> +<% end %> + +<%= render :partial => 'map' %> + <h1><%=h @family.name %></h1> <p><%= number_to_phone @family.home_phone, :area_code => true %></p> -<p><%= @family.pretty_address %></p> +<p><%= @family.pretty_address %> <%= render :partial => 'families/map_link' %></p> <h2>People</h2> @@ -36,7 +44,7 @@ <p><em>No one in this family yet.</em></p> <% end %> -<p><%= link_to image_tag('add_small.gif', :alt => 'add person', :class => 'icon') + ' Add a person to this family.', +<p><%= link_to image_tag('add_small.gif', :alt => 'add person', :class => 'icon') + ' Create a new person in this family.', new_person_path(:family_id => @family) %></p> <%= javascript_include_tag 'dragdrop.js' %> app/views/families/show.html.erb @@ -1,12 +1,30 @@ -<ul> - <% @group.people_names_and_ids.each do |person| %> - <% if person and @logged_in.sees? person %> - <%= render :partial => 'people/link', :locals => {:person => person} %> - <% if @group.admin?(person, true) %>(admin)<% end %> +<table> + <% @group.people_names_and_ids.each do |person| %> + <% if person and @logged_in.sees? person %> + <tr> + <td> + <a href="<%= url_for person %>"> + <%= render :partial => 'people/thumbnail', :locals => {:person => person} %> + </a> + </td> + <td class="person"> + <%= link_to h(person.name), person %> + <% if @group.admin?(person, true) %><br />(admin)<% end %> <% if @logged_in.can_edit?(@group) and (person.email.to_s.empty? or !@group.get_options_for(person).get_email?) %> - <em>no mail</em> + <em><br />(no mail)</em> + <% end %> + + <% if person.birthday_soon? %><span class="small"> + <br/> + <%= image_tag('birthday.png', :alt => 'Birthday', :class => 'icon') %> + <%= person.birthday.strftime('%m/%d') %></span> + <% end %> + + + </span> + </td> + </tr> <% end %> - <br/> <% end %> - <% end %> -</ul> +</table> + app/views/groups/_people.erb @@ -10,13 +10,13 @@ </td> <td class="person"> <%= link_to h(person.name), person %> - <% if person.birthday_soon? %> + <% if person.birthday_soon? %><span class="small"> <br/> <%= image_tag('birthday.png', :alt => 'Birthday', :class => 'icon') %> - birthday <%= person.birthday.to_time.to_s :date rescue nil %> + <%= person.birthday.strftime('%m/%d') %></span> <% end %> </td> </tr> <% end %> </table> -<% end %> +<% end %> \ No newline at end of file app/views/people/_sidebar_people.erb @@ -372,13 +372,11 @@ p { h1 { font-size: 250%; - margin-bottom: 20px; + margin-bottom: 5px; line-height: 20pt; } -.below-h1 { - margin-top: -10px; -} + h2 { margin-top: 15px; @@ -806,8 +804,8 @@ h2.headline { } .user-type { - margin-top: -22px; - font-weight: bold; + font-weight: bold; + margin-top: -1px; } #banner { @@ -959,3 +957,12 @@ code { .errorExplanation h2 { color: red; } + +li.family-member{ + margin-bottom: 1px; +} + + +.small{ + font-size: 0.8em; +} \ No newline at end of file public/stylesheets/aqueouslight.css 259f8a6490a3efd86fe5e6a19b87ffc149aca567 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/372e6b9cdf2ad1f88b4307679db3c8c1e20bb0bf 372e6b9cdf2ad1f88b4307679db3c8c1e20bb0bf 2008-10-15T08:29:10-07:00 2008-10-15T06:14:00-07:00 Make family appear more consistent with site; other appearance improvements (Ben Hudson). 269e78ead74319b4a3e523884a3987b7927728c6 Tim Morgan tim@timmorgan.org