Built groups#show view for #69

app/assets/stylesheets/application/layout/forms.scss.erb

@@ -73,7 +73,7 @@ select,
   height: $baseline;
   padding: 4px;
   font-size: $basefont;
-  color: $gray;
+  color: $black;
   border: 1px solid #ccc;
   @include border-radius(3px);
 }

app/views/groups/_show_body.html.erb

@@ -0,0 +1,100 @@
+<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>
+
+        <! add logic to limit to group leaders -->
+        <td>
+          <%= form_for([@group, membership]) do |f| %>
+            <%= f.select :level, Membership::LEVELS %>
+            <%= f.submit %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </table>
+
+    <br /><br />
+
+    <h2>Other Members</h2>
+
+    <table>
+      <tr>
+		    <th>Name</th>
+		  	<th>Roles</th>
+  		</tr>
+
+      <% @group.memberships.regular.each do |membership| %>
+      <tr>
+        <td><%= membership.user.name %></td>
+
+        <! add logic to limit to group leaders -->
+        <td>
+          <%= form_for([@group, membership]) do |f| %>
+            <%= f.select :level, Membership::LEVELS %>
+            <%= f.submit %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+
+    </table>
+
+    <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 %>
+
+    <br /><br />
+
+    <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 %>
+
+    </table>
+  </div>
+
+</article>
+
+<aside>
+
+  <div>
+    <% if user_signed_in? & !@group.made_request?(current_user) %>
+      <%= link_to("Join Group", group_memberships_path(:group_id => @group.id, :membership => {:user_id => current_user.id}), :method => :post, :class => "btn large") %>
+    <% else %>
+      <p><b>You are currently a member of this group.</b></p>
+    <% end %>
+
+    <br />
+    <%= link_to 'Edit Group Details', edit_group_path(@group), :class => "btn" %>
+    <br /><br />
+  </div>
+
+</aside>
+
+<div class="clear"></div>

app/views/groups/_show_header.html.erb

@@ -0,0 +1,4 @@
+<h1>
+  <%= link_to "All User Groups", groups_path %> &gt; 
+  <%= @group.name %>
+</h1>

app/views/groups/show.html.erb

@@ -1,56 +1,8 @@
-<p>
-  <b>Name:</b>
-  <%= @group.name %>
-</p>
-<p>
-  <b>Leaders:</b>
-  <ul>
-  <% @group.memberships.leader.each do |membership| %>
-    <li>
-      <%= membership.user.name %> - 
-      <! add logic to limmit to group leaders -->
-      <%= form_for([@group, membership]) do |f| %>
-        <%= f.select :level, Membership::LEVELS %>
-        <%= f.submit %>
-      <% end %>
-    </li>
-  <% end %>
-  </ul>
-</p>
-<p>
-  <b>Members:</b>
-  <ul>
-  <% @group.memberships.regular.each do |membership| %>
-    <li>
-      <%= membership.user.name %> - <%= link_to "Destroy", [@group, membership], :confirm => 'Are you sure?', :method => :delete %>
-      <! add logic to limit to group leaders -->
-        <%= form_for([@group, membership]) do |f| %>
-          <%= f.select :level, Membership::LEVELS %>
-          <%= f.submit %>
-        <% end %>
-    </li>
-  <% end %>
-  </ul>
-</p>
-<p>
-  <b>Pending Members:</b>
-  <ul>
-  <% @group.memberships.pending.each do |membership| %>
-    <li>
-    <! add logic to limit to group leaders -->
-      <%= membership.user.name %> - <%= link_to "Aprove", approve_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put %>
-                                    <%= link_to "Deny", deny_group_membership_path(@group, membership), :confirm => 'Are you sure?', :method => :put %>
-    </li>
-  <% end %>
-  </ul>
-</p>
-<p>
-  <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 %>
-</p>
-<%= link_to 'Edit', edit_group_path(@group) %> |
-<%= link_to 'Back', groups_path %>
+<section class="C">
+  <header id="groups-header">
+    <%= render :partial => "groups/show_header" %>
+  </header>
+  <div id="groups-body" class="C-cont">
+    <%= render :partial => "groups/show_body" %>
+  </div>
+</section>