Merge branch 'rails235' into AI3037-block_filter_user

Joenio Costa
2 parents 76f04045 a58a143f
Showing 23 changed files with 405 additions and 56 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/search_controller.rb
app/helpers/token_helper.rb
app/models/event.rb
app/models/link_list_block.rb
app/views/box_organizer/_link_list_block.rhtml
app/views/content_viewer/view_page.rhtml
app/views/events/_events.rhtml
features/comment.feature
features/events.feature
public/designs/themes/base/style.css
public/images/drag-and-drop.png
public/javascripts/application.js
public/javascripts/comment_order.js
public/javascripts/edit-link-list.js
public/stylesheets/application.css
test/functional/environment_design_controller_test.rb
test/functional/events_controller_test.rb
@@ -80,6 +80,22 @@ class BoxOrganizerController &lt; ApplicationController
     render :action => 'edit', :layout => false
   end
+  def search_autocomplete
+    if request.xhr? and params[:query]
+      search = params[:query]
+      path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
+        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+      elsif boxes_holder.is_a?(Profile)
+        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+      else
+        []
+      end
+      render :json => path_list.to_json
+    else
+      redirect_to "/"
+    end
+  end
+
   def save
     @block = boxes_holder.blocks.find(params[:id])
     @block.update_attributes(params[:block])
@@ -111,6 +111,15 @@ class ContentViewerController &lt; ApplicationController
     @comments = @plugins.filter(:unavailable_comments, @comments)
     @comments_count = @comments.count
     @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+
+    if request.xhr? and params[:comment_order]
+      if @comment_order == 'newest'
+        @comments = @comments.reverse
+      end
+
+      return render :partial => 'comment/comment', :collection => @comments
+    end
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
@@ -7,11 +7,11 @@ class EventsController &lt; PublicController
     @date = build_date(params[:year], params[:month], params[:day])
     if !params[:year] && !params[:month] && !params[:day]
-      @events = profile.events.next_events_from_month(@date)
+      @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
-      @events = profile.events.by_month(@date)
+      @events = profile.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
@@ -29,4 +29,7 @@ class EventsController &lt; PublicController
   include EventsHelper
+  def per_page
+    20
+  end
 end
@@ -99,14 +99,14 @@ class SearchController &lt; PublicController
     @events = []
     if params[:day] || !params[:year] && !params[:month]
       @events = @category ?
-        environment.events.by_day(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_day(@date)
+        environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
       @events = @category ?
-        environment.events.by_month(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_month(@date)
+        environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
@@ -139,7 +139,7 @@ class SearchController &lt; PublicController
   def events_by_day
     @date = build_date(params[:year], params[:month], params[:day])
-    @events = environment.events.by_day(@date)
+    @events = environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     render :partial => 'events/events'
   end
@@ -224,4 +224,8 @@ class SearchController &lt; PublicController
     @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
+  def per_page
+    20
+  end
+
 end
@@ -27,7 +27,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
+        searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
         queryParam: #{name.to_json},
@@ -38,15 +38,12 @@ class Event &lt; Article
   named_scope :next_events_from_month, lambda { |date|
     date_temp = date.strftime("%Y-%m-%d")
     { :conditions => ["start_date >= ?","#{date_temp}"],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
   named_scope :by_month, lambda { |date|
-    date_temp = date.strftime("%Y-%m")
     { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
@@ -70,6 +70,8 @@ class LinkListBlock &lt; Block
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
+    elsif owner.is_a?(Environment) && owner.enabled?('use_portal_community') && owner.portal_community
+      address.gsub('{portal}', owner.portal_community.identifier)
     else
       address
     end
+<%= javascript_include_tag "edit-link-list.js" %>
+
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
-<table id='links' class='noborder'>
-  <tr>
-    <th><%= _('Icon') %></th>
-    <th><%= _('Name') %></th>
-    <th><%= _('Address') %></th>
-    <th><%= _('Title') %></th>
-    <th><%= _('Target') %></th>
-  </tr>
-  <% for link in @block.links do %>
-  <tr>
-    <td><%= icon_selector(link['icon']) %></td>
-    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
-    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
-  </tr>
-  <% end %>
-</table>
+  <ul class='link-list-header'>
+    <li class='link-list-icon'><%= _('Icon') %></li>
+    <li class='link-list-name'><%= _('Name') %></li>
+    <li class='link-list-address'><%= _('Address') %></li>
+    <li class='link-list-target'><%= _('Target') %></li>
+  </ul>
+  <ul id="dropable-link-list">
+    <% for link in @block.links do %>
+      <li>
+        <ul class="link-list-row">
+          <li>
+            <%= icon_selector(link['icon']) %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
+          </li>
+          <li>
+            <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+          </li>
+          <li>
+            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+  <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
 </div>
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'links', content_tag('tr',
-      content_tag('td', icon_selector('ok')) +
-      content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
-      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+    page.insert_html :bottom, 'dropable-link-list', content_tag('li',
+      content_tag('ul',
+        content_tag('li', icon_selector('ok')) +
+        content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
+        content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
+        content_tag('li', select_tag('block[links][][target]',
+        options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
+        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
+      :class=>"link-list-row new_link_row")
     ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+    javascript_tag("new_link_action()")
 end %>
@@ -80,8 +80,26 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments_count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
+
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if @page.accept_comments? and @comments.count > 1 %>
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
   <% end %>
   <ul class="article-comments-list">
-<%= list_events(@date, @events) %>
 \ No newline at end of file
+<%= list_events(@date, @events) %>
+
+<%= pagination_links @events, :param_name => 'page' %>
@@ -97,3 +97,41 @@ Feature: comment
     Given I am on /booking/article-to-comment
     And I follow "Post a comment"
     Then "Post a comment" should not be visible within "#article"
+
+  @selenium
+  Scenario: the newest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Newest first" from "comment_order" within ".comment-order"
+   Then I should see "Hello" within ".article-comment"
+
+  @selenium
+  Scenario: the oldest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Oldest first" from "comment_order" within ".comment-order"
+   Then I should see "Hi all" within ".article-comment"
 \ No newline at end of file
@@ -244,3 +244,38 @@ Feature: events
     Given I am on /profile/josesilva/events/2009/10
     When I follow "Oktoberfest"
     Then I should see "Oktoberfest"
+
+  Scenario: list events paginated for a specific profile for the month
+    Given I am logged in as admin
+    And the following users
+      | login      |
+      | josemanuel |
+    And I am logged in as "josemanuel"
+    And the following events
+      | owner      | name              | start_date |
+      | josemanuel | Event 5           | 2009-10-12 |
+      | josemanuel | Event 3           | 2009-10-15 |
+      | josemanuel | Test Event        | 2009-10-15 |
+      | josemanuel | Oktoberfest       | 2009-10-19 |
+      | josemanuel | WikiSym           | 2009-10-21 |
+      | josemanuel | Free Software     | 2009-10-22 |
+      | josemanuel | Rachel Birthday   | 2009-10-23 |
+      | josemanuel | Manuel Birthday   | 2009-10-24 |
+      | josemanuel | Michelle Birthday | 2009-10-25 |
+      | josemanuel | Lecture Allien 10 | 2009-10-26 |
+      | josemanuel | Lecture Allien 11 | 2009-10-26 |
+      | josemanuel | Lecture Allien 12 | 2009-10-26 |
+      | josemanuel | Lecture Allien 13 | 2009-10-26 |
+      | josemanuel | Lecture Allien 14 | 2009-10-26 |
+      | josemanuel | Lecture Allien 15 | 2009-10-26 |
+      | josemanuel | Lecture Allien 16 | 2009-10-26 |
+      | josemanuel | Lecture Allien 17 | 2009-10-26 |
+      | josemanuel | Lecture Allien 18 | 2009-10-26 |
+      | josemanuel | Lecture Allien 19 | 2009-10-26 |
+      | josemanuel | Lecture Allien 20 | 2009-10-26 |
+      | josemanuel | Party On          | 2009-10-27 |
+
+    When I am on /profile/josemanuel/events/2009/10
+    Then I should not see "Party On" within "#agenda-items"
+    When I follow "Next"
+    Then I should see "Party On" within "#agenda-items"
@@ -1275,6 +1275,11 @@ hr.pre-posts, hr.sep-posts {
   padding-right: 9px;
 }
+.comment-order {
+  float: right;
+  display: block;
+}
+
 .comment-from-owner .comment-created-at {
   color: #333;
 }
@@ -1101,4 +1101,4 @@ jQuery(document).ready(function(){
   jQuery("#article_has_terms_of_use").click(function(){
     showHideTermsOfUse();
   });
-});
 \ No newline at end of file
+});
@@ -0,0 +1,21 @@
+function send_order(order, url) {
+  open_loading(DEFAULT_LOADING_MESSAGE);
+
+  jQuery.ajax({
+    url:url,
+    data: {"comment_order":order},
+    success: function(response) {
+      close_loading();
+      jQuery(".article-comments-list").html(response);
+    },
+    error: function() { close_loading() }
+  });
+}
+
+
+jQuery(document).ready(function(){
+  jQuery("#comment_order").change(function(){
+    var url = jQuery("#page_url").val();
+    send_order(this.value, url);
+  });
+});
 \ No newline at end of file
@@ -0,0 +1,39 @@
+function send_ajax(source_url) {
+  jQuery(".link-address").autocomplete({
+    source : function(request, response){
+      jQuery.ajax({
+        type: "GET",
+        url: source_url,
+        data: {query: request.term},
+        success: function(result){
+          response(result);
+        },
+        error: function(ajax, stat, errorThrown) {
+          console.log('Link not found : ' + errorThrown);
+        }
+      });
+    },
+
+    minLength: 3
+  });
+}
+
+function new_link_action(){
+  send_ajax(jQuery("#page_url").val());
+
+  jQuery(".delete-link-list-row").click(function(){
+    jQuery(this).parent().parent().remove();
+    return false;
+  });
+
+  jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
+}
+
+jQuery(document).ready(function(){
+  new_link_action();
+
+  jQuery("#dropable-link-list").sortable({
+    revert: true,
+    axis: "y"
+  });
+});
 \ No newline at end of file
@@ -1859,20 +1859,70 @@ a.button.disabled, input.disabled {
   text-decoration: none;
 }
 /* ==> blocks/link-list-block.css <<= */
-
 #edit-link-list-block {
-  width: 820px;
+  width: 620px;
+  position: relative;
+  left: -24px;
 }
-
-#edit-link-list-block table {
-  width: auto;
-  margin-bottom: 10px;
+.link-list-header {
+  width: 98%;
+  height: 25px;
+  padding: 10px 1px 10px 10px;
+  margin-bottom: 5px;
+  cursor: pointer;
 }
-#edit-link-list-block table .cel-address {
-  width: 220px;
+.link-list-header li {
+  list-style-type: none;
+  display: inline;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
 }
-#edit-link-list-block table .cel-address input {
-  width: 100%;
+#dropable-link-list {
+  padding-left: 23px;
+  margin-top: -12px;
+}
+#dropable-link-list li {
+  list-style-type: none;
+}
+.link-list-row {
+  line-height: 25px;
+  margin-bottom: 5px;
+  padding: 10px 1px 10px 10px;
+  cursor: pointer;
+  width: 97%;
+}
+.link-list-row:hover {
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
+  background-position: 98% 15px;
+}
+.link-list-row li {
+  list-style-type: none;
+  display: inline;
+  margin-left: 5px;
+}
+.link-list-row li div {
+  float: left;
+  margin-top: 4px;
+}
+.link-list-row li a {
+  line-height: 27px !important;
+  padding-right: 5px;
+}
+.link-list-icon {
+  margin-left: 14px;
+}
+.link-list-name {
+  margin-left: 40px;
+}
+.link-list-address {
+  margin-left: 90px;
+}
+.link-list-target {
+  margin-left: 77px;
+}
+.new_link_row li {
+  margin-left: 7px;
 }
 #content .link-list-block {
   padding: 10px 0px 10px 10px;
@@ -3561,9 +3611,10 @@ div#article-parent {
 }
 #agenda .agenda-calendar {
   width: 50%;
+  display: inline-block;
 }
 #agenda td, #agenda th {
-  padding: 15px;
+  padding: 10px;
   padding-right: 0px;
 }
 #agenda .agenda-calendar .previous-month td, #agenda .agenda-calendar .previous-month th, #agenda .agenda-calendar .next-month td, #agenda .agenda-calendar .next-month th {
@@ -3621,26 +3672,25 @@ div#article-parent {
   vertical-align: middle;
 }
 #agenda .agenda-calendar .current-month caption {
-  margin-bottom: 10px;
+  margin: 10px 0px;
 }
 #agenda #events-of-the-day {
-  position: absolute;
-  left: 50%;
   width: 45%;
-  top: 0px;
   height: 100%;
   padding-left: 20px;
+  display: inline-block;
+  vertical-align: top;
 }
 #agenda #events-of-the-day #agenda-items {
   display: block;
   overflow: auto;
   overflow-x: hidden;
-  height: 80%;
+  height: 250px;
   background: white;
   border: none;
 }
 #agenda-toolbar {
-  float: right;
+  text-align: right;
   font-variant: normal;
   font-weight: normal;
 }
@@ -3663,6 +3713,9 @@ h1#agenda-title {
   display: block;
   margin-top: 10px;
 }
+#agenda .pagination {
+  margin-top: 15px;
+}
 /* ==> public/stylesheets/controller_favorite_enterprises.css <== */
 /* ==> @import url(manage_contacts_list.css); <== */
@@ -379,4 +379,38 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'return a list of paths from portal related to the words used in the query search' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+    community = fast_create(Community, :environment_id => env)
+    env.portal_community = community
+    env.enable('use_portal_community')
+    env.save
+    @controller.stubs(:boxes_holder).returns(env)
+    article1 = fast_create(Article, :profile_id => community.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => community.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => community.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{portal}/"+article1.path), true
+    assert_equal json_response.include?("/{portal}/"+article2.path), true
+    assert_equal json_response.include?("/{portal}/"+article3.path), false
+  end
+
+  should 'return empty if portal not configured' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response, []
+  end
+
 end
@@ -38,4 +38,12 @@ class EventsControllerTest &lt; ActionController::TestCase
     assert_tag :tag =>'a', :attributes => {:href => "/profile/#{profile.identifier}/events/#{next_month.year}/#{next_month.month}"}, :content => next_month_name
   end
+  should 'see the events paginated' do
+    30.times do |i|
+      profile.events << Event.new(:name => "Lesson #{i}", :start_date => Date.today)
+    end
+    get :events, :profile => profile.identifier
+    assert_equal 20, assigns(:events).count
+  end
+
 end
@@ -325,6 +325,20 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
      :descendant => {:tag => 'option', :attributes => {:value => 'except_home_page'}}
   end
+  should 'return a list of paths related to the words used in the query search' do
+    article1 = fast_create(Article, :profile_id => @profile.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => @profile.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => @profile.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :profile => 'designtestuser' , :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{profile}/"+article1.path), true
+    assert_equal json_response.include?("/{profile}/"+article2.path), true
+    assert_equal json_response.include?("/{profile}/"+article3.path), false
+  end
   ######################################################
   # END - tests for BoxOrganizerController features
@@ -370,6 +370,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [ 'upcoming event 1' ], assigns(:searches)[:events][:results].map(&:name)
   end
+  should 'see the events paginated' do
+    30.times do |i|
+      create_event(person, :name => "Event #{i}",	:start_date => Date.today)
+    end
+    get :events
+    assert_equal 20, assigns(:events).count
+  end
+
   %w[ people enterprises articles events communities products ].each do |asset|
     should "render asset-specific template when searching for #{asset}" do
       get "#{asset}"
@@ -39,6 +39,32 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
+  should 'replace {portal} with environment portal identifier' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{portal}/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/portal-community/address'}
+  end
+
+  should 'not change address if no {portal} there' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/address'}
+  end
+
   should 'display options for icons' do
     l = LinkListBlock.new
     l.icons_options.each do |option|
	@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController		@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController
80	render :action => 'edit', :layout => false	80	render :action => 'edit', :layout => false
81	end	81	end
82		82
		83	+ def search_autocomplete
		84	+ if request.xhr? and params[:query]
		85	+ search = params[:query]
		86	+ path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
		87	+ boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }
		88	+ elsif boxes_holder.is_a?(Profile)
		89	+ boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }
		90	+ else
		91	+ []
		92	+ end
		93	+ render :json => path_list.to_json
		94	+ else
		95	+ redirect_to "/"
		96	+ end
		97	+ end
		98	+
83	def save	99	def save
84	@block = boxes_holder.blocks.find(params[:id])	100	@block = boxes_holder.blocks.find(params[:id])
85	@block.update_attributes(params[:block])	101	@block.update_attributes(params[:block])
	@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController		@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController
111	@comments = @plugins.filter(:unavailable_comments, @comments)	111	@comments = @plugins.filter(:unavailable_comments, @comments)
112	@comments_count = @comments.count	112	@comments_count = @comments.count
113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )	113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
		114	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
		115	+
		116	+ if request.xhr? and params[:comment_order]
		117	+ if @comment_order == 'newest'
		118	+ @comments = @comments.reverse
		119	+ end
		120	+
		121	+ return render :partial => 'comment/comment', :collection => @comments
		122	+ end
114		123
115	if params[:slideshow]	124	if params[:slideshow]
116	render :action => 'slideshow', :layout => 'slideshow'	125	render :action => 'slideshow', :layout => 'slideshow'
	@@ -27,7 +27,7 @@ module TokenHelper		@@ -27,7 +27,7 @@ module TokenHelper
27	hintText: #{options[:hint_text].to_json},	27	hintText: #{options[:hint_text].to_json},
28	noResultsText: #{options[:no_results_text].to_json},	28	noResultsText: #{options[:no_results_text].to_json},
29	searchingText: #{options[:searching_text].to_json},	29	searchingText: #{options[:searching_text].to_json},
30	- searchDelay: #{options[:serach_delay].to_json},	30	+ searchDelay: #{options[:search_delay].to_json},
31	preventDuplicates: #{options[:prevent_duplicates].to_json},	31	preventDuplicates: #{options[:prevent_duplicates].to_json},
32	backspaceDeleteItem: #{options[:backspace_delete_item].to_json},	32	backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
33	queryParam: #{name.to_json},	33	queryParam: #{name.to_json},
		1	+<%= javascript_include_tag "edit-link-list.js" %>
		2	+
1	<strong><%= _('Links') %></strong>	3	<strong><%= _('Links') %></strong>
2	<div id='edit-link-list-block'>	4	<div id='edit-link-list-block'>
3	-<table id='links' class='noborder'>
4	- <tr>
5	- <th><%= _('Icon') %></th>
6	- <th><%= _('Name') %></th>
7	- <th><%= _('Address') %></th>
8	- <th><%= _('Title') %></th>
9	- <th><%= _('Target') %></th>
10	- </tr>
11	- <% for link in @block.links do %>
12	- <tr>
13	- <td><%= icon_selector(link['icon']) %></td>
14	- <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
15	- <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
16	- <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
17	- <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
18	- </tr>
19	- <% end %>
20	-</table>	5	+ <ul class='link-list-header'>
		6	+ <li class='link-list-icon'><%= _('Icon') %></li>
		7	+ <li class='link-list-name'><%= _('Name') %></li>
		8	+ <li class='link-list-address'><%= _('Address') %></li>
		9	+ <li class='link-list-target'><%= _('Target') %></li>
		10	+ </ul>
		11	+ <ul id="dropable-link-list">
		12	+ <% for link in @block.links do %>
		13	+ <li>
		14	+ <ul class="link-list-row">
		15	+ <li>
		16	+ <%= icon_selector(link['icon']) %>
		17	+ </li>
		18	+ <li>
		19	+ <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
		20	+ </li>
		21	+ <li>
		22	+ <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
		23	+ </li>
		24	+ <li>
		25	+ <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
		26	+ </li>
		27	+ <li>
		28	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
		29	+ </li>
		30	+ </ul>
		31	+ </li>
		32	+ <% end %>
		33	+ </ul>
		34	+ <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
21	</div>	35	</div>
22		36
23	<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do \|page\|	37	<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do \|page\|
24	- page.insert_html :bottom, 'links', content_tag('tr',
25	- content_tag('td', icon_selector('ok')) +
26	- content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
27	- content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
28	- content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
29	- content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))	38	+ page.insert_html :bottom, 'dropable-link-list', content_tag('li',
		39	+ content_tag('ul',
		40	+ content_tag('li', icon_selector('ok')) +
		41	+ content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
		42	+ content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
		43	+ content_tag('li', select_tag('block[links][][target]',
		44	+ options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
		45	+ content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
		46	+ :class=>"link-list-row new_link_row")
30	) +	47	) +
31	- javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")	48	+ javascript_tag("new_link_action()")
32	end %>	49	end %>
	@@ -80,8 +80,26 @@		@@ -80,8 +80,26 @@
80	</h3>	80	</h3>
81	<% end %>	81	<% end %>
82		82
83	- <% if @page.accept_comments? && @comments.count > 1 %>	83	+ <% if @page.accept_comments? && @comments_count > 1 %>
84	<%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>	84	<%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
		85	+
		86	+ <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
		87	+ <%= javascript_include_tag "comment_order.js" %>
		88	+ <div class="comment-order">
		89	+ <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
		90	+ <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
		91	+ <% end %>
		92	+ </div>
		93	+ <% end %>
		94	+
		95	+ <% if @page.accept_comments? and @comments.count > 1 %>
		96	+ <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
		97	+ <%= javascript_include_tag "comment_order.js" %>
		98	+ <div class="comment-order">
		99	+ <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
		100	+ <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
		101	+ <% end %>
		102	+ </div>
85	<% end %>	103	<% end %>
86		104
87	<ul class="article-comments-list">	105	<ul class="article-comments-list">
1	-<%= list_events(@date, @events) %>
2	\ No newline at end of file	1	\ No newline at end of file
		2	+<%= list_events(@date, @events) %>
		3	+
		4	+<%= pagination_links @events, :param_name => 'page' %>
	@@ -97,3 +97,41 @@ Feature: comment		@@ -97,3 +97,41 @@ Feature: comment
97	Given I am on /booking/article-to-comment	97	Given I am on /booking/article-to-comment
98	And I follow "Post a comment"	98	And I follow "Post a comment"
99	Then "Post a comment" should not be visible within "#article"	99	Then "Post a comment" should not be visible within "#article"
		100	+
		101	+ @selenium
		102	+ Scenario: the newest post from a forum should be displayed first.
		103	+ Given the following users
		104	+ \| login \| name \|
		105	+ \| joaosilva \| Joao Silva \|
		106	+ And the following forums
		107	+ \| owner \| name \|
		108	+ \| joaosilva \| Forum \|
		109	+ And the following articles
		110	+ \| owner \| name \| parent \|
		111	+ \| joaosilva \| Post one \| Forum \|
		112	+ And the following comments
		113	+ \| article \| author \| title \| body \|
		114	+ \| Post one \| joaosilva \| Hi all \| Hi all \|
		115	+ \| Post one \| joaosilva \| Hello \| Hello \|
		116	+ When I go to /joaosilva/forum/post-one
		117	+ And I select "Newest first" from "comment_order" within ".comment-order"
		118	+ Then I should see "Hello" within ".article-comment"
		119	+
		120	+ @selenium
		121	+ Scenario: the oldest post from a forum should be displayed first.
		122	+ Given the following users
		123	+ \| login \| name \|
		124	+ \| joaosilva \| Joao Silva \|
		125	+ And the following forums
		126	+ \| owner \| name \|
		127	+ \| joaosilva \| Forum \|
		128	+ And the following articles
		129	+ \| owner \| name \| parent \|
		130	+ \| joaosilva \| Post one \| Forum \|
		131	+ And the following comments
		132	+ \| article \| author \| title \| body \|
		133	+ \| Post one \| joaosilva \| Hi all \| Hi all \|
		134	+ \| Post one \| joaosilva \| Hello \| Hello \|
		135	+ When I go to /joaosilva/forum/post-one
		136	+ And I select "Oldest first" from "comment_order" within ".comment-order"
		137	+ Then I should see "Hi all" within ".article-comment"
100	\ No newline at end of file	138	\ No newline at end of file
	@@ -244,3 +244,38 @@ Feature: events		@@ -244,3 +244,38 @@ Feature: events
244	Given I am on /profile/josesilva/events/2009/10	244	Given I am on /profile/josesilva/events/2009/10
245	When I follow "Oktoberfest"	245	When I follow "Oktoberfest"
246	Then I should see "Oktoberfest"	246	Then I should see "Oktoberfest"
		247	+
		248	+ Scenario: list events paginated for a specific profile for the month
		249	+ Given I am logged in as admin
		250	+ And the following users
		251	+ \| login \|
		252	+ \| josemanuel \|
		253	+ And I am logged in as "josemanuel"
		254	+ And the following events
		255	+ \| owner \| name \| start_date \|
		256	+ \| josemanuel \| Event 5 \| 2009-10-12 \|
		257	+ \| josemanuel \| Event 3 \| 2009-10-15 \|
		258	+ \| josemanuel \| Test Event \| 2009-10-15 \|
		259	+ \| josemanuel \| Oktoberfest \| 2009-10-19 \|
		260	+ \| josemanuel \| WikiSym \| 2009-10-21 \|
		261	+ \| josemanuel \| Free Software \| 2009-10-22 \|
		262	+ \| josemanuel \| Rachel Birthday \| 2009-10-23 \|
		263	+ \| josemanuel \| Manuel Birthday \| 2009-10-24 \|
		264	+ \| josemanuel \| Michelle Birthday \| 2009-10-25 \|
		265	+ \| josemanuel \| Lecture Allien 10 \| 2009-10-26 \|
		266	+ \| josemanuel \| Lecture Allien 11 \| 2009-10-26 \|
		267	+ \| josemanuel \| Lecture Allien 12 \| 2009-10-26 \|
		268	+ \| josemanuel \| Lecture Allien 13 \| 2009-10-26 \|
		269	+ \| josemanuel \| Lecture Allien 14 \| 2009-10-26 \|
		270	+ \| josemanuel \| Lecture Allien 15 \| 2009-10-26 \|
		271	+ \| josemanuel \| Lecture Allien 16 \| 2009-10-26 \|
		272	+ \| josemanuel \| Lecture Allien 17 \| 2009-10-26 \|
		273	+ \| josemanuel \| Lecture Allien 18 \| 2009-10-26 \|
		274	+ \| josemanuel \| Lecture Allien 19 \| 2009-10-26 \|
		275	+ \| josemanuel \| Lecture Allien 20 \| 2009-10-26 \|
		276	+ \| josemanuel \| Party On \| 2009-10-27 \|
		277	+
		278	+ When I am on /profile/josemanuel/events/2009/10
		279	+ Then I should not see "Party On" within "#agenda-items"
		280	+ When I follow "Next"
		281	+ Then I should see "Party On" within "#agenda-items"
	@@ -1101,4 +1101,4 @@ jQuery(document).ready(function(){		@@ -1101,4 +1101,4 @@ jQuery(document).ready(function(){
1101	jQuery("#article_has_terms_of_use").click(function(){	1101	jQuery("#article_has_terms_of_use").click(function(){
1102	showHideTermsOfUse();	1102	showHideTermsOfUse();
1103	});	1103	});
1104	-});
1105	\ No newline at end of file	1104	\ No newline at end of file
		1105	+});
	@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
		1	+function send_order(order, url) {
		2	+ open_loading(DEFAULT_LOADING_MESSAGE);
		3	+
		4	+ jQuery.ajax({
		5	+ url:url,
		6	+ data: {"comment_order":order},
		7	+ success: function(response) {
		8	+ close_loading();
		9	+ jQuery(".article-comments-list").html(response);
		10	+ },
		11	+ error: function() { close_loading() }
		12	+ });
		13	+}
		14	+
		15	+
		16	+jQuery(document).ready(function(){
		17	+ jQuery("#comment_order").change(function(){
		18	+ var url = jQuery("#page_url").val();
		19	+ send_order(this.value, url);
		20	+ });
		21	+});
0	\ No newline at end of file	22	\ No newline at end of file