Merge remote-tracking branch 'larissa/share' into stoa

Rodrigo Souto
2 parents 5ceef49f 50e72f1d
Showing 9 changed files with 179 additions and 77 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/cms_helper.rb
app/helpers/token_helper.rb
app/views/cms/publish.html.erb
app/views/cms/view.html.erb
app/views/content_viewer/_article_toolbar.html.erb
public/javascripts/jquery.tokeninput.js
public/stylesheets/application.css
test/unit/cms_helper_test.rb
@@ -238,25 +238,48 @@ class CmsController &lt; MyProfileController
     render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
+  def search_communities_to_publish
+    render :text => find_by_contents(:profiles, user.memberships, params['q'], {:page => 1}, {:fields => ['name']})[:results].map {|community| {:id => community.id, :name => community.name} }.to_json
+  end
+
   def publish
     @article = profile.articles.find(params[:id])
+    @portal_enabled = environment.portal_community && environment.enabled?('use_portal_community')
     record_coming
-    @groups = profile.memberships - [profile]
-    @marked_groups = []
-    groups_ids = profile.memberships.map{|m|m.id.to_s}
-    @marked_groups = params[:marked_groups].map do |key, item|
-      if groups_ids.include?(item[:group_id])
-        item.merge :group => Profile.find(item.delete(:group_id))
+    @failed = {}
+    if request.post?
+      article_name = params[:name]
+      task = ApproveArticle.create!(:article => @article, :name => article_name, :target => user, :requestor => user)
+      begin
+        task.finish
+      rescue Exception => ex
+         @failed[ex.message] ? @failed[ex.message] << item.name : @failed[ex.message] = [item.name]
       end
-    end.compact unless params[:marked_groups].nil?
+      if @failed.blank?
+        session[:notice] = _("Your publish request was sent successfully")
+        if @back_to
+          redirect_to @back_to
+        else
+          redirect_to @article.view_url
+        end
+      end
+    end
+  end
+
+  def publish_on_communities
     if request.post?
+      @back_to = params[:back_to]
+      @article = profile.articles.find(params[:id])
       @failed = {}
+      article_name = params[:name]
+      params_marked = params['q'].split(',').select { |marked| user.memberships.map(&:id).include? marked.to_i }
+      @marked_groups = Profile.find(params_marked)
       @marked_groups.each do |item|
-        task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
+        task = ApproveArticle.create!(:article => @article, :name => article_name, :target => item, :requestor => user)
         begin
-          task.finish unless item[:group].moderated_articles?
+          task.finish unless item.moderated_articles?
         rescue Exception => ex
-           @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
+           @failed[ex.message] ? @failed[ex.message] << item.name : @failed[ex.message] = [item.name]
         end
       end
       if @failed.blank?
@@ -271,9 +294,9 @@ class CmsController &lt; MyProfileController
   end
   def publish_on_portal_community
-    @article = profile.articles.find(params[:id])
     if request.post?
-      if environment.portal_community
+      @article = profile.articles.find(params[:id])
+      if environment.portal_community && environment.enabled?('use_portal_community')
         task = ApproveArticle.create!(:article => @article, :name => params[:name], :target => environment.portal_community, :requestor => user)
         begin
           task.finish unless environment.portal_community.moderated_articles?
@@ -40,11 +40,9 @@ module CmsHelper
     end
   end
-  def display_spread_button(profile, article)
-    if profile.person?
-      expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
-    elsif profile.community? && environment.portal_community
-      expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
+  def display_spread_button(article)
+    if article.public?
+      expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:class => 'colorbox'}
     end
   end
@@ -12,6 +12,7 @@ module TokenHelper
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
+    options[:zindex] ||= 999
     options[:focus] ||= false
     options[:avoid_enter] ||= true
     options[:on_result] ||= 'null'
@@ -30,6 +31,7 @@ module TokenHelper
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        zindex: #{options[:zindex].to_json},
         queryParam: #{name.to_json},
         tokenLimit: #{options[:token_limit].to_json},
         onResult: #{options[:on_result]},
@@ -48,4 +50,4 @@ module TokenHelper
     result
   end
-end
 \ No newline at end of file
+end
-<h1><%= _('Select the groups where you want to publish your article') %></h1>
+<script type="text/javascript" charset="utf-8">
+  jQuery(document).ready( function() {
+      jQuery('.publish-article-title').find('label')
+        .click( function(event) {
+            if (this == event.target) {
+                jQuery(this).toggleClass('expanded');
+                jQuery(this).next('input').slideToggle();
+            }
+            return false;
+        }).addClass('collapsed').next('input').hide();
+  });
+
+</script>
+<div class="select-publish-target">
+
+<h2><%= _('Where do you want to publish this article?') %></h2>
 <% if !@failed.blank? %>
   <div class="errorExplanation" id="errorExplanation">
@@ -14,15 +29,57 @@
   </div>
 <% end %>
-<%= form_tag do%>
-  <%= hidden_field_tag :back_to, @back_to %>
-  <% @groups.each do |group| %>
-    <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
-    <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
-    <hr />
-  <% end %>
+<ul class='publish-targets'>
+  <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+    <strong><%= _("Publish this article on your profile") %></strong>
+    <div class='description'><%= _('You can publish this article on your profile where your friends and followers will see.') %></div>
+    <%= form_tag do %>
+      <%= hidden_field_tag :back_to, @back_to %>
+      <div class='publish-article-title'>
+      <%= labelled_text_field _('Title'), 'name', @article.name %>
+      </div>
-  <% button_bar do %>
-    <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
+      <% button_bar do %>
+        <%= submit_button 'spread', _('Spread this') %>
+      <% end %>
+    <% end %>
+  </li>
+
+  <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+    <strong><%= _("Publish this article on communities you are part of") %></strong>
+    <div class='description'><%= _('You can submit this article to one or more communities you are a member of, just search for the community below.') %></div>
+    <%= form_tag :action => 'publish_on_communities', :id => @article.id do %>
+      <%= hidden_field_tag :back_to, @back_to %>
+      <% search_action = url_for(:action => 'search_communities_to_publish') %>
+      <%= token_input_field_tag(:q, 'search-communities-to-publish', search_action, { :hint_text => _('Type in a search for your community'), :zindex => 10000, :focus => false }) %>
+
+      <div class='publish-article-title'>
+      <%= labelled_text_field _('Title'), 'name', @article.name %>
+      </div>
+      <% button_bar do %>
+        <%= submit_button 'spread', _('Spread this') %>
+      <% end %>
+    <% end %>
+  </li>
+
+
+<% if @portal_enabled %>
+  <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+  <strong><%= _("Publish your article on portal community") %></strong>
+  <div class='description'><%= _('You can suggest this article to the portal community, where it can show up on the homepage.') %></div>
+
+  <%= form_tag :action => 'publish_on_portal_community', :id => @article.id do %>
+    <%= hidden_field_tag :back_to, @back_to %>
+    <div class='publish-article-title'>
+    <%= labelled_text_field _('Title'), :name, @article.name %>
+    </div>
+
+    <% button_bar do %>
+      <%= submit_button 'spread', _('Spread this') %>
+    <% end %>
   <% end %>
+  </li>
 <% end %>
+</ul>
+
+</div>
@@ -66,7 +66,7 @@
       <td class="article-controls">
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
+        <%= display_spread_button(article) unless article.folder? || remove_content_button(:spread)%>
         <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
           <% if profile.home_page != article %>
             <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
@@ -15,15 +15,9 @@
       <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
-    <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
-      <% content = content_tag( 'span', _('Spread this') ) %>
-      <% url = nil %>
-      <% if profile.kind_of?(Person) %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
-      <% elsif profile.kind_of?(Community) && environment.portal_community %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
-      <% end %>
-      <%= expirable_button @page, :spread, content, url if url %>
+    <% if !@page.folder? && @page.public? && !remove_content_button(:spread) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
+      <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
     <% end %>
     <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
@@ -35,6 +35,7 @@ var DEFAULT_SETTINGS = {
     onAdd: null,
     onDelete: null,
     idPrefix: "token-input-",
+    zindex: 999,
     backspaceDeleteItem: true
 };
@@ -628,7 +629,7 @@ $.TokenList = function (input, url_or_data, options) {
                 position: "absolute",
                 top: $(token_list).offset().top + $(token_list).outerHeight(),
                 left: $(token_list).offset().left,
-                zindex: 999
+                'z-index': settings.zindex
             }).show();
         else
             dropdown.css({
@@ -2159,7 +2159,7 @@ a.button.disabled, input.disabled {
 .recent-documents-block .block-footer-content a:hover {
   text-decoration: underline;
 }
-/* ==> blocks/disabled-enterprise-message-block.css <<= */ 
+/* ==> blocks/disabled-enterprise-message-block.css <<= */
 .disabled-enterprise-message-block {
@@ -2175,12 +2175,12 @@ a.button.disabled, input.disabled {
   font-size: 80%;
   background: #ffffa9;
 }
-/* ==> blocks/article-block.css <<= */ 
+/* ==> blocks/article-block.css <<= */
 .article-block {
   overflow: hidden;
 }
-/* ==> blocks/main-block.css <<= */ 
+/* ==> blocks/main-block.css <<= */
 /*
 Use article.css for article related css
@@ -2201,7 +2201,7 @@ div#activation_enterprise {
 div#activation_enterprise label, div#activation_enterprise input, div#activation_enterprise div {
   display: inline
 }
-/* ==> blocks/slideshow-block.css <<= */ 
+/* ==> blocks/slideshow-block.css <<= */
 .slideshow-block .slideshow-container {
   margin-bottom: 10px;
@@ -2266,7 +2266,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   display: inline-block;
   width: 16px;
 }
-/* ==> blocks/products-block.css <<= */ 
+/* ==> blocks/products-block.css <<= */
 .products-block ul {
   margin: 0px;
@@ -2299,7 +2299,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 #content .products-block li a:hover {
   color: #fff;
 }
-/* ==> blocks/blog-archives-block.css <<= */ 
+/* ==> blocks/blog-archives-block.css <<= */
 #content .blog-archives-block {
   padding: 10px 0px 10px 10px;
@@ -2319,7 +2319,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   padding: 5px 0px 10px 10px;
   font-size: 12px;
 }
-/* ==> blocks/profile-info-block.css <<= */ 
+/* ==> blocks/profile-info-block.css <<= */
 .profile-info-block h2 {
@@ -2422,7 +2422,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   margin: 0px 0px 5px 0px;
   padding: 2px;
 }
-/* ==> blocks/location-block.css <<= */ 
+/* ==> blocks/location-block.css <<= */
 .location-block {
   text-align: center;
@@ -2435,7 +2435,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   background: #FFF;
   border: 1px solid #888;
 }
-/* ==> blocks/profile-image-block.css <<= */ 
+/* ==> blocks/profile-image-block.css <<= */
 .profile-image-block {
@@ -2470,7 +2470,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   list-style: none;
   margin-bottom: 8px;
 }
-/* ==> blocks/sellers-search-block.css <<= */ 
+/* ==> blocks/sellers-search-block.css <<= */
 #content .sellers-search-block {
@@ -2529,7 +2529,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   margin: 0px;
   float: none;
 }
-/* ==> blocks/feed-reader-block.css <<= */ 
+/* ==> blocks/feed-reader-block.css <<= */
 #content .feed-reader-block {
   padding: 10px 0px 10px 10px;
@@ -3288,6 +3288,52 @@ table.cms-articles .icon:hover {
   background-color: transparent;
 }
+.select-publish-target {
+  margin: 10px 10px 0px 10px;
+}
+
+.publish-targets {
+  padding: 10px;
+  margin: 0px;
+}
+
+.publish-targets>li {
+  list-style: none;
+  padding: 10px 20px 5px 10px;
+}
+
+.publish-targets li.mouseover {
+  background-color: #eeeeec;
+}
+
+.publish-targets div.publish-article-title, .publish-targets .description {
+  width: 384px;
+  margin-top: 2px;
+}
+
+.publish-targets div.publish-article-title .collapsed {
+  background-image: url("../images/icons-task/closed-arrow-hover.png");
+  background-repeat: no-repeat;
+  background-position: 3px 0;
+}
+
+.publish-targets div.publish-article-title .expanded {
+  background-image: url("../images/icons-task/opened-arrow-hover.png");
+  background-repeat: no-repeat;
+  background-position: 3px 0;
+}
+
+.publish-targets div.publish-article-title label {
+  padding-left: 20px;
+}
+
+.publish-targets div.publish-article-title input {
+  width: 100%;
+  border: 1px solid #999;
+  padding: 3px 8px;
+  margin-bottom: 2px;
+}
+
 .select-article-type {
   padding: 5px 20px;
   width: 455px;
@@ -6689,7 +6735,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 /* AutoComplete*/
 .formfield input.ui-autocomplete-loading { background: url('/images/loading-small.gif') right center no-repeat, url("../images/input-bg.gif") no-repeat left top;  }
- 
+
 .ui-autocomplete-category {
      font-weight: bold;
      padding: .2em .4em;
@@ -48,41 +48,22 @@ class CmsHelperTest &lt; ActionView::TestCase
     result = link_to_article(file)
   end
-  should 'display spread button when profile is a person' do
+  should 'display spread button when content is public' do
     plugins.stubs(:dispatch).returns([])
     profile = fast_create(Person)
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
     expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
-    result = display_spread_button(profile, article)
+    result = display_spread_button(article)
   end
-  should 'display spread button when profile is a community and env has portal_community' do
+  should 'not display spread button when content is not public' do
     plugins.stubs(:dispatch).returns([])
-    env = fast_create(Environment)
-    env.expects(:portal_community).returns(true)
-    profile = fast_create(Community, :environment_id => env.id)
-    expects(:environment).returns(env)
-
-    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
-
-    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
-
-    result = display_spread_button(profile, article)
-  end
-
-  should 'not display spread button when profile is a community and env has not portal_community' do
-    plugins.stubs(:dispatch).returns([])
-    env = fast_create(Environment)
-    env.expects(:portal_community).returns(nil)
-    profile = fast_create(Community, :environment_id => env.id)
-    expects(:environment).returns(env)
-
-    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
-
-    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil).never
+    profile = fast_create(Person)
+    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id, :published => false)
+    expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'button with-text icon-spread', :title => nil).never
-    result = display_spread_button(profile, article)
+    result = display_spread_button(article)
   end
   should 'display delete_button to folder' do
1	-<h1><%= _('Select the groups where you want to publish your article') %></h1>	1	+<script type="text/javascript" charset="utf-8">
		2	+ jQuery(document).ready( function() {
		3	+ jQuery('.publish-article-title').find('label')
		4	+ .click( function(event) {
		5	+ if (this == event.target) {
		6	+ jQuery(this).toggleClass('expanded');
		7	+ jQuery(this).next('input').slideToggle();
		8	+ }
		9	+ return false;
		10	+ }).addClass('collapsed').next('input').hide();
		11	+ });
		12	+
		13	+</script>
		14	+<div class="select-publish-target">
		15	+
		16	+<h2><%= _('Where do you want to publish this article?') %></h2>
2		17
3	<% if !@failed.blank? %>	18	<% if !@failed.blank? %>
4	<div class="errorExplanation" id="errorExplanation">	19	<div class="errorExplanation" id="errorExplanation">
	@@ -14,15 +29,57 @@		@@ -14,15 +29,57 @@
14	</div>	29	</div>
15	<% end %>	30	<% end %>
16		31
17	-<%= form_tag do%>
18	- <%= hidden_field_tag :back_to, @back_to %>
19	- <% @groups.each do \|group\| %>
20	- <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
21	- <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
22	- <hr />
23	- <% end %>	32	+<ul class='publish-targets'>
		33	+ <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
		34	+ <strong><%= _("Publish this article on your profile") %></strong>
		35	+ <div class='description'><%= _('You can publish this article on your profile where your friends and followers will see.') %></div>
		36	+ <%= form_tag do %>
		37	+ <%= hidden_field_tag :back_to, @back_to %>
		38	+ <div class='publish-article-title'>
		39	+ <%= labelled_text_field _('Title'), 'name', @article.name %>
		40	+ </div>
24		41
25	- <% button_bar do %>
26	- <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>	42	+ <% button_bar do %>
		43	+ <%= submit_button 'spread', _('Spread this') %>
		44	+ <% end %>
		45	+ <% end %>
		46	+ </li>
		47	+
		48	+ <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
		49	+ <strong><%= _("Publish this article on communities you are part of") %></strong>
		50	+ <div class='description'><%= _('You can submit this article to one or more communities you are a member of, just search for the community below.') %></div>
		51	+ <%= form_tag :action => 'publish_on_communities', :id => @article.id do %>
		52	+ <%= hidden_field_tag :back_to, @back_to %>
		53	+ <% search_action = url_for(:action => 'search_communities_to_publish') %>
		54	+ <%= token_input_field_tag(:q, 'search-communities-to-publish', search_action, { :hint_text => _('Type in a search for your community'), :zindex => 10000, :focus => false }) %>
		55	+
		56	+ <div class='publish-article-title'>
		57	+ <%= labelled_text_field _('Title'), 'name', @article.name %>
		58	+ </div>
		59	+ <% button_bar do %>
		60	+ <%= submit_button 'spread', _('Spread this') %>
		61	+ <% end %>
		62	+ <% end %>
		63	+ </li>
		64	+
		65	+
		66	+<% if @portal_enabled %>
		67	+ <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
		68	+ <strong><%= _("Publish your article on portal community") %></strong>
		69	+ <div class='description'><%= _('You can suggest this article to the portal community, where it can show up on the homepage.') %></div>
		70	+
		71	+ <%= form_tag :action => 'publish_on_portal_community', :id => @article.id do %>
		72	+ <%= hidden_field_tag :back_to, @back_to %>
		73	+ <div class='publish-article-title'>
		74	+ <%= labelled_text_field _('Title'), :name, @article.name %>
		75	+ </div>
		76	+
		77	+ <% button_bar do %>
		78	+ <%= submit_button 'spread', _('Spread this') %>
		79	+ <% end %>
27	<% end %>	80	<% end %>
		81	+ </li>
28	<% end %>	82	<% end %>
		83	+</ul>
		84	+
		85	+</div>
	@@ -66,7 +66,7 @@		@@ -66,7 +66,7 @@
66	<td class="article-controls">	66	<td class="article-controls">
67	<%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>	67	<%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
68	<%= button_without_text :eyes, _('Public view'), article.view_url %>	68	<%= button_without_text :eyes, _('Public view'), article.view_url %>
69	- <%= display_spread_button(profile, article) unless article.folder? \|\| remove_content_button(:spread)%>	69	+ <%= display_spread_button(article) unless article.folder? \|\| remove_content_button(:spread)%>
70	<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>	70	<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
71	<% if profile.home_page != article %>	71	<% if profile.home_page != article %>
72	<%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>	72	<%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>