Added content to browse front page and made some tweaks to layouts

app/controllers/feeds_controller.rb

@@ -4,6 +4,7 @@ class FeedsController < ApplicationController
   # GET /feeds.xml
   def index
     @feeds = Feed.roots
+    @screens = Screen.all
 
     respond_to do |format|
       format.html { } # index.html.erb

app/views/feeds/_browse_body.html.erb

@@ -1,3 +1,7 @@
+<div class="default-padding">
+  <h1><%= @feeds.count %> Feed<% if @feeds.count > 1 %>s<% end %></h1>
+</div>
+
 <ul class="SL">
   <% @feeds.each do |feed| %>
    <% if feed.approved_contents.size != 0 || (feed.pending_contents.size != 0 && feed.group.has_member?(current_user) ) %>
@@ -24,10 +28,12 @@
     <% end %>
   </li>
   <% end %>
-  <% if can? :create, Feed %>
-  <li>
-    <h3><%= link_to "+ #{t(:new_feed)}", new_feed_path %></h3>
-  </li>
-  <% end %>
 </ul>
+
 <div class="clear"></div>
+
+<% if can? :create, Feed %>
+  <div class="default-padding">
+    <%= link_to "#{t(:new_feed)}", new_feed_path, :class => "btn" %>
+  </div>
+<% end %>

app/views/feeds/index.html.erb

@@ -11,12 +11,44 @@
     </section>
   </div>
   <div class="span3">
+    <% if user_signed_in? %>
+    <section class="C">
+      <header class="C-header">
+        <h3>My Concerto</h3>
+      </header>
+      <div class="C-cont">
+        <div class="default-padding">
+          <p>You belong to these groups:</p>
+          <ul>
+          <% current_user.groups.each do |group| %>
+            <li><%= link_to group.name, group %></li>
+          <% end %>
+          </ul>
+          <div class="clearfix">
+            <%= link_to "New Feed", new_feed_path, :class => "btn" if can? :create, Feed %>
+          </div>
+        </div>
+        <div class="clear"></div>
+      </div>
+    </section>
+    <% end %>
+
     <section class="C">
       <header class="C-header">
         <h3>Network Vitals</h3>
       </header>
       <div class="C-cont">
-        <h2># Screens</h2>
+        <div class="default-padding">
+          <div class="clearfix">
+            <h2><%= @screens.count %> Screen<% if @screens.count > 1 %>s<% end %></h2>
+            <p># active&nbsp;&nbsp;&nbsp;&nbsp;# offline</p>
+            <%= link_to "View Screens List", screens_path, :class => "btn" %>
+          </div>
+          <br /><br />
+          <div class="clearfix">
+            <h2># New Submissions Today</h2>
+          </div>
+        </div>
         <div class="clear"></div>
       </div>
     </section>

app/views/groups/_show_body.html.erb

@@ -1,110 +1,105 @@
-<article>
-  <div class="default-padding">
-    <h2>Leaders</h2>
-
-    <table>
-      <tr>
-		    <th>Name</th>
-  			<th>Roles</th>
-  		</tr>
-
-      <% @group.memberships.leader.each do |membership| %>
-      <tr>
-        <td><%= membership.user.name %></td>
-
-        <td>
-          <% if can? :edit, membership %>
-            <%= form_for([@group, membership]) do |f| %>
-              <%= f.select :level, Membership::LEVELS %>
-              <%= f.submit %>
-            <% end %>
+<div class="row-fluid">
+  <div class="span2">
+    <div class="default-padding">
+      <% if @group.made_request?(current_user) %>
+        <% membership = Membership.where(:group_id => @group.id, :user_id => current_user.id).first %>
+        <p><b>You are currently a <%= membership.level_name %><%= " member" unless can? :edit, @group %> of this group.</b></p>
+        <% if @group.has_member?(current_user) %>
+          <%= link_to("Leave Group", group_membership_path(:group_id => @group.id, :id => membership.id), :method => :delete, :class => "btn") %>
+          <% if can? :edit, @group %>
+            <%= link_to 'Edit Group Details', edit_group_path(@group), :class => "btn" %>
           <% end %>
-        </td>
-      </tr>
+        <% end %>
+      <% else %>
+        <p><b>You are not currently in this group.</b></p>
+        <%= link_to("Join Group", group_memberships_path(:group_id => @group.id, :membership => {:user_id => current_user.id}), :method => :post, :class => "btn") %>
       <% end %>
-    </table>
-
-    <br /><br />
-
-    <h2>Other Members</h2>
+    </div>
+  </div>
+  <div class="span10">
+    <div class="default-padding">
+      <h2>Leaders</h2>
 
-    <table>
-      <tr>
-		    <th>Name</th>
-		  	<th>Roles</th>
-  		</tr>
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Roles</th>
+        </tr>
 
-      <% @group.memberships.regular.each do |membership| %>
-      <tr>
-        <td><%= membership.user.name %></td>
+        <% @group.memberships.leader.each do |membership| %>
+        <tr>
+          <td><%= membership.user.name %></td>
 
-        <td>
-          <% if can? :edit, membership %>
-            <%= form_for([@group, membership]) do |f| %>
-              <%= f.select :level, Membership::LEVELS %>
-              <%= f.submit %>
+          <td>
+            <% if can? :edit, membership %>
+              <%= form_for([@group, membership]) do |f| %>
+                <%= f.select :level, Membership::LEVELS %>
+                <%= f.submit %>
+              <% end %>
             <% end %>
-          <% end %>
-        </td>
-      </tr>
-      <% end %>
-
-    </table>
-
-    <% if can? :edit, @group %>
-      <b>Add Member</b>
-      <%= form_for([@group, @group.memberships.new]) do |f| %>
-        <%= f.collection_select :user_id, User.all - @group.all_users, :id, :name %>
-        <%= hidden_field_tag 'autoconfirm', true %>
-        <%= f.submit %>
-      <% end %>
+          </td>
+        </tr>
+        <% end %>
+      </table>
 
       <br /><br />
 
-      <h2>Pending Members</h2>
+      <h2>Other Members</h2>
 
       <table>
         <tr>
-  		    <th>Name</th>
-	  		  <th>Actions</th>
-  		  </tr>
+          <th>Name</th>
+          <th>Roles</th>
+        </tr>
 
-        <% @group.memberships.pending.each do |membership| %>
+        <% @group.memberships.regular.each do |membership| %>
         <tr>
           <td><%= membership.user.name %></td>
 
           <td>
-            <%= link_to "Approve", approve_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put, :class => "btn success" %>
-            <%= link_to "Deny", deny_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put, :class => "btn danger" %>
+            <% if can? :edit, membership %>
+              <%= form_for([@group, membership]) do |f| %>
+                <%= f.select :level, Membership::LEVELS %>
+                <%= f.submit %>
+              <% end %>
+            <% end %>
           </td>
         </tr>
         <% end %>
 
       </table>
-    <% end %>
-  </div>
 
-</article>
+      <% if can? :edit, @group %>
+        <b>Add Member</b>
+        <%= form_for([@group, @group.memberships.new]) do |f| %>
+          <%= f.collection_select :user_id, User.all - @group.all_users, :id, :name %>
+          <%= hidden_field_tag 'autoconfirm', true %>
+          <%= f.submit %>
+        <% end %>
 
-<% if user_signed_in? %>
-  <aside>
+        <br /><br />
 
-    <div>
-      <% if @group.made_request?(current_user) %>
-        <% membership = Membership.where(:group_id => @group.id, :user_id => current_user.id).first %>
-        <p><b>You are currently a <%= membership.level_name %><%= " member" unless can? :edit, @group %> of this group.</b></p>
-        <% if @group.has_member?(current_user) %>
-          <%= link_to("Leave Group", group_membership_path(:group_id => @group.id, :id => membership.id), :method => :delete, :class => "btn") %>
-          <% if can? :edit, @group %>
-            <%= link_to 'Edit Group Details', edit_group_path(@group), :class => "btn" %>
+        <h2>Pending Members</h2>
+
+        <table>
+          <tr>
+            <th>Name</th>
+            <th>Actions</th>
+          </tr>
+
+          <% @group.memberships.pending.each do |membership| %>
+          <tr>
+            <td><%= membership.user.name %></td>
+
+            <td>
+              <%= link_to "Approve", approve_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put, :class => "btn success" %>
+              <%= link_to "Deny", deny_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put, :class => "btn danger" %>
+            </td>
+          </tr>
           <% end %>
-        <% end %>
-      <% else %>
-        <p><b>You are not currently in this group.</b></p>
-        <%= link_to("Join Group", group_memberships_path(:group_id => @group.id, :membership => {:user_id => current_user.id}), :method => :post, :class => "btn") %>
+
+        </table>
       <% end %>
     </div>
-
-  </aside>
-<% end %>
-<div class="clear"></div>
+  </div>
+</div>

app/views/templates/new.html.erb

@@ -10,7 +10,7 @@
     <section class="C">
     	<header class="C-header" id="template-header">
     		<h1><%= @type.capitalize + " Template" %></h1>
-    	</header> 
+    	</header>
     	<div class="C-cont">
   			<% if @type == "create" %>
   			  <%= render 'create_form' %>

config/routes.rb

@@ -25,7 +25,7 @@
     :controllers => {
       :registrations => 'concerto_devise/registrations', 
       :sessions => 'concerto_devise/sessions' }
-      
+
   resources :users
 
   resources :media, :only => [:show]
@@ -129,14 +129,13 @@
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  root :to => "feeds#index"
-
   # This is the catch-all path we use for people who type /content when they
   # are semantically looking for all the feeds to show the content.  We put it
   # here at the bottom to avoid capturing any of the restful content paths.
   match 'content/' => 'feeds#index'
+  match 'browse/' => 'feeds#index'
+
+  root :to => 'feeds#index'
 
   # See how all your routes lay out with "rake routes"