diff --git a/app/models/my_network_block.rb b/app/models/my_network_block.rb index 208a3d2..2dd7cf3 100644 --- a/app/models/my_network_block.rb +++ b/app/models/my_network_block.rb @@ -14,10 +14,14 @@ class MyNetworkBlock < Block block_title(title) + content_tag( 'ul', - content_tag('li', link_to(n_( 'One article published', '%d articles published', owner.articles.count) % owner.articles.count, owner.public_profile_url.merge(:action => 'sitemap') )) + - content_tag('li', link_to(n__('One friend', '%d friends', owner.friends.count) % owner.friends.count, owner.public_profile_url.merge(:action => 'friends'))) + - content_tag('li', link_to(n__('One community', '%d communities', owner.communities.size) % owner.communities.size, owner.public_profile_url.merge(:action => 'communities'))) + - content_tag('li', link_to(n_('One tag', '%d tags', owner.tags.size) % owner.tags.size, owner.public_profile_url.merge(:action => 'tags'))) + content_tag('li', link_to(n_( 'One article published', '%s articles published', owner.articles.count) % + content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') )) + + content_tag('li', link_to(n__('One friend', '%s friends', owner.friends.count) % + content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends'))) + + content_tag('li', link_to(n__('One community', '%s communities', owner.communities.size) % + content_tag('b', owner.communities.size), owner.public_profile_url.merge(:action => 'communities'))) + + content_tag('li', link_to(n_('One tag', '%s tags', owner.tags.size) % + content_tag('b', owner.tags.size), owner.public_profile_url.merge(:action => 'tags'))) ) end diff --git a/public/designs/themes/zen3/stylesheets/blocks/link-list-block.css b/public/designs/themes/zen3/stylesheets/blocks/link-list-block.css index 9232d28..24d01a3 100644 --- a/public/designs/themes/zen3/stylesheets/blocks/link-list-block.css +++ b/public/designs/themes/zen3/stylesheets/blocks/link-list-block.css @@ -1,4 +1,21 @@ #content .link-list-block li { - border: 1px solid #CE5C00; - background: #FCAF3E; + border: 1px solid #A20; + background: #FCAF3E url("../../images/menu-bg.png"); + white-space: nowrap; + overflow: hidden; + width: 95%; /* workarround bug for MSIE */ } +#content .link-list-block li:hover { + background-position: 0% 95%; +} + +#content .link-list-block li a { + color: #600; +} +#content .link-list-block li a:visited { + color: #900; +} +#content .link-list-block li:hover a { + color: #FC6; +} + diff --git a/public/stylesheets/blocks/link-list-block.css b/public/stylesheets/blocks/link-list-block.css index f54b3f3..7f43980 100644 --- a/public/stylesheets/blocks/link-list-block.css +++ b/public/stylesheets/blocks/link-list-block.css @@ -18,7 +18,6 @@ #content .link-list-block { padding: 10px 20px 10px 10px; - } .link-list-block ul { @@ -35,4 +34,5 @@ .link-list-block a { text-decoration: none; + display: block; } diff --git a/test/unit/my_network_block_test.rb b/test/unit/my_network_block_test.rb index bee7579..10f6ed3 100644 --- a/test/unit/my_network_block_test.rb +++ b/test/unit/my_network_block_test.rb @@ -25,7 +25,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase owner.stubs(:tags).returns({}) # don't let tags call articles mock_articles.stubs(:count).returns(5) - assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '5 articles published', :attributes => { :href => /\/profile\/testuser\/sitemap$/ } } + assert_tag_in_string block.content, :tag => 'li', :descendant => { + :tag => 'a', + :descendant => { :tag => 'b', :content => '5' }, + :content => ' articles published', + :attributes => { :href => /\/profile\/testuser\/sitemap$/ } + } end should 'count friends' do @@ -33,7 +38,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase owner.stubs(:friends).returns(mock_friends) mock_friends.stubs(:count).returns(8) - assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '8 friends', :attributes => { :href => /\profile\/testuser\/friends/ }} + assert_tag_in_string block.content, :tag => 'li', :descendant => { + :tag => 'a', + :descendant => { :tag => 'b', :content => '8' }, + :content => ' friends', + :attributes => { :href => /\profile\/testuser\/friends/ } + } end should 'count communities' do @@ -41,7 +51,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase owner.stubs(:communities).returns(mock_communities) mock_communities.stubs(:size).returns(23) - assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '23 communities', :attributes => { :href => /\profile\/testuser\/communities/ }} + assert_tag_in_string block.content, :tag => 'li', :descendant => { + :tag => 'a', + :descendant => { :tag => 'b', :content => '23' }, + :content => ' communities', + :attributes => { :href => /\profile\/testuser\/communities/ } + } end should 'count tags' do @@ -49,7 +64,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase owner.stubs(:tags).returns(mock_tags) mock_tags.stubs(:size).returns(436) - assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '436 tags', :attributes => { :href => /\profile\/testuser\/tags/ }} + assert_tag_in_string block.content, :tag => 'li', :descendant => { + :tag => 'a', + :descendant => { :tag => 'b', :content => '436' }, + :content => ' tags', + :attributes => { :href => /\profile\/testuser\/tags/ } + } end should 'display its title' do -- libgit2 0.21.2