muck-raker 0.1.26 → 0.1.27

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

@@ -1,99 +1,7 @@
-<div id="toolbar">
-  <div id="toolbar-logo">
-    <a href="/" target="_top"><img src="/images/folksemantic/logo-folksemantic-sm.gif"/></a>
-  </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>
-    <a id="close_frame_text" title="Remove frame and go to this web address." class="url_fragment" href="<%= @resource_uri %>"><%= t('muck.raker.close') %></a>
-  </div>
-  <div id="search" class="section">
-    <% form_tag(search_entries_path, {:method => :get}) do -%>
-      <div id="search_box"><%= text_field_tag(:q, '', :id => 'search-box') %></div>
-      <input id="search_go" class="input-button" type="submit" value="<%= t('muck.raker.search_button') %>"/>
-    <% end -%>
-  </div>
-  <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 logged_in? -%>
-      <%= link_to "<img src='/images/folksemantic/icon-share.gif'/>" + 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 "<img src='/images/folksemantic/icon-comment.gif'/>" + t('muck.raker.comment_entries_count', :count => @entry.comment_count), entry_comments_path(@entry), :id => 'comment' if GlobalConfig.enable_raker_comments -%>
-  </div>
-</div>
-
-<div id="comments_tool" class="tool" style="display:none;">
-  <div id="comments_tools_close_wrapper" class="close_link_wrapper">
-    <a href="#" id="comments_tools_close" class="close_link"><%= t('muck.raker.hide')%></a>
-  </div>
-  <div class="tools_container">
-    <div id="comments_wrapper" class="tools_wrapper">
-      <%= show_comments(@comments) %>
-    </div>
-    <div id="comments_control">
-      <% if logged_in? -%>
-        <%= output_errors(t('muck.comments.problem_adding_comment'), {:class => 'help-box'}, @comment) %>
-        <%= comment_form(@entry, nil, true) %>
-      <% else -%>
-        <%= link_to t('muck.raker.login_to_comment'), login_path %>
-      <% end -%>
-    </div>
-  </div>
-</div>
-
-<div id="share_tool" class="tool" style="display:none;">
-  <div id="share_tool_close_wrapper" class="close_link_wrapper">
-    <a href="#" id="share_tool_close" class="close_link"><%= t('muck.raker.hide')%></a>
-  </div>
-  <div class="tools_container">
-    <div id="shares_control">
-      <h2><%= t('muck.shares.share_title') %></h2>
-      <% if logged_in? -%>
-        <% 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) %>
-        <% share_form(@share) do |f| -%>
-          <%= f.hidden_field :entry_id -%>
-          <%= hidden_field_tag :render_new, false -%>
-        <% end -%>
-      <% else -%>
-        <%= link_to t('muck.shares.login_prompt'), login_path %>
-      <% end -%>
-    </div>
-  </div>
-</div>
-
+<%= render :partial => 'visits/toolbar' %>
+<%= render :partial => 'visits/comments_tool' %>
+<%= render :partial => 'visits/share_tool' %>
 <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 -%>
-  jQuery(document).ready(function() {
-    <%= "show_tool('comments');" if params[:show_comments] || @entry.comment_count > 0 -%>
-    jQuery(window).bind('resize', function() {
-      maximize_space();
-    });
-    jQuery('#comment').click(function(){
-      return show_tool('comments');
-    });
-    jQuery('#share').click(function(){
-      return show_tool('share');
-    });
-    jQuery('.close_link').click(function(){
-      jQuery('.tool').hide();
-      jQuery("#content_iframe").width('100%');
-      return false;
-    });
-    setup_comment_submit();
-    setup_share_submit();
-    apply_frame_comment_hover();
-  });
-<% end -%>
+<%= render :partial => 'visits/frame_scripts' %>

data/config/muck_raker_routes.rb

@@ -25,6 +25,8 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :feeds, :controller => 'muck/feeds', :collection => { :new_extended => :get }, :has_many => :entries
   map.resources :recommendations, :controller => 'muck/recommendations'
 
+  map.resources :identity_feeds, :controller => 'muck/identity_feeds'
+
   # redirect (and hit tracking)
 
   # search

data/db/bootstrap/service_categories.yml

@@ -0,0 +1,40 @@
+blogging:
+  id: 1
+  name: Blogging
+  sort: 1
+news:
+  id: 2
+  name: News
+  sort: 3
+data:
+  id: 3
+  name: Data
+  sort: 9
+music:
+  id: 4
+  name: Music
+  sort: 5
+networks:
+  id: 5
+  name: Networks
+  sort: 2
+video:
+  id: 6
+  name: Video
+  sort: 6
+bookmarks:
+  id: 7
+  name: Bookmarks
+  sort: 2
+academics:
+  id: 8
+  name: Academics
+  sort: 7
+photos:
+  id: 9
+  name: Photos
+  sort: 4
+other:
+  id: 10
+  name: Other
+  sort: 8