muck-friends 0.1.1 → 0.1.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-friends
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -06:00
+date: 2009-07-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,10 +65,10 @@ files:
 - app/views/friend_mailer/follow.text.plain.erb
 - app/views/friend_mailer/friend_request.text.html.erb
 - app/views/friend_mailer/friend_request.text.plain.erb
+- app/views/friends/_all_friends.html.erb
+- app/views/friends/_friend_requests.html.erb
 - app/views/friends/_friend_simple.html.erb
-- app/views/friends/_friends.html.erb
-- app/views/friends/_notifications.html.erb
-- app/views/friends/friend_or_follow_request.html.erb
+- app/views/friends/_mutual_friends.html.erb
 - app/views/friends/index.html.erb
 - config/muck_friends_routes.rb
 - db/migrate/20090608073052_create_friends.rb
@@ -136,9 +136,15 @@ files:
 - test/rails_root/app/models/.keep
 - test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/friend.rb
+- test/rails_root/app/models/profile.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
-- test/rails_root/app/views/default/index.html.erb
+- test/rails_root/app/views/default/all_friends.html.erb
+- test/rails_root/app/views/default/followers.html.erb
+- test/rails_root/app/views/default/followings.html.erb
+- test/rails_root/app/views/default/friend_requests.html.erb
+- test/rails_root/app/views/default/friends.html.erb
+- test/rails_root/app/views/default/mutual_friends.html.erb
 - test/rails_root/app/views/layouts/default.html.erb
 - test/rails_root/config/amazon_s3.yml
 - test/rails_root/config/boot.rb
@@ -156,6 +162,7 @@ files:
 - test/rails_root/db/.keep
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
 - test/rails_root/db/migrate/20090402033319_add_muck_activities.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/db/migrate/20090608073052_create_friends.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
@@ -317,6 +324,7 @@ files:
 - test/rails_root/script/server
 - test/rails_root/test/factories.rb
 - test/rails_root/test/functional/.keep
+- test/rails_root/test/functional/default_controller_test.rb
 - test/rails_root/test/functional/friends_controller_test.rb
 - test/rails_root/test/integration/.keep
 - test/rails_root/test/mocks/development/.keep
@@ -376,6 +384,7 @@ test_files:
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/friend.rb
+- test/rails_root/app/models/profile.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/config/boot.rb
@@ -390,6 +399,7 @@ test_files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
 - test/rails_root/db/migrate/20090402033319_add_muck_activities.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/db/migrate/20090608073052_create_friends.rb
 - test/rails_root/db/schema.rb
@@ -398,6 +408,7 @@ test_files:
 - test/rails_root/public/dispatch.rb
 - test/rails_root/script/create_project.rb
 - test/rails_root/test/factories.rb
+- test/rails_root/test/functional/default_controller_test.rb
 - test/rails_root/test/functional/friends_controller_test.rb
 - test/rails_root/test/shoulda_macros/controller.rb
 - test/rails_root/test/shoulda_macros/forms.rb

data/app/views/friends/_friends.html.erb

@@ -1,8 +0,0 @@
-<h2>Friends</h2>
-<%= friends(user) %>
-<% if GlobalConfig.allow_following -%>
-  <h2>Followers</h2>
-  <%= followers(user) %>  
-  <h2>Following</h2>
-  <%= followings(user) %>
-<% end -%>

data/app/views/friends/_notifications.html.erb

@@ -1,32 +0,0 @@
-<div id="decline_request_to_join" class="hidden">
-	<%= render :partial => 'messages/decline', :locals => {:hide_header => true} %>
-</div>
-<% if !(@user.followers.empty? && @user.unread_messages.empty? && @user.pledge_requests.empty?) %>
-  <div id="notifications" class="activity_box">
-  	<h2><%= _('Notifications') %></h2>
-	  <ul>
-			<% if !GlobalConfig.allow_following -%>
-	    	<% @user.followers.each do |follower| %>
-		      <li>
-				<%= _("%{profile} requests to be your Friend %{accept} %{ignore}") % {:profile => link_to(h(follower.full_name), profile_path(follower)), 
-					:accept => accept_follower_link(current_user, follower),
-					:ignore => ignore_friend_request_link(current_user, follower) } -%></li>
-	      <% end %>
-			<% end %>
-	    <% @user.pledge_requests.each do |pledge| %>
-	      <li><%= _("%{profile} requests to join %{group_link} group %{admin_links}") % {
-				:profile => link_to(h(pledge.full_name), profile_path(pledge)), 
-				:group_link => link_to(h(pledge.group_name), group_path(pledge.url_key)),
-				:admin_links => pledge_admin_links(pledge) } -%>
-				</li>
-      <% end %>
-	  </ul>
-  </div>
-<% end %>
-<script type="text/javascript" language="JavaScript">
-jQuery(document).ready(function(){
-	jQuery(".notification-link").click(function(){
-		jQuery(this).parent().parent().fadeOut();
-  });
-});
-</script>

data/app/views/friends/friend_or_follow_request.html.erb

@@ -1,8 +0,0 @@
-<% if !GlobalConfig.allow_following -%>
-	<% @user.followers.each do |follower| %>
-    <li>
-	<%= _("%{profile} requests to be your Friend %{accept} %{ignore}") % {:profile => link_to(h(follower.full_name), profile_path(follower)), 
-		:accept => accept_follower_link(current_user, follower),
-		:ignore => ignore_friend_request_link(current_user, follower) } -%></li>
-  <% end %>
-<% end %>