ActionItem937: home page must show news from a news portal community

* made areas appear in the front page * folders can provide specific news for front page * adding condition to display news (feature and portal community defined) * admin can set the portal community * added cache to the news page * added migration for highlight attribute + renumbering migrations

ActionItem937: home page must show news from a news portal community
* made areas appear in the front page * folders can provide specific news for front page * adding condition to display news (feature and portal community defined) * admin can set the portal community * added cache to the news page * added migration for highlight attribute + renumbering migrations
Daniela Feitosa · Antonio Terceiro
1 parent 001bf74b
Showing 26 changed files with 425 additions and 10 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/public/home_controller.rb
app/helpers/dates_helper.rb
app/models/article.rb
app/models/community.rb
app/models/environment.rb
app/models/folder.rb
app/models/profile.rb
app/models/text_article.rb
app/sweepers/article_sweeper.rb
app/views/admin_panel/index.rhtml
app/views/admin_panel/set_portal_community.rhtml
app/views/admin_panel/set_portal_folders.rhtml
app/views/cms/_published_article.rhtml
app/views/cms/edit.rhtml
app/views/home/index.rhtml
app/views/tasks/_approve_article.rhtml
db/migrate/068_add_highlighted_to_articles.rb
db/schema.rb
public/stylesheets/common.css
@@ -34,4 +34,33 @@ class AdminPanelController &lt; AdminController
     end
     redirect_to :action => 'manage_templates'
   end
+
+  def set_portal_community
+    env = environment
+    @portal_community = env.portal_community || Community.new
+    if request.post?
+      portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
+      if portal_community
+        env.portal_community = portal_community
+        env.save
+        redirect_to :action => 'set_portal_folders'
+      else
+        flash[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
+      end
+    end
+  end
+
+  def set_portal_folders
+     @portal_folders = environment.portal_community.articles.find_all_by_type('Folder')
+     if request.post?
+       env = environment
+       folders = params[:folders].map{|fid| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})}
+       env.portal_folders = folders
+       if env.save
+         flash[:notice] = _('Saved the portal folders')
+         redirect_to :action => 'index'
+       end
+     end
+     @selected = (environment.portal_folders || []).map(&:id)
+  end
 end
 class HomeController < PublicController
   def index
+    @has_news = false
+    if environment.enabled?('use_portal_community') && environment.portal_community
+      @has_news = true
+      @news_cache_key = "home_page_news_#{environment.id.to_s}"
+      if !read_fragment(@news_cache_key)
+        portal_community = environment.portal_community
+        @portal_news = portal_community.news(5)
+        @highlighted_news = portal_community.news(2, true)
+        @area_news = environment.portal_folders
+      end
+    end
   end
 end
@@ -22,8 +22,10 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date)
-    if date
+  def show_date(date, use_numbers = false)
+    if date && use_numbers
+      _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date
       _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }
     else
       ''
@@ -98,7 +98,7 @@ class Article &lt; ActiveRecord::Base
   # oldest.
   #
   # Only includes articles where advertise == true
-  def self.recent(limit)
+  def self.recent(limit, extra_conditions = {})
     # FIXME this method is a horrible hack
     options = { :limit => limit,
                 :conditions => [
@@ -117,7 +117,13 @@ class Article &lt; ActiveRecord::Base
          scoped_methods.last[:find][:joins].index('profiles') )
       options.delete(:include)
     end
-    self.find(:all, options)
+    if extra_conditions == {}
+      self.find(:all, options)
+    else
+      with_scope :find => {:conditions => extra_conditions} do
+        self.find(:all, options)
+      end
+    end
   end
   # retrives the most commented articles, sorted by the comment count (largest
@@ -265,6 +271,11 @@ class Article &lt; ActiveRecord::Base
       (params[:month] ? "-month-#{params[:month]}" : '')
   end
+  def first_paragraph
+    body =~ /(.*<\/p>)/
+    $1
+  end
+
   private
   def sanitize_tag_list
@@ -41,4 +41,7 @@ class Community &lt; Organization
     environment.community_template
   end
+  def news(limit = 30, highlight = false)
+    recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
+  end
 end
@@ -47,6 +47,7 @@ class Environment &lt; ActiveRecord::Base
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'display_wizard_signup' => _('Display wizard signup'),
+      'use_portal_community' => _('Use the portal as news source for front page'),
     }
   end
@@ -539,6 +540,26 @@ class Environment &lt; ActiveRecord::Base
     settings[:replace_enterprise_template_when_enable] = value
   end
+  def portal_community
+    Community[settings[:portal_community_identifier]]
+  end
+
+  def portal_community=(value)
+    settings[:portal_community_identifier] = value.identifier
+  end
+
+  def is_portal_community?(profile)
+    portal_community == profile
+  end
+
+  def portal_folders
+    (settings[:portal_folders] || []).map{|fid| Folder.find(:first, :conditions => {:profile_id => portal_community.id, :id => fid})}
+  end
+
+  def portal_folders=(folders)
+    settings[:portal_folders] = folders.map(&:id)
+  end
+
   after_create :create_templates
   def create_templates
@@ -65,6 +65,10 @@ class Folder &lt; Article
     false
   end
+  def news(limit = 30, highlight = false)
+    profile.recent_documents(limit, ["articles.type != ? AND articles.highlighted = ? AND articles.parent_id = ?", 'Folder', highlight, id])
+  end
+
   has_many :images, :class_name => 'Article',
                     :foreign_key => 'parent_id',
                     :order => 'type, name',
@@ -288,8 +288,8 @@ class Profile &lt; ActiveRecord::Base
   #
   # +limit+ is the maximum number of documents to be returned. It defaults to
   # 10.
-  def recent_documents(limit = 10)
-    self.articles.recent(limit)
+  def recent_documents(limit = 10, options = {})
+    self.articles.recent(limit, options)
   end
   class << self
@@ -605,4 +605,5 @@ class Profile &lt; ActiveRecord::Base
   def folders
     self.articles.find(:all, :conditions => ['type in (?)', ['Folder', 'Blog']])
   end
+
 end
@@ -2,5 +2,4 @@
 class TextArticle < Article
   xss_terminate :only => [ :name, :abstract, :body ]
-
 end
@@ -15,6 +15,10 @@ protected
     article.hierarchy.each {|a| expire_fragment(/#{a.cache_key}/) }
     blocks = article.profile.blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
     blocks.map(&:cache_keys).each{|ck|expire_timeout_fragment(ck)}
+    env = article.profile.environment
+    if env.portal_community == article.profile
+      expire_fragment("home_page_news_#{env.id}")
+    end
   end
   def expire_fragment(*args)
@@ -13,4 +13,5 @@
   <li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>
   <li><%= link_to _('Edit Templates'), :action => 'edit_templates' %></li>
   <li><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></li>
+  <li><%= link_to _('Set Portal'), :action => 'set_portal_community' %></li>
 </ul>
@@ -0,0 +1,9 @@
+<h1> <%= _('Set Environment Portal') %></h1>
+
+<% form_tag do %>
+  <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
+
+  <% button_bar do %>
+     <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
+  <% end %>
+<% end %>
@@ -0,0 +1,13 @@
+<h1><%= _('Select folders') %></h1>
+
+<p><%= _('Select what folder will hold the news for witch area of the initial page of the environment') %></p>
+
+<% form_tag do %>
+  <% (1..4).each do |i| %>
+    <%= labelled_select _('Area %d: ') % i, 'folders[]', :id, :name, @selected[i-1], @portal_folders %> <br>
+  <% end %>
+
+  <% button_bar do %>
+    <%= submit_button 'save', _('Save'), :cancel => {:action => 'index'} %>
+  <% end %>
+<% end %>
 <%= f.text_field 'name', :size => '64' %>
-
@@ -11,6 +11,8 @@
   <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
+  <%= f.check_box(:highlighted) if environment.is_portal_community?(profile) %>
+
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
   <% end %>
@@ -2,7 +2,38 @@
   <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard') %>
 <% end %>
-<%= environment.description %>
+<% if @has_news %>
+  <h3><%= _('News') %></h3>
+  <% cache @news_cache_key do %>
+    <div id='highlighted-news'>
+      <% @highlighted_news.each do |highlighted| %>
+        <p><%= link_to(highlighted.title, highlighted.url) %><br/>
+        <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
+	<div class='headline'><%= highlighted.first_paragraph %></div>
+        <br style='clear:both' />
+      <% end%>
+    </div>
+
+    <div id='portal-news'>
+      <% @portal_news.each do |news| %>
+        <p><span class="post-date"><%= show_date(news.published_at, true) %> </span><%= link_to(news.title, news.url) %></p>
+      <% end%>
+    </div>
+
+    <% @area_news.each_with_index do |folder, i| %>
+      <% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
+        <h3><%= link_to folder.title, folder.url %></h3>
+          <ul>
+          <% folder.news(3).each do |news| %>
+            <li><span class='news-symbol'>&gt;</span> <%= link_to(news.title, news.url) %></li>
+          <% end%>
+          </ul>
+      <%end %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= environment.description %>
+<% end %>
 <% if environment.enabled?('enterprise_activation') %>
@@ -22,6 +22,7 @@
     <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
     <%= labelled_form_field(_('Select the folder where the article must be published'), select_folder('task', 'article_parent_id', task.target.folders)) %>
+    <%= labelled_form_field( _('Highlight'), check_box_tag(:highlighted, true)) %>
     <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
   </div>
@@ -0,0 +1,11 @@
+class AddHighlightedToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :highlighted, :boolean, :default => false
+    add_column :article_versions, :highlighted, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :articles, :highlighted
+    remove_column :article_versions, :highlighted
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 67) do
+ActiveRecord::Schema.define(:version => 68) do
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(:version =&gt; 67) do
     t.integer  "hits",                 :default => 0
     t.date     "published_at"
     t.string   "source"
+    t.boolean  "highlighted",          :default => false
   end
   create_table "articles", :force => true do |t|
@@ -79,6 +80,7 @@ ActiveRecord::Schema.define(:version =&gt; 67) do
     t.integer  "hits",                 :default => 0
     t.date     "published_at"
     t.string   "source"
+    t.boolean  "highlighted",          :default => false
   end
   create_table "articles_categories", :id => false, :force => true do |t|
@@ -481,4 +481,66 @@ div.pending-tasks {
 #wizard-content h1 {
   font-size: 22px;
+=======
+
+
+#portal-news {
+  font-size: 11px;
+}
+
+#portal-news a, #highlighted-news a, .news-area a  {
+  text-decoration: none;
+}
+
+#portal-news a:hover, #highlighted-news a:hover, .news-area a:hover {
+  text-decoration: underline;
+}
+
+.headline img {
+  float:left;
+  margin: 5px;
+  width: 140px;
+  height: 100px;
+}
+
+.news-area {
+  border: 1px solid black;
+  height: 170px;
+  width: 49%;
+  margin: 3px 0px;
+  font-size: 11px;
+  overflow: hidden;
+}
+
+#content .news-area h3 {
+  margin-top: 0px;
+  padding: 2px;
+  background-color: #CCC;
+  font-size: 15px;
+}
+
+.news-area ul {
+  padding: 2px;
+}
+
+.news-area li {
+  list-style: none;
+  margin: 0px 2px 10px 2px;
+}
+
+.even {
+  float: left;
+}
+
+.odd {
+  float: right;
+}
+
+.news-symbol {
+  background-color: #CCC;
+  color: #FFF;
+}
+
+.post-date {
+  color: #E68A00;
 }
@@ -147,4 +147,73 @@ class AdminPanelControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => "script", :content => /tinyMCE\.init/
   end
+  should 'set portal community' do
+    e = Environment.default
+    @controller.stubs(:environment).returns(e)
+    c = Community.create!(:name => 'portal_community')
+
+    post :set_portal_community, :portal_community_identifier => c.identifier
+
+    assert_equal c, e.portal_community
+  end
+
+  should 'redirect to set portal folders' do
+    e = Environment.default
+    @controller.stubs(:environment).returns(e)
+    c = Community.create!(:name => 'portal_community')
+
+    post :set_portal_community, :portal_community_identifier => c.identifier
+
+    assert_response :redirect
+    assert_redirected_to :action => 'set_portal_folders'
+  end
+
+  should 'not have a portal community from other environment' do
+    e = Environment.default
+    @controller.stubs(:environment).returns(e)
+    other_e = Environment.create!(:name => 'other environment')
+    c = Community.create!(:name => 'portal community', :environment => other_e)
+
+    post :set_portal_community, :portal_community_identifier => c.identifier
+    e.reload
+
+    assert_not_equal c, e.portal_community
+  end
+
+  should 'give error when portal community is not given' do
+    post :set_portal_community, :portal_community_identifier => 'no_community'
+    assert_response :success
+    assert_template 'set_portal_community'
+  end
+
+  should 'give portal_community folders as option for portal folders' do
+    env = Environment.default
+    c = Community.create!(:name => 'portal')
+    env.portal_community = c
+    local = Folder.create!(:profile => c, :name => 'local news')
+    tech = Folder.create!(:profile => c, :name => 'tech news')
+    politics = Folder.create!(:profile => c, :name => 'politics news')
+    env.save!
+
+    get :set_portal_folders
+    assert_tag :tag => 'option', :attributes => {:value => local.id}, :content => local.name
+    assert_tag :tag => 'option', :attributes => {:value => tech.id}, :content => tech.name
+    assert_tag :tag => 'option', :attributes => {:value => politics.id}, :content => politics.name
+  end
+
+  should 'save a list of folders as portal folders for the environment' do
+    env = Environment.default
+    @controller.stubs(:environment).returns(env)
+    c = Community.create!(:name => 'portal')
+    env.portal_community = c
+    local = Folder.create!(:profile => c, :name => 'local news')
+    discarded = Folder.create!(:profile => c, :name => 'discarded news')
+    tech = Folder.create!(:profile => c, :name => 'tech news')
+    politics = Folder.create!(:profile => c, :name => 'politics news')
+    env.save!
+
+    post :set_portal_folders, :folders => [local, politics, tech].map(&:id)
+
+    assert_equal [local, politics, tech].map(&:id), env.portal_folders.map(&:id)
+  end
 end
@@ -40,4 +40,34 @@ all_fixtures
     assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
   end
+  should 'not display news from portal if disabled in environment' do
+    env = Environment.default
+    env.disable('use_portal_community')
+    env.save!
+
+    get :index
+    assert_no_tag :tag => 'div', :attributes => { :id => 'portal-news' }
+  end
+
+  should 'not display news from portal if environment doesnt have portal community' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    env.save!
+
+    get :index
+    assert_no_tag :tag => 'div', :attributes => { :id => 'portal-news' }
+  end
+
+  should 'display news from portal if enabled and has portal community' do
+    env = Environment.default
+    env.enable('use_portal_community')
+
+    c = Community.create!(:name => 'community test')
+    env.portal_community = c
+
+    env.save!
+
+    get :index
+    assert_tag :tag => 'div', :attributes => { :id => 'portal-news' } #, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
+  end
 end
@@ -228,6 +228,15 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal [ second ], Article.recent(nil)
   end
+  should 'accept extra conditions to find recent' do
+    p = create_user('usr1').person
+    Article.destroy_all
+    a1 = p.articles.create!(:name => 'first')
+    a2 = p.articles.create!(:name => 'second')
+
+    assert_equal [ a1 ], Article.recent(nil, :name => 'first')
+  end
+
   should 'require that subclasses define description' do
     assert_raise NotImplementedError do
       Article.description
@@ -707,4 +716,9 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal 'article-id-34-year-2009-month-04', a.cache_key(:year => '2009', :month => '04')
   end
+  should 'not be highlighted by default' do
+    a = Article.new
+    assert !a.highlighted
+  end
+
 end
@@ -117,4 +117,32 @@ class CommunityTest &lt; Test::Unit::TestCase
     assert ! community.errors.invalid?(:contact_phone)
   end
+  should 'return newest text articles as news' do
+    c = Community.create!(:name => 'test_com')
+    f = Folder.create!(:name => 'folder', :profile => c)
+    u = UploadedFile.create!(:profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    older_t = TinyMceArticle.create!(:name => 'old news', :profile => c)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c)
+    t_in_f = TinyMceArticle.create!(:name => 'news', :profile => c, :parent => f)
+
+    assert_equal [t_in_f, t], c.news(2)
+  end
+
+  should 'not return highlighted news when not asked' do
+    c = Community.create!(:name => 'test_com')
+    highlighted_t = TinyMceArticle.create!(:name => 'high news', :profile => c, :highlighted => true)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c)
+
+    assert_equal [t].map(&:slug), c.news(2).map(&:slug)
+  end
+
+  should 'return highlighted news when asked' do
+    c = Community.create!(:name => 'test_com')
+    highlighted_t = TinyMceArticle.create!(:name => 'high news', :profile => c, :highlighted => true)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c)
+
+    assert_equal [highlighted_t].map(&:slug), c.news(2, true).map(&:slug)
+  end
+
+
 end
@@ -716,4 +716,33 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_not_equal 'default', e.icon_theme
   end
+  should 'have a portal community' do
+    e = Environment.default
+    c = Community.create!(:name => 'portal community')
+
+    assert_respond_to e, :portal_community
+    e.portal_community = c; e.save!
+    e.reload
+
+    assert_equal c, e.portal_community
+  end
+
+  should 'have a set of portal folders' do
+    e = Environment.default
+
+    assert_respond_to e, :portal_folders
+    c = e.portal_community = Community.create!(:name => 'portal community')
+    news_folder = Folder.create!(:name => 'news folder', :profile => c)
+
+    e.portal_folders = [news_folder]
+    e.save!; e.reload
+
+    assert_equal [news_folder], e.portal_folders
+  end
+
+  should 'return empty array when no portal folders' do
+   e = Environment.default
+
+   assert_equal [], e.portal_folders
+  end
 end
@@ -107,4 +107,33 @@ class FolderTest &lt; ActiveSupport::TestCase
     assert_equal [image], f.images.paginate(:page => 2, :per_page => 1)
   end
+  should 'return newest text articles as news' do
+    c = Community.create!(:name => 'test_com')
+    folder = Folder.create!(:name => 'folder', :profile => c)
+    f = Folder.create!(:name => 'folder', :profile => c, :parent => folder)
+    u = UploadedFile.create!(:profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => folder)
+    older_t = TinyMceArticle.create!(:name => 'old news', :profile => c, :parent => folder)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c, :parent => folder)
+    t_in_f = TinyMceArticle.create!(:name => 'news', :profile => c, :parent => f)
+
+    assert_equal [t], folder.news(1)
+  end
+
+  should 'not return highlighted news when not asked' do
+    c = Community.create!(:name => 'test_com')
+    folder = Folder.create!(:name => 'folder', :profile => c)
+    highlighted_t = TinyMceArticle.create!(:name => 'high news', :profile => c, :highlighted => true, :parent => folder)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c, :parent => folder)
+
+    assert_equal [t].map(&:slug), folder.news(2).map(&:slug)
+  end
+
+  should 'return highlighted news when asked' do
+    c = Community.create!(:name => 'test_com')
+    folder = Folder.create!(:name => 'folder', :profile => c)
+    highlighted_t = TinyMceArticle.create!(:name => 'high news', :profile => c, :highlighted => true, :parent => folder)
+    t = TinyMceArticle.create!(:name => 'news', :profile => c, :parent => folder)
+
+    assert_equal [highlighted_t].map(&:slug), folder.news(2, true).map(&:slug)
+  end
 end
	@@ -34,4 +34,33 @@ class AdminPanelController < AdminController		@@ -34,4 +34,33 @@ class AdminPanelController < AdminController
34	end	34	end
35	redirect_to :action => 'manage_templates'	35	redirect_to :action => 'manage_templates'
36	end	36	end
		37	+
		38	+ def set_portal_community
		39	+ env = environment
		40	+ @portal_community = env.portal_community \|\| Community.new
		41	+ if request.post?
		42	+ portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
		43	+ if portal_community
		44	+ env.portal_community = portal_community
		45	+ env.save
		46	+ redirect_to :action => 'set_portal_folders'
		47	+ else
		48	+ flash[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
		49	+ end
		50	+ end
		51	+ end
		52	+
		53	+ def set_portal_folders
		54	+ @portal_folders = environment.portal_community.articles.find_all_by_type('Folder')
		55	+ if request.post?
		56	+ env = environment
		57	+ folders = params[:folders].map{\|fid\| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})}
		58	+ env.portal_folders = folders
		59	+ if env.save
		60	+ flash[:notice] = _('Saved the portal folders')
		61	+ redirect_to :action => 'index'
		62	+ end
		63	+ end
		64	+ @selected = (environment.portal_folders \|\| []).map(&:id)
		65	+ end
37	end	66	end
1	class HomeController < PublicController	1	class HomeController < PublicController
2		2
3	def index	3	def index
		4	+ @has_news = false
		5	+ if environment.enabled?('use_portal_community') && environment.portal_community
		6	+ @has_news = true
		7	+ @news_cache_key = "home_page_news_#{environment.id.to_s}"
		8	+ if !read_fragment(@news_cache_key)
		9	+ portal_community = environment.portal_community
		10	+ @portal_news = portal_community.news(5)
		11	+ @highlighted_news = portal_community.news(2, true)
		12	+ @area_news = environment.portal_folders
		13	+ end
		14	+ end
4	end	15	end
5		16
6	end	17	end
	@@ -41,4 +41,7 @@ class Community < Organization		@@ -41,4 +41,7 @@ class Community < Organization
41	environment.community_template	41	environment.community_template
42	end	42	end
43		43
		44	+ def news(limit = 30, highlight = false)
		45	+ recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
		46	+ end
44	end	47	end
	@@ -47,6 +47,7 @@ class Environment < ActiveRecord::Base		@@ -47,6 +47,7 @@ class Environment < ActiveRecord::Base
47	'media_panel' => _('Media panel in WYSIWYG editor'),	47	'media_panel' => _('Media panel in WYSIWYG editor'),
48	'select_preferred_domain' => _('Select preferred domains per profile'),	48	'select_preferred_domain' => _('Select preferred domains per profile'),
49	'display_wizard_signup' => _('Display wizard signup'),	49	'display_wizard_signup' => _('Display wizard signup'),
		50	+ 'use_portal_community' => _('Use the portal as news source for front page'),
50	}	51	}
51	end	52	end
52		53
	@@ -539,6 +540,26 @@ class Environment < ActiveRecord::Base		@@ -539,6 +540,26 @@ class Environment < ActiveRecord::Base
539	settings[:replace_enterprise_template_when_enable] = value	540	settings[:replace_enterprise_template_when_enable] = value
540	end	541	end
541		542
		543	+ def portal_community
		544	+ Community[settings[:portal_community_identifier]]
		545	+ end
		546	+
		547	+ def portal_community=(value)
		548	+ settings[:portal_community_identifier] = value.identifier
		549	+ end
		550	+
		551	+ def is_portal_community?(profile)
		552	+ portal_community == profile
		553	+ end
		554	+
		555	+ def portal_folders
		556	+ (settings[:portal_folders] \|\| []).map{\|fid\| Folder.find(:first, :conditions => {:profile_id => portal_community.id, :id => fid})}
		557	+ end
		558	+
		559	+ def portal_folders=(folders)
		560	+ settings[:portal_folders] = folders.map(&:id)
		561	+ end
		562	+
542	after_create :create_templates	563	after_create :create_templates
543		564
544	def create_templates	565	def create_templates
	@@ -2,5 +2,4 @@		@@ -2,5 +2,4 @@
2	class TextArticle < Article	2	class TextArticle < Article
3		3
4	xss_terminate :only => [ :name, :abstract, :body ]	4	xss_terminate :only => [ :name, :abstract, :body ]
5	-
6	end	5	end
	@@ -13,4 +13,5 @@		@@ -13,4 +13,5 @@
13	<li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>	13	<li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>
14	<li><%= link_to _('Edit Templates'), :action => 'edit_templates' %></li>	14	<li><%= link_to _('Edit Templates'), :action => 'edit_templates' %></li>
15	<li><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></li>	15	<li><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></li>
		16	+ <li><%= link_to _('Set Portal'), :action => 'set_portal_community' %></li>
16	</ul>	17	</ul>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<h1> <%= _('Set Environment Portal') %></h1>
	2	+
	3	+<% form_tag do %>
	4	+ <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
	5	+
	6	+ <% button_bar do %>
	7	+ <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' } %>
	8	+ <% end %>
	9	+<% end %>
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<h1><%= _('Select folders') %></h1>
	2	+
	3	+<p><%= _('Select what folder will hold the news for witch area of the initial page of the environment') %></p>
	4	+
	5	+<% form_tag do %>
	6	+ <% (1..4).each do \|i\| %>
	7	+ <%= labelled_select _('Area %d: ') % i, 'folders[]', :id, :name, @selected[i-1], @portal_folders %> <br>
	8	+ <% end %>
	9	+
	10	+ <% button_bar do %>
	11	+ <%= submit_button 'save', _('Save'), :cancel => {:action => 'index'} %>
	12	+ <% end %>
	13	+<% end %>
1	<%= f.text_field 'name', :size => '64' %>	1	<%= f.text_field 'name', :size => '64' %>
2	-
	@@ -11,6 +11,8 @@		@@ -11,6 +11,8 @@
11		11
12	<%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>	12	<%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
13		13
		14	+ <%= f.check_box(:highlighted) if environment.is_portal_community?(profile) %>
		15	+
14	<% button_bar do %>	16	<% button_bar do %>
15	<%= submit_button :save, _('Save') %>	17	<%= submit_button :save, _('Save') %>
16	<% end %>	18	<% end %>