Modified: trunk/app/views/networks/_members.rhtml (3174 => 3175)
--- trunk/app/views/networks/_members.rhtml 2012-10-29 08:32:41 UTC (rev 3174)
+++ trunk/app/views/networks/_members.rhtml 2012-11-02 15:15:56 UTC (rev 3175)
@@ -1,16 +1,17 @@
<% size ||= 100 -%>
+<% limit ||= nil %>
<% unless collection.empty? %>
+ <% orig_collection = collection %>
+ <% collection = collection[0...limit] if limit %>
+ <div id="hlist">
+ <ul id="members">
+ <% collection.each do |member| %>
+ <%= render :partial => "networks/member", :locals => { :member => member, :size => size } %>
+ <% end %>
+ </ul>
+ <%= "+ #{orig_collection.size - limit} others" if limit && orig_collection.size > limit %>
+ </div>
-<div id="hlist">
- <ul id="members">
- <% unless collection.empty? %>
- <% for member in collection %>
- <%= render :partial => "networks/member", :locals => { :member => member, :size => size } %>
- <% end %>
- <% end %>
- </ul>
-</div>
+ <div class="clearer"> </div>
-<div class="clearer"> </div>
-
<% end %>
\ No newline at end of file
Modified: trunk/app/views/networks/_table.rhtml (3174 => 3175)
--- trunk/app/views/networks/_table.rhtml 2012-10-29 08:32:41 UTC (rev 3174)
+++ trunk/app/views/networks/_table.rhtml 2012-11-02 15:15:56 UTC (rev 3175)
@@ -46,7 +46,7 @@
<% unless network.members.empty? -%>
<div class="desc" style="margin-top: 0.4em;">
<p style="font-size: 85%;"><b>Members (<%= network.members.length %>):</b></p>
- <div style="font-size: 77%;"><%= render :partial => "networks/members", :locals => { :collection => network.members(true), :size => 40 } %></div>
+ <div style="font-size: 77%;"><%= render :partial => "networks/members", :locals => { :collection => network.members(true), :size => 40, :limit => 6 } %></div>
</div>
<% end -%>
Modified: trunk/app/views/networks/show.rhtml (3174 => 3175)
--- trunk/app/views/networks/show.rhtml 2012-10-29 08:32:41 UTC (rev 3174)
+++ trunk/app/views/networks/show.rhtml 2012-11-02 15:15:56 UTC (rev 3175)
@@ -68,97 +68,96 @@
|
</div>
-<div class="contribution_left_box">
-
- <div class="box_simple" style="margin: 0 0 0.4em 0;">
- <% unless @network.description.nil? or @network.description.empty? %>
- <%= @network.description_html %>
- <% else %>
- <p><i>No description</i></p>
- <% end %>
- </div>
-
- <p>
- <b>Created at:</b>
- <%=datetime @network.created_at %>
- </p>
-
- <% unless @network.unique_name.nil? or @network.unique_name.empty? %>
- <p>
- <b>Unique name:</b>
- <%=h @network.unique_name %>
- </p>
- <% end %>
-
- <% if mine? @network %>
- <br/>
- <div class="box_currentuser_specific">
- <% if @network.open? %>
- You have set this Group to automatically accept all membership requests.
- <% elsif @network.membership_by_request? %>
- You have set this Group to require membership requests to be approved by a group administrator.
- <% else %>
- You have set this Group to be closed to membership requests unless invited by a group administrator.
- <% end %>
- </div>
- <% end %>
-
- <br/>
-
- <div class="contribution_section_box">
-<% address@hidden(true) -%>
-<% address@hidden() - admins -%>
- <p class="heading">
- Administrators
- <a name="group_members"></a>
- </p>
- <div>
- <%= render :partial => "networks/members", :locals => { :collection => admins, :size => 60 } %>
- </div>
- <p class="heading">
- Members
- </p>
- <div>
- <%= render :partial => "networks/members", :locals => { :collection => others, :size => 60 } %>
- </div>
- </div>
-
-</div>
+<div id="tabsContainer" class="tabsContainer"></div>
-<div class="contribution_right_box">
- <%= render :partial => "owner_box", :locals => { :network => @network } %>
- <%= render :partial => "statistics_box", :locals => { :network => @network, :items => @shared_items } %>
-
- <div class="contribution_section_box"> <!-- style="width: 130px; padding: 0.4em 0.8em; font-size: 93%;" -->
- <p>
- <b>
- This group has been credited
- <a href="" pluralize(@network.creditations.length, "time") -%></a>
- <a name="group_creditations"></a>
- </b>
- </p>
- </div>
-
- <%= render :partial => "tags/tags_box", :locals => { :taggable => @network,
- :owner_id => (@network.user_id),
- :add_path => tag_network_path(@network),
- :edit_path => edit_network_path(@network),
- :allow_edit => logged_in? ? @network.user_id == current_user.id : false } %>
-
- <%= render :partial => "announcements", :locals => { :group => @network, :count => 5 } -%>
-</div>
+<div class="tabContainer">
+ <div class="tabTitle">Overview</div>
+ <div class="tabContent">
+ <div class="contribution_left_box">
+ <div class="box_simple" style="margin: 0 0 0.4em 0;">
+ <% unless @network.description.nil? or @network.description.empty? %>
+ <%= @network.description_html %>
+ <% else %>
+ <p><i>No description</i></p>
+ <% end %>
+ </div>
-<div class="clearer"> </div>
+ <p>
+ <b>Created at:</b>
+ <%=datetime @network.created_at %>
+ </p>
-<br/>
+ <% unless @network.unique_name.nil? or @network.unique_name.empty? %>
+ <p>
+ <b>Unique name:</b>
+ <%=h @network.unique_name %>
+ </p>
+ <% end %>
-<div id="tabsContainer" class="tabsContainer"></div>
+ <a name="news"></a>
+ <h3>News</h3>
+ <%= render :partial => "layouts/news", :locals => { :collection => news(@network, true) } %>
+ </div>
+
+ <div class="contribution_right_box">
+ <%= render :partial => "owner_box", :locals => { :network => @network } %>
+ <%= render :partial => "statistics_box", :locals => { :network => @network, :items => @shared_items } %>
+
+ <div class="contribution_section_box"> <!-- style="width: 130px; padding: 0.4em 0.8em; font-size: 93%;" -->
+ <p>
+ <b>
+ This group has been credited
+ <a href="" pluralize(@network.creditations.length, "time") -%></a>
+ <a name="group_creditations"></a>
+ </b>
+ </p>
+ </div>
+
+ <%= render :partial => "tags/tags_box", :locals => { :taggable => @network,
+ :owner_id => (@network.user_id),
+ :add_path => tag_network_path(@network),
+ :edit_path => edit_network_path(@network),
+ :allow_edit => logged_in? ? @network.user_id == current_user.id : false } %>
+
+ <%= render :partial => "announcements", :locals => { :group => @network, :count => 5 } -%>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+</div>
+
<div class="tabContainer">
- <div class="tabTitle">News</div>
- <div class="tabContent">
- <a name="news"></a>
- <%= render :partial => "layouts/news", :locals => { :collection => news(@network, true) } %>
+ <div class="tabTitle">Members (<%= @network.members.size -%>)</div>
+ <div class="tabContent">
+ <a name="members"></a>
+ <div class="contribution_section_box">
+ <a name="group_members"></a>
+ <% owner = @network.owner -%>
+ <p class="heading">
+ Owner
+ </p>
+ <div>
+ <%= render :partial => "networks/members", :locals => { :collection => [owner], :size => 60 } %>
+ </div>
+ <% admins = @network.administrators(false)-%>
+ <% unless admins.empty? %>
+ <p class="heading">
+ Administrators
+ </p>
+ <div>
+ <%= render :partial => "networks/members", :locals => { :collection => admins, :size => 60 } %>
+ </div>
+ <% end %>
+ <% others = @network.members - admins - address@hidden -%>
+ <% unless others.empty? %>
+ <p class="heading">
+ Members
+ </p>
+ <div>
+ <%= render :partial => "networks/members", :locals => { :collection => others, :size => 60 } %>
+ </div>
+ <% end %>
+ </div>
</div>
</div>
@@ -190,8 +189,8 @@
<div class="tabContainer">
<div class="tabTitle">Creditations (<%= @network.creditations.length -%>)</div>
- <div class="tabContent">
-
+ <div class="tabContent">
+
<a name="creditations"></a>
<% unless (creditations = @network.creditations).empty? %>
<%= view_privileges_notice %>
@@ -208,45 +207,54 @@
</div>
<% if logged_in? && @network.administrator?(current_user.id) %>
-
+
<% memberships = @network.memberships_accepted %>
<div class="tabContainer">
<div class="tabTitle">Manage Memberships</div>
<div class="tabContent">
<a name="manage_memberships"></a>
+
+ <% if mine? @network %>
+ <br/>
+ <div class="box_currentuser_specific">
+ <strong>New member policy:</strong><br/>
+ <% if @network.open? %>
+ You have set this Group to automatically accept all membership requests.
+ <% elsif @network.membership_by_request? %>
+ You have set this Group to require membership requests to be approved by a group administrator.
+ <% else %>
+ You have set this Group to be closed to membership requests unless invited by a group administrator.
+ <% end %>
+ </div>
+ <% end %>
+
+ <h3>Members</h3>
<% unless memberships.empty? %>
<%= render :partial => "memberships/table", :locals => { :collection => memberships, :network => false } %>
<% else %>
<p><i>No additional members belong to this Group</i></p>
<% end %>
- </div>
- </div>
-
- <% requests = @network.memberships_requested %>
- <div class="tabContainer">
- <div class="tabTitle">Requests Pending (<%= @network.memberships_requested.length -%>)</div>
- <div class="tabContent">
+
<a name="requests_pending"></a>
+ <h3>Requests to join</h3>
+ <% requests = @network.memberships_requested %>
<% unless requests.empty? %>
<p></p>
<%= render :partial => "memberships/table", :locals => { :collection => requests, :network => false } %>
<% else %>
<p><i>No requests are pending for this Group</i></p>
<% end %>
- </div>
- </div>
-
- <% invited = @network.memberships_invited %>
- <div class="tabContainer">
- <div class="tabTitle">Invites Pending (<%= @network.memberships_invited.length -%>)</div>
- <div class="tabContent">
+
<a name="invites_pending"></a>
+ <h3>Invitations</h3>
+ <% invited = @network.memberships_invited %>
<% unless invited.empty? %>
<p></p>
<%= render :partial => "memberships/table", :locals => { :collection => invited, :network => false } %>
<% else %>
<p><i>No invites are pending for this Group</i></p>
<% end %>
+
</div>
</div>