muck-raker 0.1.22 → 0.1.23

data/Rakefile

@@ -68,44 +68,10 @@ begin
     gemspec.add_dependency "muck-users"
     gemspec.add_dependency "muck-comments"
     gemspec.add_dependency "muck-solr"
-    gemspec.files.include %w( tasks/*
-                          db/bootstrap/*.yml
-                          db/migrate/*.rb
-                          app/**/**/**/*
-                          config/*
-                          locales/*
-                          rails/*
-                          test/*
-                          lib/**/*
-                          raker/**/*
-                          public/javascripts/* )
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-# rubyforge tasks
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/muck-raker/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
   end
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

data/app/helpers/muck_raker_helper.rb

@@ -77,7 +77,7 @@ module MuckRakerHelper
   end
   
   def already_shared_entry?(user, entry)
-    user.shares.find(:all, :conditions => ['entry_id = ?', entry.id])
+    user.shares.find(:all, :conditions => ['entry_id = ?', entry.id]).length > 0
   end
   
 end

data/app/views/visits/show.html.erb

@@ -1,5 +1,6 @@
 <div id="toolbar">
   <div id="profile" class="section">
+    
   </div>
   <div id="close" class="section">
     <a id="close_frame" title="Remove frame and go to this web address." class="url_fragment" href="<%= @resource_uri %>"> </a>
@@ -14,14 +15,12 @@
   <div id="tools" class="section">
     <%#= link_to t('muck.raker.remix'), new_content_path(@entry), :id => 'share'  - copy the page into the content system %>
     <%#= link_to t('muck.raker.save'), new_content_path(@entry), :id => 'share'  - save the content for use later on  %>
-    <% if GlobalConfig.enable_raker_shares -%>
-      <% if logged_in? -%>
-        <%= link_to t('muck.raker.share'), new_user_share_path(current_user, :title => @entry.title, :uri => @resource_uri), :id => 'share' %>
-      <% else -%>
-        <%= link_to t('muck.raker.login_to_prompt'), login_path, :id => 'login' %>
-      <% end -%>
+    <% if logged_in? -%>
+      <%= link_to t('muck.raker.share'), new_user_share_path(current_user, :title => @entry.title, :uri => @resource_uri), :id => 'share' if GlobalConfig.enable_raker_shares -%>      
+    <% else -%>
+      <span id="share_login"><%= t('muck.raker.login_or_signup_prompt', :signup => link_to(t('muck.raker.signup'), signup_path, :id => 'signup'), :login => link_to(t('muck.raker.login'), login_path, :id => 'login') ) %></span>
     <% end -%>
-    <%= link_to t('muck.raker.comment_entries_count', :count => @entry.comment_count), entry_comments_path(@entry), :id => 'comment' if GlobalConfig.enable_raker_comments %>
+    <%= link_to t('muck.raker.comment_entries_count', :count => @entry.comment_count), entry_comments_path(@entry), :id => 'comment' if GlobalConfig.enable_raker_comments -%>
   </div>
 </div>
 
@@ -52,7 +51,7 @@
     <div id="shares_control">
       <h2><%= t('muck.shares.share_title') %></h2>
       <% if logged_in? -%>
-        <% if already_shared?(current_user, @resource_uri)-%>
+        <% if already_shared_entry?(current_user, @entry) -%>
           <%= t('muck.raker.already_shared') %>
         <% end -%>
         <%= output_errors(t('muck.shares.problem_adding_share'), {:class => 'help-box'}, @share) %>
@@ -70,16 +69,15 @@
 <div id="frame_content" class="framed_content">
   <iframe id="content_iframe" class="framed_content" name="iframe" src="<%= @resource_uri %>" frameborder="0" scrolling="auto" noresize="noresize"></iframe>
 </div>
-
 <% content_for :head do -%>
   <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.raker.write_comment_prompt')}';] %>
   <%= javascript_tag %[var ADD_COMMENT_MESSAGE = '#{t('muck.raker.adding_comment_message')}';] %>
   <%= javascript_tag %[var ADD_SHARE_MESSAGE = '#{t('muck.shares.adding_share')}';] %>
+  <%= javascript_include_tag 'muck_raker.js' %>
 <% end -%>
-
-<%# content_for :javascript do -%>
-  <script type="text/javascript" language="JavaScript">
+<% content_for :javascript do -%>
   jQuery(document).ready(function() {
+    <%= "show_tool('comments');" if params[:show_comments] || @entry.comment_count > 0 -%>
     jQuery(window).bind('resize', function() {
       maximize_space();
     });
@@ -96,61 +94,6 @@
     });
     setup_comment_submit();
     setup_share_submit();
+    apply_frame_comment_hover();
   });
-  function show_tool(tool) {
-    jQuery('.tool').hide();
-    jQuery("#content_iframe").width('75%');
-    jQuery('#' + tool + '_tool').show();
-    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_comment_submit(){
-  	jQuery(".comment-submit").click(function() {
-  		jQuery(this).siblings('textarea').hide();
-  		jQuery(this).parent().append('<p class="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('.comment-loading').remove();
-  					jQuery('#comments_tool').find('textarea').show();
-  					jQuery('#comments_tool').find('textarea').val('');
-  					jQuery("#comments_container").animate({ scrollTop: jQuery("#comments_container").attr("scrollHeight") }, 3000);
-  					var contents = jQuery(json.html)
-  					contents.hide();
-  					jQuery('#comments_wrapper').append(contents);
-  					contents.fadeIn("slow");
-  				}
-        });
-      return false;
-    });
-  }
-  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;
-    });
-  }
-  </script>
-<%# end -%>
+<% end -%>

data/lib/muck_raker/tasks.rb

@@ -65,6 +65,7 @@ module MuckRaker
           task :sync do
             path = File.join(File.dirname(__FILE__), *%w[.. ..])
             system "rsync -ruv #{path}/db ."
+            system "rsync -ruv #{path}/public ."
             system "rsync -ruv #{path}/config/solr ./config"
           end
           

data/locales/en.yml

@@ -97,7 +97,9 @@ en:
         write_comment_prompt: "Add a comment"
         adding_comment_message: "Adding comment"
         login_to_comment: "Login to add a comment"
-        login_to_prompt: "Login to comment and share resources."
+        login_or_signup_prompt: "{{signup}} or {{login}} to discuss and share resources."
+        login: "Login"
+        signup: "Sign Up"
         already_shared: "You've previously shared this page."
         comment_entries_count:
           one: "1 Comment"