Closes #111 and optimized #108

concerto · Jun 14, 2012 · e9b6a7a · e9b6a7a
1 parent 1c3b8c4
commit e9b6a7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/views/feeds/_browse_body.html.erb b/app/views/feeds/_browse_body.html.erb
@@ -1,7 +1,7 @@
 <article>
 <ul class="SL">
   <% @feeds.each do |feed| %>
-    <% unless feed.approved_contents.count == 0 %>
+    <% unless feed.approved_contents.size == 0 %>
       <li>
       <h3>
         <%= link_to feed_submissions_path(feed), :remote => true, :class => "link-hl" do %>

diff --git a/app/views/users/_show_body.html.erb b/app/views/users/_show_body.html.erb
@@ -11,7 +11,7 @@
 
         <% @user.memberships.each do |membership| %>
           <tr>
-            <td><%= membership.group.name %></td>
+            <td><%= link_to membership.group.name, membership.group%></td>
 
             <td>
               <%= form_for([membership.group, membership]) do |f| %>
@@ -38,7 +38,7 @@
 
         <% @user.screens.each do |screen| %>
           <tr>
-            <td><%= screen.name %></td>
+            <td><%= link_to screen.name, screen %></td>
             <td><%= screen.location %></td>
             <td><%= screen.width %> X <%= screen.height %></td>
           </tr>
@@ -49,7 +49,7 @@
     <% end %>
 
     <% Group.joins(:screens, :users).where(:users => {:id => @user}).group('groups.id').each do |group| %>
-      <h2><%= group.name %>'s Screens</h2>
+      <h2><%= link_to group.name, group %>'s Screens</h2>
 
       <table>
         <tr>
@@ -60,7 +60,7 @@
 
         <% group.screens.each do |screen| %>
           <tr>
-            <td><%= screen.name %></td>
+            <td><%= link_to screen.name, screen %></td>
             <td><%= screen.location %></td>
             <td><%= screen.width %> X <%= screen.height %></td>
           </tr>
@@ -81,9 +81,9 @@
 
       <% @user.contents.each do |content| %>
         <tr>
-          <td><%= content.name %></td>
+          <td><%= link_to content.name, content %></td>
           <td><%= content.type %></td>
-          <td><%= content.start_time %> - <%= content.end_time %></td>
+          <td><%= content.start_time.strftime("%B %d at %I:%M%p %Z") %> - <%= content.end_time.strftime("%B %d at %I:%M%p %Z") %></td>
         </tr>
         <% end %>
       </table>