Diff
Modified: trunk/app/views/memberships/index.rhtml (2387 => 2388)
--- trunk/app/views/memberships/index.rhtml 2010-04-23 11:51:50 UTC (rev 2387)
+++ trunk/app/views/memberships/index.rhtml 2010-04-23 11:53:33 UTC (rev 2388)
@@ -1,152 +1,149 @@
<% if @user %>
- <% if my_page? @user.id %>
-
- <h1>My Memberships</h1>
+ <% if my_page? @user.id %>
- <% memberships = @user.networks_membership_requests_pending %>
- <div class="fold">
- <div class="foldTitle">
- <p>Pending requests sent by users who want to join your Groups <span style="color: red;">(<%= memberships.length %>)</span></p>
- <hr/>
- <small><%= memberships.length %> requires approval from you</small>
- </div>
- <div class="foldContent" style="display: none;">
- <div class="box_infotext">
- <p>These are the membership requests sent by users who want to join your groups.</p>
+ <h1>My Memberships</h1>
+
+ <% memberships = @user.networks_membership_requests_pending %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Pending requests sent by users who want to join your Groups <span style="color: red;">(<%= memberships.length %>)</span></p>
+ <hr/>
+ <small><%= memberships.length %> requires approval from you</small>
</div>
- <% unless memberships.empty? %>
- <%= render :partial => "memberships/table", :locals => { :collection => memberships } %>
- <% else %>
- <p><i>None</i></p>
- <% end %>
- </div>
- </div>
-
- <% memberships = @user.memberships_invited %>
- <div class="fold">
- <div class="foldTitle">
- <p>Pending invitations you have been sent from users to join their Groups <span style="color: red;">(<%= memberships.length %>)</span></p>
- <hr/>
- <small><%= memberships.length %> requires approval from you</small>
- </div>
- <div class="foldContent" style="display: none;">
- <% unless memberships.empty? %>
- <div class="box_infotext">
- <p>These are the membership invites you have been sent from users to join their groups.</p>
- <p>If the <b>Group</b> is taking a while, why not send the administrator a <%= link_to "message", messages_path %>?</p>
+ <div class="foldContent" style="display: none;">
+ <div class="box_infotext">
+ <p>These are the membership requests sent by users who want to join your groups.</p>
</div>
- <%= render :partial => "memberships/table", :locals => { :collection => memberships, :user => false } %>
- <% else %>
- <p><i>None</i></p>
- <% end %>
+ <% unless memberships.empty? %>
+ <%= render :partial => "memberships/table", :locals => { :collection => memberships } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ </div>
</div>
- </div>
-
- <% memberships = @user.memberships_requested %>
- <div class="fold">
- <div class="foldTitle">
- <p>Pending requests you have sent to users to join their Groups</p>
- <hr/>
- <small><%= memberships.length %> waiting approval from others</small>
- </div>
- <div class="foldContent" style="display: none;">
- <div class="box_infotext">
- <p>These are the membership requests you have sent to users to join their groups.</p>
- <p>If the <b>Group</b> is taking a while, why not send the administrator a <%= link_to "message", messages_path %>?</p>
+
+ <% memberships = @user.memberships_invited %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Pending invitations you have been sent from users to join their Groups <span style="color: red;">(<%= memberships.length %>)</span></p>
+ <hr/>
+ <small><%= memberships.length %> requires approval from you</small>
</div>
- <% unless memberships.empty? %>
- <%= render :partial => "memberships/table", :locals => { :collection => memberships, :user => false } %>
- <% else %>
- <p><i>None</i></p>
- <% end %>
+ <div class="foldContent" style="display: none;">
+ <% unless memberships.empty? %>
+ <div class="box_infotext">
+ <p>These are the membership invites you have been sent from users to join their groups.</p>
+ <p>If the <b>Group</b> is taking a while, why not send the administrator a <%= link_to "message", messages_path %>?</p>
+ </div>
+ <%= render :partial => "memberships/table", :locals => { :collection => memberships, :user => false } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ </div>
</div>
- </div>
-
- <% memberships = @user.networks_membership_invites_pending %>
- <div class="fold">
- <div class="foldTitle">
- <p>Pending invitations you have sent to users to join your Groups</p>
- <hr/>
- <small><%= memberships.length %> waiting approval from others</small>
- </div>
- <div class="foldContent" style="display: none;">
- <div class="box_infotext">
- <p>These are the membership invitations you have sent to users to join your groups.</p>
+
+ <% memberships = @user.memberships_requested %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Pending requests you have sent to users to join their Groups</p>
+ <hr/>
+ <small><%= memberships.length %> waiting approval from others</small>
</div>
+ <div class="foldContent" style="display: none;">
+ <div class="box_infotext">
+ <p>These are the membership requests you have sent to users to join their groups.</p>
+ <p>If the <b>Group</b> is taking a while, why not send the administrator a <%= link_to "message", messages_path %>?</p>
+ </div>
<% unless memberships.empty? %>
- <%= render :partial => "memberships/table", :locals => { :collection => memberships } %>
- <% else %>
+ <%= render :partial => "memberships/table", :locals => { :collection => memberships, :user => false } %>
+ <% else %>
<p><i>None</i></p>
<% end %>
+ </div>
</div>
- </div>
-
- <% groups = @user.networks_owned %>
- <div class="fold">
- <div class="foldTitle">
- <p>Groups you are the administrator of (i.e: your Groups)</p>
- <hr/>
- <small><%= groups.length %> groups</small>
- </div>
- <div class="foldContent" style="display: none;">
- <% unless groups.empty? %>
- <div class="box_infotext">
- <p>These are the groups that you are the administrator of.</p>
- <p>You can share Workflows and Files with them.</p>
+
+ <% memberships = @user.networks_membership_invites_pending %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Pending invitations you have sent to users to join your Groups</p>
+ <hr/>
+ <small><%= memberships.length %> waiting approval from others</small>
+ </div>
+ <div class="foldContent" style="display: none;">
+ <div class="box_infotext">
+ <p>These are the membership invitations you have sent to users to join your groups.</p>
</div>
- <%= render :partial => "networks/table", :locals => { :collection => groups } %>
- <% else %>
- <p><i>None</i></p>
- <% end %>
+ <% unless memberships.empty? %>
+ <%= render :partial => "memberships/table", :locals => { :collection => memberships } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ </div>
</div>
- </div>
-
- <% groups = @user.networks %>
- <div class="fold">
- <div class="foldTitle">
- <p>Other Groups you are a member of</p>
- <hr/>
- <small><%= groups.length %> groups</small>
- </div>
- <div class="foldContent" style="display: none;">
- <% unless groups.empty? %>
- <div class="box_infotext">
- <p>These are the other groups that you are a member of.</p>
- <p>You can share Workflows and Files with them.</p>
- </div>
- <%= render :partial => "networks/table", :locals => { :collection => groups } %>
- <% else %>
- <p><i>None</i></p>
- <% end %>
+
+ <% groups = @user.networks_owned %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Groups you are the administrator of (i.e: your Groups)</p>
+ <hr/>
+ <small><%= groups.length %> groups</small>
+ </div>
+ <div class="foldContent" style="display: none;">
+ <% unless groups.empty? %>
+ <div class="box_infotext">
+ <p>These are the groups that you are the administrator of.</p>
+ <p>You can share Workflows and Files with them.</p>
+ </div>
+ <%= render :partial => "networks/table", :locals => { :collection => groups } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ </div>
</div>
- </div>
-
- <% else %>
-
- <h1>Memberships for <%=name @user.id %></h1>
- <% unless @user.memberships.empty? %>
- <%= render :partial => "memberships/table", :locals => { :collection => @user.memberships, :user => false } %>
+
+ <% groups = @user.networks %>
+ <div class="fold">
+ <div class="foldTitle">
+ <p>Other Groups you are a member of</p>
+ <hr/>
+ <small><%= groups.length %> groups</small>
+ </div>
+ <div class="foldContent" style="display: none;">
+ <% unless groups.empty? %>
+ <div class="box_infotext">
+ <p>These are the other groups that you are a member of.</p>
+ <p>You can share Workflows and Files with them.</p>
+ </div>
+ <%= render :partial => "networks/table", :locals => { :collection => groups } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ </div>
+ </div>
+
<% else %>
- <p><i>None</i></p>
- <% end %>
-
- <% end %>
-<% else %>
+ <h1>Memberships for <%=name @user.id %></h1>
+ <% unless @user.memberships.empty? %>
+ <%= render :partial => "memberships/table", :locals => { :collection => @user.memberships, :user => false } %>
+ <% else %>
+ <p><i>None</i></p>
+ <% end %>
+ <% end %>
+
+<% else %>
<% if false %>
+ <h2>All Memberships</h2>
- <h2>All Memberships</h2>
+ <%= render :partial => "layouts/paginate", :locals => { :collection => @memberships } %>
- <%= render :partial => "layouts/paginate", :locals => { :collection => @memberships } %>
+ <%= render :partial => "memberships/table", :locals => { :collection => @memberships } %>
- <%= render :partial => "memberships/table", :locals => { :collection => @memberships } %>
+ <%= render :partial => "layouts/paginate", :locals => { :collection => @memberships } %>
- <%= render :partial => "layouts/paginate", :locals => { :collection => @memberships } %>
-
<% end %>
-
<% end %>
-<br />
\ No newline at end of file
+<br />
Modified: trunk/app/views/memberships/new.rhtml (2387 => 2388)
--- trunk/app/views/memberships/new.rhtml 2010-04-23 11:51:50 UTC (rev 2387)
+++ trunk/app/views/memberships/new.rhtml 2010-04-23 11:53:33 UTC (rev 2388)
@@ -3,28 +3,28 @@
<%= error_messages_for :membership %>
<% form_for(:membership, :url ="" user_memberships_path(params[:user_id]), :html => {:id => 'memb_request_form'}) do |f| %>
- <%= f.hidden_field :user_id, :value => current_user.id %>
-
+ <%= f.hidden_field :user_id, :value => current_user.id %>
+
<center>
- <div class="box_standout" style="line-height: 1.6; width: 400px;">
+ <div class="box_standout" style="line-height: 1.6; width: 400px;">
<% if params[:network_id] -%>
- <%= f.hidden_field :network_id, :value => @network.id %>
-
+ <%= f.hidden_field :network_id, :value => @network.id %>
+
<b>Send a request to join the group:</b>
<br/>
<%= link_to_function h(@network.title) + expand_image,
- visual_effect(:toggle_blind, "group_box", :duration => 0.3) -%>
- <br/>
- <small>(Administrator: <%= name @network.user_id -%>)</small>
- <% else -%>
- <b>Select group:</b><br/>
- <%= select_tag "membership[network_id]", options_from_collection_for_select(Network.find(:all, :order => "title ASC"), :id.to_i, :title), :style => "width: 360px; margin-top: 0.3em; margin-bottom: 0.5em" %>
- <% end -%>
+ visual_effect(:toggle_blind, "group_box", :duration => 0.3) -%>
+ <br/>
+ <small>(Administrator: <%= name @network.user_id -%>)</small>
+ <% else -%>
+ <b>Select group:</b><br/>
+ <%= select_tag "membership[network_id]", options_from_collection_for_select(Network.find(:all, :order => "title ASC"), :id.to_i, :title), :style => "width: 360px; margin-top: 0.3em; margin-bottom: 0.5em" %>
+ <% end -%>
</div>
</center>
-
+
<br/>
-
+
<center>
<div class="box_currentuser_specific" style="text-align: center; width: 400px; font-size: 93%; padding-bottom: 1em;">
<center>
@@ -32,7 +32,7 @@
<tr>
<td style="line-height: 2; text-align: left;">
<%= info_icon_with_tooltip("This message is optional: if you leave it blank, your request will be sent without it") %>
- <b>Message to group administrator:</b>
+ <b>Message to group administrator:</b>
<br/>
<%= text_area_tag "membership[message]", "", :rows => 4, :style => "width: 370px; font-size: 93%;" -%>
</td>
@@ -41,19 +41,19 @@
</center>
</div>
</center>
-
+
<br/>
-
+
<center>
<%= submit_tag "Send membership request", :id => "send", :style => 'width: 180px;', : "$('cancel').disabled=true;this.disabled=true;this.value='Sending your request...';this.form.submit();" %>
-
+
<% cancel_links_to = params[:network_id] ? url_for(:controller => 'networks', :action ="" 'show', :id => @network.id) : url_for(:controller => 'networks', :action ="" 'index') %>
<input type="submit" id="cancel" value="Return to Group" style="width: 180px" cancel_links_to -%>';return false;" />
</center>
-
+
<% if params[:network_id] -%>
<div id="group_box" style="display: none; margin-top: 3em;">
- <%= render :partial => "networks/table", :locals => { :collection => [ @network ] } %>
+ <%= render :partial => "networks/table", :locals => { :collection => [ @network ] } %>
</div>
<% end %>
Modified: trunk/app/views/memberships/show.rhtml (2387 => 2388)
--- trunk/app/views/memberships/show.rhtml 2010-04-23 11:51:50 UTC (rev 2387)
+++ trunk/app/views/memberships/show.rhtml 2010-04-23 11:53:33 UTC (rev 2388)
@@ -13,123 +13,116 @@
<% # UNDER DEVELOPMENT - SOON GROUP AVATARS WILL BE ADDED AND THERE WOULD BE NO NEED FOR THIS IF_ELSE_END BIT ALLTOGETHER %>
<% # THE CODE INSIDE THE BLOCK HAS DUPLICATED CHECK, BUT THAT WOULD BECOME THE ONLY ONE, ONCE THE OUTER IF IS REMOVED %>
<% if (@membership.is_invite? && !allow_approval) || (address@hidden && allow_approval) %>
- <td style="width: 15%; vertical-align: top;">
- <% if (@membership.is_invite? && !allow_approval) || (address@hidden && allow_approval) %>
- <%= render :partial => "users/avatar", :locals => { :user => @membership.user, :size => 80 } %>
+ <td style="width: 15%; vertical-align: top;">
+ <% if (@membership.is_invite? && !allow_approval) || (address@hidden && allow_approval) %>
+ <%= render :partial => "users/avatar", :locals => { :user => @membership.user, :size => 80 } %>
<br/>
- <% # = link_to_function h(@membership.user.name) + expand_image,
- visual_effect(:toggle_blind, "user_box", :duration => 0.3) -%>
+ <% # = link_to_function h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3) -%>
<% elsif (@membership.is_invite? && allow_approval) || (address@hidden && !allow_approval) %>
- <% #= avatar @membership.network, 80 # will start to work once the group avatars are introduced %>
- <% end %>
+ <% #= avatar @membership.network, 80 # will start to work once the group avatars are introduced %>
+ <% end %>
</td>
- <td style="line-height: 1.6; width: 85%;">
+ <td style="line-height: 1.6; width: 85%;">
<% else %>
- <td style="line-height: 1.6;">
+ <td style="line-height: 1.6;">
<% end %>
<% # END OF BLOCK UNDER DEVELOPMENT %>
<b>
<% if @membership.accepted? %>
- <% if current_user.id.to_i == @membership.user_id.to_i %>
- You are a member of:
+ <% if current_user.id.to_i == @membership.user_id.to_i %>
+ You are a member of:
<% else %>
- <%= link_to_function h(@membership.user.name) + expand_image,
- visual_effect(:toggle_blind, "user_box", :duration => 0.3) -%>
+ <%= link_to_function h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3) -%>
is a member of:
<% end %>
<% else %>
- <%= membership_invite_request_action_message(allow_approval, @membership.is_invite?, link_to_function(h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3)) ) -%>
+ <%= membership_invite_request_action_message(allow_approval, @membership.is_invite?, link_to_function(h(@membership.user.name) + expand_image, visual_effect(:toggle_blind, "user_box", :duration => 0.3)) ) -%>
<% end %>
</b>
<br/>
- <%= link_to_function h(@membership.network.title) + expand_image,
- visual_effect(:toggle_blind, 'group_box', :duration => 0.3) -%>
+ <%= link_to_function h(@membership.network.title) + expand_image,
+ visual_effect(:toggle_blind, 'group_box', :duration => 0.3) -%>
<br/>
-
- <p style="margin-top: 1.5em; color: #666666; font-size: 93%; text-align: center;">
- <b><%= @membership.is_invite? ? "Invited" : "Requested" %> at:</b><br/>
- <%=datetime @membership.created_at %>
- </p>
-
- <% if @membership.accepted? %>
- <p style="margin-top: 0.5em; color: #666666; font-size: 93%; text-align: center;">
- <b>Accepted at:</b>
- <br/>
- <%=datetime @membership.accepted_at %>
- </p>
- <% else %>
- <% if allow_approval && @membership.message %>
- <p style="margin-top: 1.5em; font-size: 93%; text-align: center;">
- <b>Message from <%= @membership.is_invite? ? "group admin" : "user" %>:</b><br/>
+
+ <p style="margin-top: 1.5em; color: #666666; font-size: 93%; text-align: center;">
+ <b><%= @membership.is_invite? ? "Invited" : "Requested" %> at:</b><br/>
+ <%=datetime @membership.created_at %>
+ </p>
+
+ <% if @membership.accepted? %>
+ <p style="margin-top: 0.5em; color: #666666; font-size: 93%; text-align: center;">
+ <b>Accepted at:</b>
+ <br/>
+ <%=datetime @membership.accepted_at %>
+ </p>
+ <% else %>
+ <% if allow_approval && @membership.message %>
+ <p style="margin-top: 1.5em; font-size: 93%; text-align: center;">
+ <b>Message from <%= @membership.is_invite? ? "group admin" : "user" %>:</b><br/>
</p>
-
+
<div style="padding: 0.3em 1em; border: 1px dotted #999999; background-color: #FFFFFF;">
<p style="font-size: 93%; text-align: center;">
- <%= white_list(simple_format(@membership.message)) -%>
- </p>
+ <%= white_list(simple_format(@membership.message)) -%>
+ </p>
</div>
<% end %>
<% end %>
-
</td>
</tr>
</table>
</div>
</center>
+<% unless @membership.accepted? %>
+ <br/>
+ <center>
+ <div class="box_currentuser_specific" style="width: 500px;">
+ <% if allow_approval %>
+ <p style="text-align: center; color: #990000; font-size: 108%;">
+ <b><i><%= pending_approval_message(allow_approval, @membership.is_invite?) -%></i></b>
+ </p>
+ <center>
+ <table>
+ <tr>
+ <td style="text-align: left;">
+ <%= info_icon_with_tooltip("Optional note to be sent to " + (@membership.is_invite? ? "group admin" : "user") + " along with your decision.<br/>(Delivered via internal messaging system.)<br/>Leave the field blank if you don't want to include any personal note in the message.") -%>
+ Response to <%= @membership.is_invite? ? "group admin" : "user" -%>:
+ <br/>
+ <%= text_area_tag "msg", "", :rows => 4, :style => "width: 480px; margin-top: 0.4em" -%>
+ </td>
+ </tr>
+ </table>
+ </center>
-<% unless @membership.accepted? %>
-<br/>
-<center>
- <div class="box_currentuser_specific" style="width: 500px;">
- <% if allow_approval %>
- <p style="text-align: center; color: #990000; font-size: 108%;">
- <b><i><%= pending_approval_message(allow_approval, @membership.is_invite?) -%></i></b>
- </p>
-
- <center>
- <table>
- <tr>
- <td style="text-align: left;">
- <%= info_icon_with_tooltip("Optional note to be sent to " + (@membership.is_invite? ? "group admin" : "user") + " along with your decision.<br/>(Delivered via internal messaging system.)<br/>Leave the field blank if you don't want to include any personal note in the message.") -%>
- Response to <%= @membership.is_invite? ? "group admin" : "user" -%>:
- <br/>
- <%= text_area_tag "msg", "", :rows => 4, :style => "width: 480px; margin-top: 0.4em" -%>
- </td>
- </tr>
- </table>
- </center>
-
-
- <!-- These forms serve as 'data senders' for Accept/Reject buttons -->
-
- <% form_tag(accept_membership_path(current_user.id, @membership)) do %>
- <%= hidden_field_tag "accept_msg", "" %>
- <% end %>
-
- <% form_tag(user_membership_path(@membership.user_id, @membership) + "?return_to=" + currentusers_things_url('groups'), :method => :delete) do %>
- <%= hidden_field_tag "reject_msg", "" %>
- <% end %>
-
- <!-- /forms -->
-
- <ul class="sectionIcons" style="margin-top: 1.5em;">
- <li><%= icon "confirm", "", "Accept", {: "$('accept_msg').value=$('msg').value; $('accept_msg').form.submit();return(false);"}, "Accept" %></li>
- <li><%= icon "reject", "", "Reject", {: "if(confirm('Are you sure?')) { $('reject_msg').value=$('msg').value; $('reject_msg').form.submit(); } return(false);"}, "Reject" %></li>
- </ul>
- <% else %>
- <p style="color: #990000; font-size: 108%; text-align: center;">
- <b><i><%= pending_approval_message(allow_approval, @membership.is_invite?) -%></i></b>
- </p>
- <% end %>
- </div>
-</center>
-<% end %>
+ <!-- These forms serve as 'data senders' for Accept/Reject buttons -->
+ <% form_tag(accept_membership_path(current_user.id, @membership)) do %>
+ <%= hidden_field_tag "accept_msg", "" %>
+ <% end %>
+ <% form_tag(user_membership_path(@membership.user_id, @membership) + "?return_to=" + currentusers_things_url('groups'), :method => :delete) do %>
+ <%= hidden_field_tag "reject_msg", "" %>
+ <% end %>
+
+ <!-- /forms -->
+
+ <ul class="sectionIcons" style="margin-top: 1.5em;">
+ <li><%= icon "confirm", "", "Accept", {: "$('accept_msg').value=$('msg').value; $('accept_msg').form.submit();return(false);"}, "Accept" %></li>
+ <li><%= icon "reject", "", "Reject", {: "if(confirm('Are you sure?')) { $('reject_msg').value=$('msg').value; $('reject_msg').form.submit(); } return(false);"}, "Reject" %></li>
+ </ul>
+ <% else %>
+ <p style="color: #990000; font-size: 108%; text-align: center;">
+ <b><i><%= pending_approval_message(allow_approval, @membership.is_invite?) -%></i></b>
+ </p>
+ <% end %>
+ </div>
+ </center>
+<% end %>
+
<div id="group_box" style="display: none; margin-top: 3em;">
- <br/>
+ <br/>
<%= render :partial => "networks/table", :locals => { :collection => [ @membership.network ] } %>
<a name="group_box"></a>
</div>