muck-services 3.1.1 → 3.2.0

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.2.0

data/app/controllers/muck/identity_feeds_controller.rb

@@ -22,43 +22,51 @@ class Muck::IdentityFeedsController < ApplicationController
     @feed = Feed.new
     respond_to do |format|
       format.html { render :template => 'identity_feeds/new' }
-      format.pjs { render :text => get_new_html(@service, @parent, @feed) }
+      format.js { render :template => 'identity_feeds/new', :layout => false }
+      format.pjs { render :template => 'identity_feeds/new', :layout => false }
     end
   end
   
   def create
     @service = Service.find(params[:service_id])
+    
     if !params[:uri].blank?
-      @feed = Feed.new(:uri => params[:uri], :login => params[:username])
-      feeds = Service.create_tag_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
+      uri = params[:uri]
+    elsif !@service.uri_data_template.blank? && params[:username]
+      uri = @service.uri_data_template
+    else
+      uri = nil
+    end 
+      
+    if uri
+      @feed = Feed.new(:uri => uri, :login => params[:username])
+      feeds = Service.create_tag_feeds_for_service(@service, uri, params[:username], params[:password], current_user.id)
       if feeds.blank?
-        success = false
+        @success = false
         if params[:username]
-          message = I18n.t('muck.services.no_feeds_from_username')
+          @message = I18n.t('muck.services.no_feeds_from_username')
         else
-          message = I18n.t('muck.services.no_feeds_at_uri')
+          @message = I18n.t('muck.services.no_feeds_at_uri')
         end
       else
-        success, messages = add_feeds_to_parent(@parent, feeds)
-        message = messages.join('<br />')
+        @success, messages = add_feeds_to_parent(@parent, feeds)
+        @message = messages.join('<br />')
       end
     else
-      success = false
-      message = I18n.t('muck.services.please_specify_url')
+      @success = false
+      @message = I18n.t('muck.services.please_specify_url')
     end
     
+    @user_services = @parent.identity_feeds.find(:all, :include => [{:feed => :service}]) if @success
+    
     respond_to do |format|
       format.html do
-        flash[:notice] = message if message
+        flash[:notice] = @message.html_safe if @message
         redirect_to polymorphic_url([@parent, :identity_feeds]) 
       end
-      format.pjs do
-        flash[:notice] = message if message
-        render :template => 'identity_feeds/new', :layout => false
-      end
-      format.json do
-        render :json => {:parent => @parent, :service => @service, :feeds => feeds, :success => success, :message => message }.as_json
-      end
+      format.pjs  { render :template => 'identity_feeds/create', :layout => false }
+      format.js   { render :template => 'identity_feeds/create', :layout => false }
+      format.json { render :json => {:parent => @parent, :service => @service, :feeds => feeds, :success => @success, :message => @message }.as_json }
     end
   end
   
@@ -82,11 +90,8 @@ class Muck::IdentityFeedsController < ApplicationController
         flash[:notice] = t("muck.services.identity_feed_removed")
         redirect_to polymorphic_url([@identity_feed.ownable, :identity_feeds]) 
       end
-      format.js do
-        render(:update) do |page|
-          page << "jQuery('##{@identity_feed.dom_id}').fadeOut();"
-        end
-      end
+      format.js { render :template => 'identity_feeds/destroy', :layout => false }
+      format.pjs { render :template => 'identity_feeds/destroy', :layout => false }
       format.json do
         render :json => { :success => true,
                           :identity_feed => @identity_feed,
@@ -122,10 +127,6 @@ class Muck::IdentityFeedsController < ApplicationController
       @parent.can_edit?(current_user)
     end
     
-    def get_new_html(service, parent, feed)
-      render_to_string(:partial => 'identity_feeds/form', :locals => { :service => service, :parent => parent, :feed => feed })
-    end
-    
     def get_edit_html(identity_feed)
       render_to_string(:partial => 'identity_feeds/form', :locals => { :service => identity_feed.feed.service, :parent => identity_feed.ownable, :feed => identity_feed.feed })
     end

data/app/helpers/muck_services_service_helper.rb

@@ -71,12 +71,19 @@ module MuckServicesServiceHelper
     service_link(path, identity_feed.feed.service, link_css, wrapper, link_text)
   end
   
+  # Renders a link with an icon and text
   def service_external_link(identity_feed, link_css = nil, wrapper = nil)
     path = identity_feed.feed.display_uri || identity_feed.feed.uri
     link_text = identity_feed.feed.title unless identity_feed.feed.title.blank?
     service_link(path, identity_feed.feed.service, link_css, wrapper, link_text, 'blank')
   end
   
+  # Render a link with an icon an no text
+  def service_external_icon_link(identity_feed, link_css = nil, wrapper = nil, target = 'blank', id = nil)
+    path = identity_feed.feed.display_uri || identity_feed.feed.uri
+    service_icon_link(path, identity_feed.feed.service, link_css, wrapper, target, id)
+  end
+  
   # Renders a delete button for an identity_feed
   def service_delete(identity_feed, button_type = :button, button_text = t("muck.general.delete"))
     render(:partial => 'shared/delete', :locals => { :delete_object => identity_feed, 
@@ -96,6 +103,21 @@ module MuckServicesServiceHelper
     end
   end
   
+  # Renders a service link optionally wrapping it in the specified element
+  def service_icon_link(path, service, link_css, wrapper, target = nil, id = nil)
+    if service.respond_to?(:icon)
+      service_name = service.icon
+    else
+      service_name = "#{service}.png"
+    end
+    link = %Q{<a #{'id=' + id if id} href="#{path}" #{'target=' + target if target} class="service-link #{link_css}">#{service_icon(service_name, 16, service.name)}</a>}.html_safe
+    if wrapper
+      content_tag(wrapper, link, :class => 'identity-service').html_safe
+    else
+      link
+    end
+  end
+    
   def url_by_identity_feed(owner, identity_feed, service)
     if identity_feed
       polymorphic_url([owner, identity_feed], :service_id => service.to_param).html_safe

data/app/models/service.rb

@@ -156,7 +156,7 @@ class Service < ActiveRecord::Base
   # creates a feed for a service with a username and optional password
   def self.create_tag_feeds_for_service(service, uri, username, password, contributor)
     uris = service.generate_uris(username, password, uri)
-    uris.collect{ |u| Feed.find_or_create(u.url, u.title, username, password, service.id, contributor) } if uris
+    uris.collect{ |u| Feed.find_or_create(u.url, u.title, username, password, service.id, contributor, u.human_url) } if uris
   end
 
   def self.build_photo_feeds(terms, user, service_ids = nil, refresh_services = false)

data/app/views/identity_feeds/_form.erb

@@ -1,5 +1,6 @@
+<div id="identity-feed-message"></div>
 <div id="identity-feed">
-  <%= form_for(:feed, :url => url_by_identity_feed(parent, @identity_feed, service)) do |f| -%>
+  <%= form_for(:feed, :url => url_by_identity_feed(parent, @identity_feed, service), :html => { :class => 'add-identity' } ) do |f| -%>
     <%= service_title(service) %>
     <% if service.template.blank? -%>
       <% if service.uri_data_template.blank? -%>
@@ -11,10 +12,15 @@
       <%= render :partial => "service_templates/#{service.template}", :locals => { :service => service, :feed => feed } -%>
     <% end -%>
     <div class="button form-row">
-      <%= f.submit t('muck.services.import_service', :service => service.name), :id => 'submit_feed', :onclick => "jQuery('#submit_feed').hide();jQuery('#finding_uri_message').show();" %>
-      <span id="finding_uri_message" style="display:none;">
-        <%= t('muck.services.submitting_feed_message') %><img src="/images/spinner.gif" alt="<%= t('muck.services.loading_content_image') %>" />
+      <%= f.submit t('muck.services.import_service', :service => service.name), :id => 'submit_add_feed' %>
+      <span id="finding_uri_message" class="waiting" style="display:none;">
+        <%= t('muck.services.submitting_feed_message') %>
       </span>
     </div>
   <% end -%>
-</div>
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  apply_add_feed();
+});
+</script>

data/app/views/identity_feeds/_services_for_user.erb

@@ -0,0 +1,11 @@
+<div id="my-services" class="services-main <%= css %>">
+  <h2><%= title || I18n.t('muck.services.my_services') %></h2>
+  <ul id="my-services-list" class="services-list">
+    <% if edit -%>
+      <%= render(:partial => 'services/edit_service', :collection => identity_feeds) %>
+    <% else -%>
+      <%= render(:partial => 'services/view_service', :collection => identity_feeds) %>
+    <% end -%>
+  </ul>
+</div>
+

data/app/views/identity_feeds/create.erb

@@ -0,0 +1,10 @@
+<% if @success -%>
+  jQuery('#my-services').replaceWith('<%= escape_javascript(services_for_user(@user_services, nil, 'span-5').html_safe) %>');
+  apply_delete_feed();
+  jQuery.fancybox.close();
+<% else -%>
+  jQuery('#identity-feed-message').addClass('error');
+  jQuery('#identity-feed-message').html("<%=@message.html_safe%>");
+  jQuery('#submit_add_feed').show();
+  jQuery('#finding_uri_message').hide();
+<% end -%>

data/app/views/identity_feeds/destroy.erb

@@ -0,0 +1 @@
+jQuery('#<%=@identity_feed.dom_id%>').fadeOut();

data/app/views/identity_feeds/index.erb

@@ -0,0 +1,49 @@
+<%= output_errors('', {:class => 'help-box'}) %>
+<%= available_service_categories(@service_categories, nil, 'span-15') %>
+<%= services_for_user(@user_services, nil, 'span-5') %>
+
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  jQuery('a.lightbox').fancybox({
+    'width': 400,
+    'height': 100,
+    'ajax' : {
+      dataType: 'html',
+      beforeSend: add_headers
+    }
+  });
+  jQuery('a#facebook-link').fancybox({
+    'width': 400,
+    'height': 375,
+    'ajax' : {
+      dataType: 'html',
+      beforeSend: add_headers
+    }
+  });
+  jQuery('a#zotero-groups-link').fancybox({
+    'width': 400,
+    'height': 130,
+    'ajax' : {
+      dataType: 'html',
+      beforeSend: add_headers
+    }
+  }); 
+  jQuery('a#netflix-link').fancybox({
+    'width': 400,
+    'height': 160,
+    'ajax' : {
+      dataType: 'html',
+      beforeSend: add_headers
+    }
+  }); 
+});
+</script>
+
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  //apply_delete_hover();
+  apply_delete_feed();
+});
+</script>
+
+

data/app/views/service_templates/{_facebook.html.erb → _facebook.erb}

@@ -1,4 +1,4 @@
 <%= text_field_tag :uri, feed.uri %>
-<p><%= t('muck.services.facebook_link', :link => '<a href="http://www.facebook.com/posted.php" target="blank">Click Here</a>') %></p>
+<p><%= t('muck.services.facebook_link', :link => '<a href="http://www.facebook.com/posted.php" target="blank">Click Here</a>').html_safe %></p>
 <img src="/images/service_icons/facebook_my_links.jpg" />
 <p><%= t('muck.services.facebook_instructions') %></p>

data/app/views/service_templates/{_friendfeed.html.erb → _friendfeed.erb}

@@ -1,2 +1,2 @@
 <%= text_field_tag :uri, feed.uri %>
-<%= t('muck.services.friendfeed_rss', :link => '<a href="http://friendfeed.com/">Friendfeed home page</a>') %>
+<%= t('muck.services.friendfeed_rss', :link => '<a href="http://friendfeed.com/" target="_blank">Friendfeed home page</a>').html_safe %>

data/app/views/service_templates/{_linkedin.html.erb → _linkedin.erb}

@@ -1,2 +1,2 @@
 <%= text_field_tag :uri, feed.uri %>
-<%= t('muck.services.linkedin_rss', :link => '<a href="http://www.linkedin.com/myprofile?editwp=">LinkedIn Public Profile page</a>') %>
+<%= t('muck.services.linkedin_rss', :link => '<a href="http://www.linkedin.com/myprofile?editwp=" target="_blank">LinkedIn Public Profile page</a>').html_safe %>

data/app/views/service_templates/{_netflix.html.erb → _netflix.erb}

@@ -1,2 +1,2 @@
 <%= text_field_tag :uri, feed.uri %>
-<%= t('muck.services.netflix_rss', :link => '<a href="http://www.netflix.com/RSSFeeds">Netflix Queue RSS page</a>') %>
+<%= t('muck.services.netflix_rss', :link => '<a href="http://www.netflix.com/RSSFeeds" target="_blank">Netflix Queue RSS page</a>').html_safe %>

data/config/locales/en.yml

@@ -50,7 +50,7 @@ en:
       rss: RSS
       validate_feed: Mark feed as valid
       discover_feed_message: Searching for information about the url you provided.  Please wait.
-      service_feed_name: "%{term}} on %{service}"
+      service_feed_name: "%{term} on %{service}"
       please_specify_url: Please specify a url
       available_sources: Available Sources
       import_service: Import %{service}
@@ -61,7 +61,7 @@ en:
       add_aggregation_title: "Name for aggregation:"
       back: Back
       polyvore_prompt: Polyvore profile URL
-      login_or_signup_prompt: "%{signup}} or %{login} to discuss and share resources."
+      login_or_signup_prompt: "%{signup} or %{login} to discuss and share resources."
       facebook_shares: Facebook Shared Links
       facebook: Facebook
       for: for
@@ -70,18 +70,18 @@ en:
       loading_content_image: <%= t('muck.services.loading_image') %>
       save_aggreation: Save this Aggregation
       metadata: metadata
-      signup_to_save_aggreation: "%{login}} or %{signup} to save this search"
+      signup_to_save_aggreation: "%{login} or %{signup} to save this search"
       visit: visit
       facebook_link: You can find your URL on your Facebook My Links page. %{link} and then click on 'My Links'
-      course_search_results: Courses <b>%{first}} - %{last}}</b> of <b>%{total}}</b> for search <b>%{terms}</b>
+      course_search_results: Courses <b>%{first} - %{last}</b> of <b>%{total}</b> for search <b>%{terms}</b>
       only_courses: Only Courses
-      no_hits: Your search - <b>%{search}}</b> - did not match any <b>%{resource_type}</b>. Please try a different search or choose a different language.
+      no_hits: Your search - <b>%{search}</b> - did not match any <b>%{resource_type}</b>. Please try a different search or choose a different language.
       no_recommendations: No recommendations were found.
       feed_successfully_created: Thank you for submitting a feed. You will be emailed when the feed is approved.
       login: Login
       next_label: Next
       add_rss: Add Rss
-      already_added_username_feed: You've already added a %{service}} account with the username %{username}
+      already_added_username_feed: You've already added a %{service} account with the username %{username}
       topic_feeds_for: Feeds for %{terms}
       explore: Search the Web
       videos: Videos
@@ -98,7 +98,7 @@ en:
       loading_message: "Loading... "
       feed_successfully_updated: Feed was successfully updated.
       approval_status: Approved
-      course_tag_results: Courses <b>%{first}} - %{last}}</b> of <b>%{total}}</b> tagged <b>%{terms}</b>
+      course_tag_results: Courses <b>%{first} - %{last}</b> of <b>%{total}</b> tagged <b>%{terms}</b>
       goodreads_prompt: Goodreads profile URL
       feed_remove: Feed Removed
       loading_image: Loading Image
@@ -123,7 +123,7 @@ en:
       oai_endpoint_successfully_created: Successfully added OAI endpoint
       add_extended_feed_title: Add new feed
       gm_title: Related Resources
-      resource_tag_results: Resources <b>%{first}} - %{last}}</b> of <b>%{total}}</b> tagged <b>%{terms}</b>
+      resource_tag_results: Resources <b>%{first} - %{last}</b> of <b>%{total}</b> tagged <b>%{terms}</b>
       rdf: RDF
       amazon_prompt: Please enter the email you use with Amazon.com
       edit_aggregation_title: Editing %{title}
@@ -192,7 +192,7 @@ en:
       already_shared: You've previously shared this page.
       add_edit_feeds: Add/Edit Feeds
       harvest_interval: Harvest interval (hrs)
-      resource_search_results: Resources <b>%{first}} - %{last}}</b> of <b>%{total}}</b> for search <b>%{terms}</b>
+      resource_search_results: Resources <b>%{first} - %{last}</b> of <b>%{total}</b> for search <b>%{terms}</b>
       successfully_added_uri_feed: Successfully added %{uri}
       no_feeds_found: No feeds were found
       direct_link: "[direct link]"
@@ -207,7 +207,7 @@ en:
       add_feed: Add Feed
       identity_feeds: Identity Feeds
       added_date: Added
-      no_tagged_courses: No <b>courses</b> were found tagged with <b>%{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/%{tags}}'>all resources tagged %{tags}</a>.
+      no_tagged_courses: No <b>courses</b> were found tagged with <b>%{tags}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/%{tags}'>all resources tagged %{tags}</a>.
       personal_recommendations: Recommendations
       feed_id: ID
       repository_short_title: "Repository Short Title:"

data/db/bootstrap/services.yml

@@ -317,7 +317,7 @@ pandora:
   icon: pandora.png
   use_for: "identity"
   service_category_id: 5
-  active: true
+  active: false
 technorati_tags:
   id: 27
   sort: 27
@@ -719,7 +719,7 @@ amazon:
   icon: amazon.png
   use_for: "identity"
   service_category_id: 12
-  active: true
+  active: false
   prompt: amazon_prompt
 twitter_tags:
   id: 59

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "3.1.1"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-02-01}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -104,12 +104,14 @@ Gem::Specification.new do |s|
     "app/views/feeds/new_oai_rss.html.erb",
     "app/views/feeds/show.html.erb",
     "app/views/feeds/unban.html.erb",
-    "app/views/identity_feeds/_available_service_categories.html.erb",
+    "app/views/identity_feeds/_available_service_categories.erb",
     "app/views/identity_feeds/_form.erb",
-    "app/views/identity_feeds/_services_for_user.html.erb",
-    "app/views/identity_feeds/edit.html.erb",
-    "app/views/identity_feeds/index.html.erb",
-    "app/views/identity_feeds/new.html.erb",
+    "app/views/identity_feeds/_services_for_user.erb",
+    "app/views/identity_feeds/create.erb",
+    "app/views/identity_feeds/destroy.erb",
+    "app/views/identity_feeds/edit.erb",
+    "app/views/identity_feeds/index.erb",
+    "app/views/identity_feeds/new.erb",
     "app/views/oai_endpoints/_form.html.erb",
     "app/views/oai_endpoints/_oai_endpoint_row.html.erb",
     "app/views/oai_endpoints/new.html.erb",
@@ -123,18 +125,18 @@ Gem::Specification.new do |s|
     "app/views/recommendations/index.rss.builder",
     "app/views/recommendations/index.xml.builder",
     "app/views/recommendations/real_time.html.erb",
-    "app/views/service_templates/_facebook.html.erb",
-    "app/views/service_templates/_friendfeed.html.erb",
-    "app/views/service_templates/_goodreads.html.erb",
-    "app/views/service_templates/_linkedin.html.erb",
-    "app/views/service_templates/_netflix.html.erb",
-    "app/views/service_templates/_polyvore.html.erb",
-    "app/views/service_templates/_zotero_group.html.erb",
-    "app/views/services/_edit_service.html.erb",
-    "app/views/services/_new_service.html.erb",
-    "app/views/services/_personal_recommendations.html.erb",
-    "app/views/services/_summary.html.erb",
-    "app/views/services/_view_service.html.erb",
+    "app/views/service_templates/_facebook.erb",
+    "app/views/service_templates/_friendfeed.erb",
+    "app/views/service_templates/_goodreads.erb",
+    "app/views/service_templates/_linkedin.erb",
+    "app/views/service_templates/_netflix.erb",
+    "app/views/service_templates/_polyvore.erb",
+    "app/views/service_templates/_zotero_group.erb",
+    "app/views/services/_edit_service.erb",
+    "app/views/services/_new_service.erb",
+    "app/views/services/_personal_recommendations.erb",
+    "app/views/services/_summary.erb",
+    "app/views/services/_view_service.erb",
     "app/views/services_mailer/notification_feed_added.html.erb",
     "app/views/services_mailer/notification_feed_added.text.erb",
     "app/views/services_mailer/notification_oai_endpoint_added.html.erb",
@@ -252,6 +254,7 @@ Gem::Specification.new do |s|
     "lib/muck-services/services.rb",
     "lib/tasks/muck_services.rake",
     "muck-services.gemspec",
+    "public/javascripts/muck_services-src.js",
     "public/javascripts/muck_services.js",
     "public/stylesheets/frame.css",
     "public/stylesheets/muck-services.css"

data/public/javascripts/muck_services-src.js

@@ -0,0 +1,134 @@
+function apply_add_feed(){
+	jQuery('.add-identity').bind('submit', function(){
+    jQuery('#submit_add_feed').hide();
+    jQuery('#finding_uri_message').show();
+    jQuery(this).ajaxSubmit({
+  		dataType: 'script',
+      beforeSend: add_headers
+  	});
+  	return false;
+  });
+}
+
+function apply_delete_feed(){
+  jQuery('.identity-feed-delete').bind('submit', function(){
+		jQuery(this).replaceWith(jQuery(jQuery('#muck_ajax_delete_control_message').html()).show());		
+    jQuery(this).ajaxSubmit({
+  		dataType: 'script',
+      beforeSend: add_headers
+  	});
+  	return false;
+  });	
+}
+
+function apply_delete_hover(){
+  jQuery('ul#my-services-list li form').hide();
+  jQuery('ul#my-services-list li').hover(function(){ 
+    jQuery(this).children('form').show(); }, function(){ 
+      jQuery(this).children('form').hide(); });
+}
+
+function apply_show_entry_content(){
+  jQuery('.combined-feed-list .feed-item .feed-title').hover(
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
+    },
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
+    }
+  );
+  jQuery('.combined-feed-list .feed-item .feed-content').hover(
+    function () {
+      jQuery(this).show();
+    },
+    function () {
+      jQuery(this).hide();
+    }
+  );
+}
+
+function show_tool(tool) {
+  jQuery('.tool').hide();
+  jQuery('#content_iframe').width('75%');
+  jQuery('#' + tool + '_tool').show();
+  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
+  maximize_space();
+  return false;
+}
+function maximize_space() {
+  var container = jQuery(".tools_container");
+  var spacer = jQuery('#comments_tools_close_wrapper').height() + 5;
+  container.height(jQuery(window).height() - (jQuery('#toolbar').height() + spacer));
+}
+function setup_entry_comment_submit(){
+	jQuery(".entry-comment-submit").click(function() {
+		jQuery(this).siblings('textarea').hide();
+		jQuery(".entry-comment-submit").hide();
+		jQuery(this).parent().append('<p class="entry-comment-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_COMMENT_MESSAGE + '</p>');
+		var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        } else {
+					jQuery('.entry-comment-loading').remove();
+					jQuery('#comments_tool').find('textarea').show();
+					jQuery('#comments_tool').find('textarea').val('');
+					jQuery(".entry-comment-submit").show();
+					jQuery("#comments_container").animate({ scrollTop: jQuery("#comments_tool").attr("scrollHeight") }, 3000);
+					var contents = jQuery(json.html)
+					contents.hide();
+					jQuery('#comments_wrapper').append(contents);
+					contents.fadeIn("slow");
+					apply_frame_comment_hover();
+				}
+      });
+    return false;
+  });
+}
+function apply_frame_comment_hover(){
+	jQuery('.comment_holder').hover(
+     function () { jQuery(this).addClass('comment-hover'); },
+     function () { jQuery(this).removeClass('comment-hover'); } );
+}
+function setup_share_submit(){
+  jQuery('#share_submit_share_new').click(function() {
+		jQuery(this).parent().append('<p class="share-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_SHARE_MESSAGE + '</p>');
+		jQuery('#share_submit_share_new').hide();
+		var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+      function(data){
+        var json = eval('(' + data + ')');
+        jQuery('.share-loading').remove();
+        jQuery('#share_submit_share_new').show();
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        } else {
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+}
+
+jQuery(document).ready(function() {
+  jQuery("#content_iframe").load(maximize_iframe_height);
+  jQuery(window).bind('resize', function() {
+    maximize_iframe_height();
+  });
+});
+
+function maximize_iframe_height() {
+  var frame = jQuery("#content_iframe");
+  frame.height(jQuery(window).height() - jQuery('#toolbar').height());
+  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
+}
+
+function initRecsPanel() {
+    var panel = jQuery("#recs_panel");
+    panel.append("<div id='rec_close_box' title='Close'>x</div>");
+    jQuery("#rec_close_box").click(function() {jQuery("#recs_panel").hide();jQuery("#show_recommendations_link").show();return false;});
+    panel.css("left", jQuery("#toolbar").width() - 250);
+    if (panel.draggable) panel.draggable();
+}

data/public/javascripts/muck_services.js

@@ -1,104 +1,10 @@
-function apply_show_entry_content(){
-  jQuery('.combined-feed-list .feed-item .feed-title').hover(
-    function () {
-      jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
-    },
-    function () {
-      jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
-    }
-  );
-  jQuery('.combined-feed-list .feed-item .feed-content').hover(
-    function () {
-      jQuery(this).show();
-    },
-    function () {
-      jQuery(this).hide();
-    }
-  );
-}
-
-function show_tool(tool) {
-  jQuery('.tool').hide();
-  jQuery('#content_iframe').width('75%');
-  jQuery('#' + tool + '_tool').show();
-  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
-  maximize_space();
-  return false;
-}
-function maximize_space() {
-  var container = jQuery(".tools_container");
-  var spacer = jQuery('#comments_tools_close_wrapper').height() + 5;
-  container.height(jQuery(window).height() - (jQuery('#toolbar').height() + spacer));
-}
-function setup_entry_comment_submit(){
-	jQuery(".entry-comment-submit").click(function() {
-		jQuery(this).siblings('textarea').hide();
-		jQuery(".entry-comment-submit").hide();
-		jQuery(this).parent().append('<p class="entry-comment-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_COMMENT_MESSAGE + '</p>');
-		var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        } else {
-					jQuery('.entry-comment-loading').remove();
-					jQuery('#comments_tool').find('textarea').show();
-					jQuery('#comments_tool').find('textarea').val('');
-					jQuery(".entry-comment-submit").show();
-					jQuery("#comments_container").animate({ scrollTop: jQuery("#comments_tool").attr("scrollHeight") }, 3000);
-					var contents = jQuery(json.html)
-					contents.hide();
-					jQuery('#comments_wrapper').append(contents);
-					contents.fadeIn("slow");
-					apply_frame_comment_hover();
-				}
-      });
-    return false;
-  });
-}
-function apply_frame_comment_hover(){
-	jQuery('.comment_holder').hover(
-     function () { jQuery(this).addClass('comment-hover'); },
-     function () { jQuery(this).removeClass('comment-hover'); } );
-}
-function setup_share_submit(){
-  jQuery('#share_submit_share_new').click(function() {
-		jQuery(this).parent().append('<p class="share-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_SHARE_MESSAGE + '</p>');
-		jQuery('#share_submit_share_new').hide();
-		var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
-      function(data){
-        var json = eval('(' + data + ')');
-        jQuery('.share-loading').remove();
-        jQuery('#share_submit_share_new').show();
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        } else {
-          jQuery.jGrowl.info(json.message);
-        }
-      });
-    return false;
-  });
-}
-
-jQuery(document).ready(function() {
-  jQuery("#content_iframe").load(maximize_iframe_height);
-  jQuery(window).bind('resize', function() {
-    maximize_iframe_height();
-  });
-});
-
-function maximize_iframe_height() {
-  var frame = jQuery("#content_iframe");
-  frame.height(jQuery(window).height() - jQuery('#toolbar').height());
-  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
-}
-
-function initRecsPanel() {
-    var panel = jQuery("#recs_panel");
-    panel.append("<div id='rec_close_box' title='Close'>x</div>");
-    jQuery("#rec_close_box").click(function() {jQuery("#recs_panel").hide();jQuery("#show_recommendations_link").show();return false;});
-    panel.css("left", jQuery("#toolbar").width() - 250);
-    if (panel.draggable) panel.draggable();
-}
+function apply_add_feed(){jQuery(".add-identity").bind("submit",function(){jQuery("#submit_add_feed").hide();jQuery("#finding_uri_message").show();jQuery(this).ajaxSubmit({dataType:"script",beforeSend:add_headers});return false})}function apply_delete_feed(){jQuery(".identity-feed-delete").bind("submit",function(){jQuery(this).replaceWith(jQuery(jQuery("#muck_ajax_delete_control_message").html()).show());jQuery(this).ajaxSubmit({dataType:"script",beforeSend:add_headers});return false})}
+function apply_delete_hover(){jQuery("ul#my-services-list li form").hide();jQuery("ul#my-services-list li").hover(function(){jQuery(this).children("form").show()},function(){jQuery(this).children("form").hide()})}
+function apply_show_entry_content(){jQuery(".combined-feed-list .feed-item .feed-title").hover(function(){jQuery(this).next(".combined-feed-list .feed-item .feed-content").show()},function(){jQuery(this).next(".combined-feed-list .feed-item .feed-content").hide()});jQuery(".combined-feed-list .feed-item .feed-content").hover(function(){jQuery(this).show()},function(){jQuery(this).hide()})}
+function show_tool(b){jQuery(".tool").hide();jQuery("#content_iframe").width("75%");jQuery("#"+b+"_tool").show();jQuery("#recs_panel").css("left",jQuery("#content_iframe").width()-252);maximize_space();return false}function maximize_space(){var b=jQuery(".tools_container"),a=jQuery("#comments_tools_close_wrapper").height()+5;b.height(jQuery(window).height()-(jQuery("#toolbar").height()+a))}
+function setup_entry_comment_submit(){jQuery(".entry-comment-submit").click(function(){jQuery(this).siblings("textarea").hide();jQuery(".entry-comment-submit").hide();jQuery(this).parent().append('<p class="entry-comment-loading"><img src="/images/spinner.gif" alt="loading..." /> '+ADD_COMMENT_MESSAGE+"</p>");var b=jQuery(this).parents("form");jQuery.post(b.attr("action"),b.serialize()+"&format=json",function(a){a=eval("("+a+")");if(a.success){jQuery(".entry-comment-loading").remove();jQuery("#comments_tool").find("textarea").show();
+jQuery("#comments_tool").find("textarea").val("");jQuery(".entry-comment-submit").show();jQuery("#comments_container").animate({scrollTop:jQuery("#comments_tool").attr("scrollHeight")},3E3);a=jQuery(a.html);a.hide();jQuery("#comments_wrapper").append(a);a.fadeIn("slow");apply_frame_comment_hover()}else jQuery.jGrowl.info(a.message)});return false})}
+function apply_frame_comment_hover(){jQuery(".comment_holder").hover(function(){jQuery(this).addClass("comment-hover")},function(){jQuery(this).removeClass("comment-hover")})}
+function setup_share_submit(){jQuery("#share_submit_share_new").click(function(){jQuery(this).parent().append('<p class="share-loading"><img src="/images/spinner.gif" alt="loading..." /> '+ADD_SHARE_MESSAGE+"</p>");jQuery("#share_submit_share_new").hide();var b=jQuery(this).parents("form");jQuery.post(b.attr("action"),b.serialize()+"&format=json",function(a){a=eval("("+a+")");jQuery(".share-loading").remove();jQuery("#share_submit_share_new").show();jQuery.jGrowl.info(a.message)});return false})}
+jQuery(document).ready(function(){jQuery("#content_iframe").load(maximize_iframe_height);jQuery(window).bind("resize",function(){maximize_iframe_height()})});function maximize_iframe_height(){jQuery("#content_iframe").height(jQuery(window).height()-jQuery("#toolbar").height());jQuery("#recs_panel").css("left",jQuery("#content_iframe").width()-252)}
+function initRecsPanel(){var b=jQuery("#recs_panel");b.append("<div id='rec_close_box' title='Close'>x</div>");jQuery("#rec_close_box").click(function(){jQuery("#recs_panel").hide();jQuery("#show_recommendations_link").show();return false});b.css("left",jQuery("#toolbar").width()-250);b.draggable&&b.draggable()};

data/public/stylesheets/muck-services.css

@@ -13,6 +13,7 @@
 #identity-feed input[type="text"] {width:380px;}
 ul#my-services-list li {position:relative;}
 ul#my-services-list li form {right:-25px;position:absolute;top:3px;}
+ul#my-services-list li .waiting{height:15px;display:inline-block;} 
 ul.service-summary{margin:0;padding:0;list-style:none;}
 ul.service-summary a.service-link{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-decoration:none;}
 #data-sources #sources-list ul {float:left;display:inline-block;height:170px;margin:0 20px;width:150px;}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 3
-  - 1
-  - 1
-  version: 3.1.1
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -07:00
+date: 2011-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -312,12 +312,14 @@ files:
 - app/views/feeds/new_oai_rss.html.erb
 - app/views/feeds/show.html.erb
 - app/views/feeds/unban.html.erb
-- app/views/identity_feeds/_available_service_categories.html.erb
+- app/views/identity_feeds/_available_service_categories.erb
 - app/views/identity_feeds/_form.erb
-- app/views/identity_feeds/_services_for_user.html.erb
-- app/views/identity_feeds/edit.html.erb
-- app/views/identity_feeds/index.html.erb
-- app/views/identity_feeds/new.html.erb
+- app/views/identity_feeds/_services_for_user.erb
+- app/views/identity_feeds/create.erb
+- app/views/identity_feeds/destroy.erb
+- app/views/identity_feeds/edit.erb
+- app/views/identity_feeds/index.erb
+- app/views/identity_feeds/new.erb
 - app/views/oai_endpoints/_form.html.erb
 - app/views/oai_endpoints/_oai_endpoint_row.html.erb
 - app/views/oai_endpoints/new.html.erb
@@ -331,18 +333,18 @@ files:
 - app/views/recommendations/index.rss.builder
 - app/views/recommendations/index.xml.builder
 - app/views/recommendations/real_time.html.erb
-- app/views/service_templates/_facebook.html.erb
-- app/views/service_templates/_friendfeed.html.erb
-- app/views/service_templates/_goodreads.html.erb
-- app/views/service_templates/_linkedin.html.erb
-- app/views/service_templates/_netflix.html.erb
-- app/views/service_templates/_polyvore.html.erb
-- app/views/service_templates/_zotero_group.html.erb
-- app/views/services/_edit_service.html.erb
-- app/views/services/_new_service.html.erb
-- app/views/services/_personal_recommendations.html.erb
-- app/views/services/_summary.html.erb
-- app/views/services/_view_service.html.erb
+- app/views/service_templates/_facebook.erb
+- app/views/service_templates/_friendfeed.erb
+- app/views/service_templates/_goodreads.erb
+- app/views/service_templates/_linkedin.erb
+- app/views/service_templates/_netflix.erb
+- app/views/service_templates/_polyvore.erb
+- app/views/service_templates/_zotero_group.erb
+- app/views/services/_edit_service.erb
+- app/views/services/_new_service.erb
+- app/views/services/_personal_recommendations.erb
+- app/views/services/_summary.erb
+- app/views/services/_view_service.erb
 - app/views/services_mailer/notification_feed_added.html.erb
 - app/views/services_mailer/notification_feed_added.text.erb
 - app/views/services_mailer/notification_oai_endpoint_added.html.erb
@@ -460,6 +462,7 @@ files:
 - lib/muck-services/services.rb
 - lib/tasks/muck_services.rake
 - muck-services.gemspec
+- public/javascripts/muck_services-src.js
 - public/javascripts/muck_services.js
 - public/stylesheets/frame.css
 - public/stylesheets/muck-services.css

data/app/views/identity_feeds/_services_for_user.html.erb

@@ -1,25 +0,0 @@
-<div id="my-services" class="services-main <%= css %>">
-  <h2><%= title || I18n.t('muck.services.my_services') %></h2>
-  <ul id="my-services-list" class="services-list">
-    <% if edit -%>
-      <%= render(:partial => 'services/edit_service', :collection => identity_feeds) %>
-    <% else -%>
-      <%= render(:partial => 'services/view_service', :collection => identity_feeds) %>
-    <% end -%>
-  </ul>
-</div>
-<% content_for :javascript do -%>
-jQuery(document).ready(function() {
-  jQuery('ul#my-services-list li form').hide();
-  jQuery('ul#my-services-list li').hover(
-    function () { jQuery(this).children('form').show(); },
-    function () { jQuery(this).children('form').hide(); }
-  );
-
-  jQuery('.muck_ajax_delete_control').click(function(){
-    jQuery(this).parents('li').html(jQuery('#muck_ajax_delete_control_message').html());
-    return true;
-  });
-});
-<% end -%>
-

data/app/views/identity_feeds/index.html.erb

@@ -1,32 +0,0 @@
-<%= output_errors('', {:class => 'help-box'}) %>
-<%= available_service_categories(@service_categories, nil, 'span-15') %>
-<%= services_for_user(@user_services, nil, 'span-5') %>
-
-<% content_for :javascript do -%>
-jQuery(document).ready(function() {
-  jQuery('a.lightbox').fancybox({
-    'hideOnContentClick': false,
-    'overlayShow': true,
-    'frameWidth': 400,
-    'frameHeight': 100
-  });
-  jQuery('a#facebook-link').fancybox({
-    'hideOnContentClick': false,
-    'overlayShow': true,
-    'frameWidth': 400,
-    'frameHeight': 275
-  });
-  jQuery('a#zotero-groups-link').fancybox({
-    'hideOnContentClick': false,
-    'overlayShow': true,
-    'frameWidth': 400,
-    'frameHeight': 130
-  }); 
-  jQuery('a#netflix-link').fancybox({
-    'hideOnContentClick': false,
-    'overlayShow': true,
-    'frameWidth': 400,
-    'frameHeight': 160
-  }); 
-});
-<% end -%>