Download as
Browse Code »

Commit 0d1b2d3f767f54a25eb4041551b17be2955de414

Authored by Daniela Feitosa
2 parents 1ceb891e 54e2f909
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable'

Showing 18 changed files with 94 additions and 19 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @0d1b2d3
... ... @@ -42,7 +42,8 @@ class ApplicationController < ActionController::Base
42 42 def set_locale
43 43 FastGettext.available_locales = Noosfero.available_locales
44 44 FastGettext.default_locale = Noosfero.default_locale
45   - I18n.locale = FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
  45 + FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
  46 + I18n.locale = FastGettext.locale
46 47 if params[:lang]
47 48 session[:lang] = params[:lang]
48 49 end
... ...
app/helpers/tags_helper.rb
  Diff comments   View file @0d1b2d3
... ... @@ -20,12 +20,12 @@ module TagsHelper
20 20 #
21 21 # <tt>options</tt> can include one or more of the following:
22 22 #
23   - # * <tt>:max_size</tt>: font size for the tag with largest count
24   - # * <tt>:min_size</tt>: font size for the tag with smallest count
  23 + # * <tt>:max_size</tt>: font size for the tag with largest count
  24 + # * <tt>:min_size</tt>: font size for the tag with smallest count
25 25 # * <tt>:show_count</tt>: whether to show the count of contents for each tag. Defauls to <tt>false</tt>.
26   - #
  26 + #
27 27 # The algorithm for generating the different sizes and positions is a
28   - # courtesy of Aurelio: http://www.colivre.coop.br/Aurium/Nuvem
  28 + # courtesy of Aurelio: http://www.colivre.coop.br/Aurium/Nuvem
29 29 # (pt_BR only).
30 30 def tag_cloud(tags, tagname_option, url, options = {})
31 31  
... ... @@ -41,7 +41,15 @@ module TagsHelper
41 41 max = tags.values.max.to_f
42 42 min = tags.values.min.to_f
43 43  
44   - tags.sort_by{ |k,v| k.downcase }.map do |tag,count|
  44 + # Uses iconv to translate utf8 strings to ascii.
  45 + # If can't translate a character, ignore it.
  46 + require 'iconv'
  47 + utf8_to_ascii = Iconv.new("ASCII//TRANSLIT//IGNORE","UTF8")
  48 + # Sorts first based on translated strings and then, if they are equal, based on the original form.
  49 + # This way variant characters falls on the same level as their base characters and don't end up
  50 + # at the end of the tag list.
  51 + # Example: AA ÁA AB Z instead of AA AB Z ÁA
  52 + tags.collect{ |k,v| [utf8_to_ascii.iconv(k).downcase, [k,v]] }.sort.collect { |ascii, t| t }.map do |tag,count|
45 53 if ( max == min )
46 54 v = 0.5
47 55 else
... ...
app/views/blocks/featured_products.rhtml
  Diff comments   View file @0d1b2d3
... ... @@ -14,7 +14,7 @@
14 14 <div class="featured-product-text">
15 15 <h3><%= p.name %></h3>
16 16 <p class="featured-product-price"><%= float_to_currency(p.price) %></p>
17   - <p class="featured-product-desc"><%= p.description.chars[0...50].to_s + '...' %></p>
  17 + <p class="featured-product-desc"><%= truncate(p.description, 50, '...') %></p>
18 18 <p><%= link_to _('See More'), product_path(p), :class => 'featured-product-link' %></p>
19 19 </div>
20 20 </div>
... ...
app/views/manage_products/_edit_info.rhtml
  Diff comments   View file @0d1b2d3
... ... @@ -21,6 +21,10 @@
21 21 <td class='formlabel'><%= _('Available') %></td>
22 22 <td class='formfield'><%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %></td>
23 23 </tr>
  24 + <tr>
  25 + <td><%= f.label :highlighted, _('Highlight this product?'), :class => 'formlabel' %></td>
  26 + <td class='formfield'><%= f.check_box(:highlighted) %></td>
  27 + </tr>
24 28 </table>
25 29  
26 30 <% if !environment.qualifiers.empty? %>
... ...
debian/changelog
  Diff comments   View file @0d1b2d3
  1 +noosfero (0.36.6) unstable; urgency=low
  2 +
  3 + * Bugfixes release
  4 +
  5 + -- Daniela Soares Feitosa <daniela@colivre.coop.br> Mon, 14 May 2012 22:05:26 -0300
  6 +
1 7 noosfero (0.36.5) unstable; urgency=low
2 8  
3 9 * Bugfixes release
... ...
debian/noosfero.install
  Diff comments   View file @0d1b2d3
... ... @@ -16,7 +16,7 @@ config/environment.rb usr/share/noosfero/config
16 16 config/environments usr/share/noosfero/config
17 17 config/initializers usr/share/noosfero/config
18 18 config/routes.rb usr/share/noosfero/config
19   -config/locales/ usr/share/noosfero/config
  19 +config/locales usr/share/noosfero/config
20 20  
21 21 plugins usr/share/noosfero
22 22  
... ...
features/featured_products_block.feature
  Diff comments   View file @0d1b2d3
... ... @@ -20,6 +20,7 @@ Feature: featured_products_block
20 20 | owner | category | name | description | highlighted |
21 21 | redemoinho | automobile | Car | Red Car | true |
22 22 | redemoinho | automobile | Truck | Blue Truck | true |
  23 + | redemoinho | automobile | Moto | Very long description of and auto-mobile moto to be truncated | true |
23 24 And I am logged in as "eddievedder"
24 25  
25 26 @selenium
... ... @@ -33,3 +34,14 @@ Feature: featured_products_block
33 34 Then I should see "Car"
34 35 And I should not see "float_to_currency"
35 36 And I should not see "product_path"
  37 +
  38 + @selenium
  39 + Scenario: display block with long description
  40 + Given I follow "Manage my groups"
  41 + And I follow "Control panel of this group"
  42 + And I follow "Edit sideboxes"
  43 + And I follow "Edit" within ".featured-products-block"
  44 + And I select "Moto"
  45 + And I press "Save"
  46 + When I am on redemoinho's homepage
  47 + Then I should see "Very long description of and auto-mobile moto to b..."
... ...
features/manage_products.feature
  Diff comments   View file @0d1b2d3
... ... @@ -526,3 +526,17 @@ Feature: manage products
526 526 And I follow "Delete qualifier"
527 527 And I press "Save"
528 528 Then I should not see "Organic (Self declared)"
  529 +
  530 + @selenium
  531 + Scenario: Show checkbox to mark product as highlight
  532 + Given the following product_category
  533 + | name |
  534 + | Bicycle |
  535 + And the following products
  536 + | owner | category | name |
  537 + | redemoinho | bicycle | Bike |
  538 + And I am logged in as "joaosilva"
  539 + When I go to Rede Moinho's page of product Bike
  540 + And I follow "Add price and other basic information"
  541 + Then I should see "Highlight this product?"
  542 + And I check "Highlight this product?"
... ...
features/session_and_cookies_handling.feature
  Diff comments   View file @0d1b2d3
... ... @@ -16,6 +16,15 @@ Feature: session and cookies handling
16 16 When I go to the homepage
17 17 Then there must be no cookies
18 18  
  19 + Scenario: user_data, not logged in
  20 + When I make a AJAX request to the user data path
  21 + Then there must be no cookies
  22 +
  23 + Scenario: user_data, logged in
  24 + Given I am logged in as admin
  25 + When I make a AJAX request to the user data path
  26 + Then there must be a cookie "_noosfero_session"
  27 +
19 28 # FIXME for some reason I could not test this scenario, although manual tests
20 29 # indicate this works!
21 30 # Scenario: logout
... ...
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @0d1b2d3
... ... @@ -576,3 +576,8 @@ end
576 576 Given /^the cache is turned (on|off)$/ do |state|
577 577 ActionController::Base.perform_caching = (state == 'on')
578 578 end
  579 +
  580 +When /^I make a AJAX request to (.*)$/ do |page|
  581 + header 'X-Requested-With', 'XMLHttpRequest'
  582 + visit(path_to(page))
  583 +end
... ...
features/support/paths.rb
  Diff comments   View file @0d1b2d3
... ... @@ -96,6 +96,9 @@ module NavigationHelpers
96 96 when /^chat$/
97 97 '/chat'
98 98  
  99 + when /the user data path/
  100 + '/account/user_data'
  101 +
99 102 # Add more mappings here.
100 103 # Here is a more fancy example:
101 104 #
... ...
lib/noosfero.rb
  Diff comments   View file @0d1b2d3
... ... @@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
2 2  
3 3 module Noosfero
4 4 PROJECT = 'noosfero'
5   - VERSION = '0.36.5'
  5 + VERSION = '0.36.6'
6 6  
7 7 def self.pattern_for_controllers_in_directory(dir)
8 8 disjunction = controllers_in_directory(dir).join('|')
... ...
plugins/google_cse/views/search-box.rhtml
  Diff comments   View file @0d1b2d3
1 1 <script type="text/javascript">
2 2 jQuery(function($) {
3 3 $('<%= locals[:selector] %>')
4   - .attr({class: "cse-search-box", action: "<%= GoogleCsePlugin.results_url_path %>"})
  4 + .attr({'class': "cse-search-box", 'action': "<%= GoogleCsePlugin.results_url_path %>"})
5 5 .append('<input type="hidden" name="cx" value="<%= locals[:plugin].google_id %>" /><input type="hidden" name="cof" value="FORID:10" /><input type="hidden" name="ie" value="UTF-8" /><input type="hidden" name="siteurl" value="<%= context.environment.default_hostname %>">')
6 6 .children("input[name='query']")
7 7 .attr('name', 'q')
... ...
public/designs/themes/base/style.css
  Diff comments   View file @0d1b2d3
... ... @@ -63,6 +63,10 @@ body, th, td, input {
63 63 background-color: white;
64 64 }
65 65  
  66 +.msie7 #wrap-2 {
  67 + height: 100%;
  68 +}
  69 +
66 70 #content {
67 71 margin-top: 105px;
68 72 }
... ... @@ -632,13 +636,6 @@ div#notice {
632 636 height: auto;
633 637 }
634 638  
635   -.communities-block .vcard a {
636   - clear: left;
637   - text-align: left;
638   - padding-bottom: 3px;
639   - width: 99%;
640   - height: auto;
641   -}
642 639 .msie7 .communities-block .common-profile-list-block .vcard a {
643 640 height: auto;
644 641 width: 99%;
... ...
script/quick-start-debian
  Diff comments   View file @0d1b2d3
... ... @@ -21,7 +21,7 @@ runtime_dependencies=$(sed -e &#39;1,/^Depends:/d; /^Recommends:/,$ d; s/([^)]*)//g;
21 21 run sudo apt-get -y install $runtime_dependencies
22 22  
23 23 # needed for development
24   -run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb
  24 +run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
25 25 run gem install bundler
26 26 run bundle install
27 27  
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @0d1b2d3
... ... @@ -334,6 +334,12 @@ class ApplicationControllerTest &lt; ActionController::TestCase
334 334 assert_tag :html, :attributes => { :lang => 'es' }
335 335 end
336 336  
  337 + should 'set Rails locale correctly' do
  338 + @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR,pt;q=0.8,en;q=0.6,en-US;q=0.4'
  339 + get :index
  340 + assert_equal 'pt', I18n.locale.to_s
  341 + end
  342 +
337 343 should 'include stylesheets supplied by plugins' do
338 344 class Plugin1 < Noosfero::Plugin
339 345 def stylesheet?
... ...
test/unit/tags_helper_test.rb
  Diff comments   View file @0d1b2d3
... ... @@ -18,4 +18,14 @@ class TagsHelperTest &lt; ActiveSupport::TestCase
18 18 assert_equal %w(aTag beTag tag1 Tag2 Tag3).join("\n"), result
19 19 end
20 20  
  21 + should 'order tags alphabetically with special characters' do
  22 + result = tag_cloud(
  23 + { 'aula'=>9, 'área'=>2, 'area'=>2, 'avião'=>2, 'armário'=>2,
  24 + 'A'=>1, 'Á'=>1, 'AB'=>1, 'ÁA'=>1 },
  25 + :id,
  26 + { :host=>'noosfero.org', :controller=>'test', :action=>'tag' }
  27 + )
  28 + assert_equal %w(A Á ÁA AB area área armário aula avião).join("\n"), result
  29 + end
  30 +
21 31 end
... ...
vendor/plugins/noosfero_caching/init.rb
  Diff comments   View file @0d1b2d3
... ... @@ -27,7 +27,7 @@ module NoosferoHttpCaching
27 27 end
28 28  
29 29 def noosfero_session_check
30   - return if params[:controller] == 'account' || request.xhr?
  30 + return if (params[:controller] == 'account' && params[:action] != 'user_data')
31 31 headers["X-Noosfero-Auth"] = (session[:user] != nil).to_s
32 32 end
33 33  
... ...