Moving memberships view to a partial

Rodrigo Souto
1 parent 87a67734
Showing 3 changed files with 37 additions and 40 deletions Show diff stats
app/views/memberships/index.rhtml
app/views/shared/_list_groups.html.erb
public/stylesheets/application.css
@@ -8,30 +8,6 @@
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
-<ul>
-<% for membership in @memberships %>
-  <li>
-    <div class='common-profile-list-block'>
-      <%= profile_image_link(membership, :portrait, 'div') %>
-    </div>
-    <span class='profile-details'>
-      <strong><%= membership.name %></strong><br/>
-      <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
-      <%= _('Type: %s') % getterm(membership.class.identification) %> <br/>
-      <%= _('Description: %s') % membership.description  + '<br/>' if membership.community? %>
-      <%= _('Members: %s') % membership.members_count.to_s %> <br/>
-      <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
-      <% button_bar do %>
-        <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
-        <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
-        <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
-          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
-        <% end %>
-      <% end %>
-    </span>
-    <br class="may-clear" />
-  </li>
-<% end %>
-</ul>
+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
 </div>
@@ -0,0 +1,26 @@
+<ul id="groups-list">
+<% for group in groups %>
+  <li>
+    <div class='common-profile-list-block'>
+      <%= profile_image_link(group, :portrait, 'div') %>
+    </div>
+    <span class='profile-details'>
+      <strong><%= group.name %></strong><br/>
+      <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+      <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
+      <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
+      <%= _('Members: %s') % group.members_count.to_s %> <br/>
+      <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
+      <% button_bar do %>
+        <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
+        <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
+          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
+        <% end %>
+      <% end %>
+    </span>
+    <br class="may-clear" />
+  </li>
+<% end %>
+</ul>
+
@@ -4264,56 +4264,51 @@ h1#agenda-title {
 /* ==> public/stylesheets/controller_memberships.css <== */
 /* @import url(profile-list-block.css); ==> BROKEN REFERENCE, OH MY! */
-.controller-memberships #memberships-index ul {
+#groups-list {
   width: 100%;
   padding: 0px;
   margin: 0px;
   display: block;
 }
-.controller-memberships #memberships-index li {
+#groups-list li {
   display: block;
   list-style: none;
   margin-bottom: 20px
   background-color: #B8CFE7;
 }
-.controller-memberships #memberships-index li .vcard {
+#groups-list li .vcard {
   float: right;
   padding: 5px;
   margin-bottom: 5px;
   margin-left: 10px;
 }
-.controller-memberships #memberships-index li .may-clear {
+#groups-list li .may-clear {
   clear: right;
 }
-.controller-memberships #memberships-index li .profile-details {
+#groups-list li .profile-details {
   display: block;
   padding: 3% 0px 0px 30px;
 }
-.controller-memberships .action_memberships_destroy_community .main-block u {
-  text-decoration: none;
-  border-bottom: 1px dotted red;
-}
-
-#memberships-index .menu-submenu {
+#groups-list .menu-submenu {
   bottom: 127px;
   right: -20px;
 }
-#memberships-index .menu-submenu li {
+#groups-list .menu-submenu li {
   border: 0;
   background: transparent;
 }
-.controller-memberships .button-bar {
+#groups-list .button-bar {
   clear: both;
 }
-.controller-memberships #memberships-index li .vcard a.profile_link.url,
-.controller-memberships #memberships-index li .vcard a.profile_link.url:hover {
+#groups-list li .vcard a.profile_link.url,
+#groups-list li .vcard a.profile_link.url:hover {
   background: transparent;
   border: 0;
   text-decoration: none;
	@@ -8,30 +8,6 @@		@@ -8,30 +8,6 @@
8	<%= button :back, _('Go back'), :controller => 'profile_editor' %>	8	<%= button :back, _('Go back'), :controller => 'profile_editor' %>
9	<% end %>	9	<% end %>
10		10
11	-<ul>
12	-<% for membership in @memberships %>
13	- <li>
14	- <div class='common-profile-list-block'>
15	- <%= profile_image_link(membership, :portrait, 'div') %>
16	- </div>
17	- <span class='profile-details'>
18	- <strong><%= membership.name %></strong><br/>
19	- <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
20	- <%= _('Type: %s') % getterm(membership.class.identification) %> <br/>
21	- <%= _('Description: %s') % membership.description + '<br/>' if membership.community? %>
22	- <%= _('Members: %s') % membership.members_count.to_s %> <br/>
23	- <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
24	- <% button_bar do %>
25	- <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
26	- <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
27	- <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
28	- <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
29	- <% end %>
30	- <% end %>
31	- </span>
32	- <br class="may-clear" />
33	- </li>
34	-<% end %>
35	-</ul>	11	+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
36		12
37	</div>	13	</div>
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+<ul id="groups-list">
	2	+<% for group in groups %>
	3	+ <li>
	4	+ <div class='common-profile-list-block'>
	5	+ <%= profile_image_link(group, :portrait, 'div') %>
	6	+ </div>
	7	+ <span class='profile-details'>
	8	+ <strong><%= group.name %></strong><br/>
	9	+ <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
	10	+ <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
	11	+ <%= _('Description: %s') % group.description + '<br/>' if group.community? %>
	12	+ <%= _('Members: %s') % group.members_count.to_s %> <br/>
	13	+ <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
	14	+ <% button_bar do %>
	15	+ <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
	16	+ <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
	17	+ <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
	18	+ <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
	19	+ <% end %>
	20	+ <% end %>
	21	+ </span>
	22	+ <br class="may-clear" />
	23	+ </li>
	24	+<% end %>
	25	+</ul>
	26	+