Download as
Browse Code »

Commit f51b6082b49021f41faff079410fdb463a2bc478

Authored by Aurelio A. Heckert
Committed by Joenio Costa
1 parent 6c1289d2
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Order tags alphabetically 

(ActionItem1325)
Showing 4 changed files with 27 additions and 2 deletions   Show diff stats
app/helpers/tags_helper.rb
  Diff comments   View file @f51b608
@@ -28,7 +28,6 @@ module TagsHelper @@ -28,7 +28,6 @@ module TagsHelper
28 # courtesy of Aurelio: http://www.colivre.coop.br/Aurium/Nuvem 28 # courtesy of Aurelio: http://www.colivre.coop.br/Aurium/Nuvem
29 # (pt_BR only). 29 # (pt_BR only).
30 def tag_cloud(tags, tagname_option, url, options = {}) 30 def tag_cloud(tags, tagname_option, url, options = {})
31 -  
32 31
33 return content_tag('em', _('No tags yet.')) + 32 return content_tag('em', _('No tags yet.')) +
34 ' <a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') + 33 ' <a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
@@ -42,7 +41,7 @@ module TagsHelper @@ -42,7 +41,7 @@ module TagsHelper
42 max = tags.values.max.to_f 41 max = tags.values.max.to_f
43 min = tags.values.min.to_f 42 min = tags.values.min.to_f
44 43
45 - tags.map do |tag,count| 44 + tags.sort_by{ |k,v| k.downcase }.map do |tag,count|
46 if ( max == min ) 45 if ( max == min )
47 v = 0.5 46 v = 0.5
48 else 47 else
public/designs/themes/base/style.css
  Diff comments   View file @f51b608
@@ -666,6 +666,7 @@ div#notice { @@ -666,6 +666,7 @@ div#notice {
666 666
667 .tag_cloud a { 667 .tag_cloud a {
668 text-decoration: none; 668 text-decoration: none;
  669 + white-space: nowrap;
669 } 670 }
670 671
671 .tag_cloud a small { 672 .tag_cloud a small {
test/unit/tags_block_test.rb
  Diff comments   View file @f51b608
@@ -37,4 +37,8 @@ class TagsBlockTest &lt; Test::Unit::TestCase @@ -37,4 +37,8 @@ class TagsBlockTest &lt; Test::Unit::TestCase
37 assert_match /profile\/testinguser\/tags\/first-tag/, block.content 37 assert_match /profile\/testinguser\/tags\/first-tag/, block.content
38 end 38 end
39 39
  40 + should 'order tags alphabetically' do
  41 + assert /\/first-tag".*\/second-tag".*\/third-tag"/m =~ block.content
  42 + end
  43 +
40 end 44 end
test/unit/tags_helper_test.rb 0 → 100644
  Diff comments   View file @f51b608
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class TagsHelperTest < Test::Unit::TestCase
  4 +
  5 + include ApplicationHelper
  6 + include TagsHelper
  7 + include ActionController::UrlWriter
  8 +
  9 + def h(s); s; end
  10 + def link_to(text, *args); text; end
  11 +
  12 + should 'order tags alphabetically' do
  13 + result = tag_cloud(
  14 + { 'tag1'=>9, 'Tag3'=>2, 'Tag2'=>2, 'aTag'=>2, 'beTag'=>2 },
  15 + :id,
  16 + { :host=>'noosfero.org', :controller=>'test', :action=>'tag' }
  17 + )
  18 + assert_equal %w(aTag beTag tag1 Tag2 Tag3).join("\n"), result
  19 + end
  20 +
  21 +end