ActionItem696: enhancing my networks block

Joenio Costa
1 parent 6b8af367
Showing 11 changed files with 81 additions and 77 deletions Show diff stats
app/controllers/my_profile/profile_design_controller.rb
app/models/my_network_block.rb
app/views/blocks/my_network.rhtml
app/views/blocks/my_network/community.rhtml
app/views/blocks/my_network/enterprise.rhtml
app/views/blocks/my_network/organization.rhtml
app/views/blocks/my_network/person.rhtml
app/views/blocks/profile_info.rhtml
public/designs/themes/zen3/stylesheets/blocks/my-network-block.css
test/functional/profile_controller_test.rb
test/unit/my_network_block_test.rb
@@ -5,7 +5,7 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
   def available_blocks
-    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock ]
+    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock ]
     # blocks exclusive for organizations
     if profile.has_members?
@@ -16,7 +16,6 @@ class ProfileDesignController &lt; BoxOrganizerController
     if profile.person?
       blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
-      blocks << MyNetworkBlock
     end
     # product block exclusive for enterprises in environments that permits it
@@ -15,18 +15,13 @@ class MyNetworkBlock &lt; Block
   end
   def content
-    block_title(title) +
-    content_tag(
-      'ul',
-      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')))
-    )
+    block = self
+    lambda do
+      render :file => 'blocks/my_network', :locals => {
+        :title => block.title,
+        :owner => block.owner
+      }
+    end
   end
 end
@@ -0,0 +1,15 @@
+<%= block_title(title) %>
+
+<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
+
+<ul>
+  <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
+  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
+    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+  <% end %>
+</ul>
+
+<div class="my-network-actions">
+  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+</div>
@@ -0,0 +1,8 @@
+<ul>
+  <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') ) %></li>
+  <li><%= link_to(n_( 'One member', '%s members', owner.members.count) %
+  content_tag('b', owner.members.count), owner.public_profile_url.merge(:action => 'members') ) %></li>
+  <li><%= link_to(n_('One tag', '%s tags', owner.tags.size) %
+  content_tag('b', owner.tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
+</ul>
@@ -0,0 +1,10 @@
+<ul>
+  <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') ) %></li>
+  <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
+  content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
+  <li><%= link_to(n__('One community', '%s communities', owner.communities.size) %
+  content_tag('b', owner.communities.size), owner.public_profile_url.merge(:action => 'communities')) %></li>
+  <li><%= link_to(n_('One tag', '%s tags', owner.tags.size) %
+  content_tag('b', owner.tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
+</ul>
@@ -14,7 +14,6 @@
   </div>
 </div>
-
 <ul class="profile-info-data">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
@@ -37,7 +36,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => 'blocks/profile_info_actions/' +  block.owner.class.name.underscore %>
+  <%= render :file => 'blocks/profile_info_actions/' + block.owner.class.name.underscore %>
 </div>
 </div><!-- end class="vcard" -->
@@ -22,3 +22,16 @@
   color: #600;
 }
+
+.my-network-block .my-network-actions ul {
+  text-align: center;
+}
+
+.my-network-actions ul {
+  padding: 0;
+  padding-bottom: 10px;
+}
+
+.my-network-actions li {
+  list-style: none;
+}
@@ -143,19 +143,33 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
   should 'show a link to own control panel' do
     login_as(@profile.identifier)
     get :index, :profile => @profile.identifier
-    assert_tag :tag => 'ul', :attributes => { :class => 'profile-info-data' }, :descendant => { :tag => 'a', :content => 'Control panel' }
+    assert_tag :tag => 'a', :content => 'Control panel'
+  end
+
+  should 'show a link to own control panel in my-network-block if is a group' do
+    login_as(@profile.identifier)
+    community = Community.create!(:name => 'my test community')
+    community.blocks.each{|i| i.destroy}
+    community.boxes[0].blocks << MyNetworkBlock.new
+    community.add_admin(@profile)
+    get :index, :profile => community.identifier
+    assert_tag :tag => 'a', :content => 'Control panel'
   end
   should 'not show a link to others control panel' do
     login_as(@profile.identifier)
     other = create_user('person_1').person
+    other.blocks.each{|i| i.destroy}
+    other.boxes[0].blocks << ProfileInfoBlock.new
     get :index, :profile => other.identifier
     assert_no_tag :tag => 'ul', :attributes => { :class => 'profile-info-data' }, :descendant => { :tag => 'a', :content => 'Control panel' }
   end
-  should 'show a link to control panel if user has profile_editor permission' do
+  should 'show a link to control panel if user has profile_editor permission and is a group' do
     login_as(@profile.identifier)
-    get :index, :profile => @profile.identifier
+    community = Community.create!(:name => 'my test community')
+    community.add_admin(@profile)
+    get :index, :profile => community.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}" }, :content => 'Control panel'
   end
@@ -251,8 +265,9 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
   end
   should 'display "Site map" link for profiles' do
-    get :index, :profile => 'ze'
-    assert_tag :tag => 'a', :content => "Site map", :attributes => { :href => '/profile/ze/sitemap' }
+    profile = create_user('testmapuser').person
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'a', :content => "Site map", :attributes => { :href => '/profile/testmapuser/sitemap' }
   end
   should 'list top level articles in sitemap' do
@@ -19,62 +19,12 @@ class MyNetworkBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.new.default_title, MyNetworkBlock.new.default_title
   end
-  should 'count articles' do
-    mock_articles = mock
-    owner.stubs(:articles).returns(mock_articles)
-    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',
-      :descendant => { :tag => 'b', :content => '5' },
-      :content => ' articles published',
-      :attributes => { :href => /\/profile\/testuser\/sitemap$/ }
-    }
-  end
-
-  should 'count friends' do
-    mock_friends = mock
-    owner.stubs(:friends).returns(mock_friends)
-    mock_friends.stubs(:count).returns(8)
-
-    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
-    mock_communities = mock
-    owner.stubs(:communities).returns(mock_communities)
-    mock_communities.stubs(:size).returns(23)
-
-    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
-    mock_tags = mock
-    owner.stubs(:tags).returns(mock_tags)
-    mock_tags.stubs(:size).returns(436)
-
-    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
-    block.stubs(:title).returns('My Network')
-    assert_tag_in_string block.content, :content => 'My Network'
+  should 'display my-profile' do
+    self.expects(:render).with(:file => 'blocks/my_network', :locals => {
+        :title => 'My network',
+        :owner => owner
+    })
+    instance_eval(& block.content)
   end
 end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+<%= block_title(title) %>
	2	+
	3	+<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
	4	+
	5	+<ul>
	6	+ <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
	7	+ <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
	8	+ <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
	9	+ <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
	10	+ <% end %>
	11	+</ul>
	12	+
	13	+<div class="my-network-actions">
	14	+ <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
	15	+</div>
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<ul>
	2	+ <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
	3	+ content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
	4	+ <li><%= link_to(n_( 'One member', '%s members', owner.members.count) %
	5	+ content_tag('b', owner.members.count), owner.public_profile_url.merge(:action => 'members') ) %></li>
	6	+ <li><%= link_to(n_('One tag', '%s tags', owner.tags.size) %
	7	+ content_tag('b', owner.tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
	8	+</ul>
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+<ul>
	2	+ <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
	3	+ content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
	4	+ <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
	5	+ content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
	6	+ <li><%= link_to(n__('One community', '%s communities', owner.communities.size) %
	7	+ content_tag('b', owner.communities.size), owner.public_profile_url.merge(:action => 'communities')) %></li>
	8	+ <li><%= link_to(n_('One tag', '%s tags', owner.tags.size) %
	9	+ content_tag('b', owner.tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
	10	+</ul>
	@@ -22,3 +22,16 @@		@@ -22,3 +22,16 @@
22	color: #600;	22	color: #600;
23	}	23	}
24		24
		25	+
		26	+.my-network-block .my-network-actions ul {
		27	+ text-align: center;
		28	+}
		29	+
		30	+.my-network-actions ul {
		31	+ padding: 0;
		32	+ padding-bottom: 10px;
		33	+}
		34	+
		35	+.my-network-actions li {
		36	+ list-style: none;
		37	+}
	@@ -19,62 +19,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase		@@ -19,62 +19,12 @@ class MyNetworkBlockTest < ActiveSupport::TestCase
19	assert_not_equal Block.new.default_title, MyNetworkBlock.new.default_title	19	assert_not_equal Block.new.default_title, MyNetworkBlock.new.default_title
20	end	20	end
21		21
22	- should 'count articles' do
23	- mock_articles = mock
24	- owner.stubs(:articles).returns(mock_articles)
25	- owner.stubs(:tags).returns({}) # don't let tags call articles
26	- mock_articles.stubs(:count).returns(5)
27	-
28	- assert_tag_in_string block.content, :tag => 'li', :descendant => {
29	- :tag => 'a',
30	- :descendant => { :tag => 'b', :content => '5' },
31	- :content => ' articles published',
32	- :attributes => { :href => /\/profile\/testuser\/sitemap$/ }
33	- }
34	- end
35	-
36	- should 'count friends' do
37	- mock_friends = mock
38	- owner.stubs(:friends).returns(mock_friends)
39	- mock_friends.stubs(:count).returns(8)
40	-
41	- assert_tag_in_string block.content, :tag => 'li', :descendant => {
42	- :tag => 'a',
43	- :descendant => { :tag => 'b', :content => '8' },
44	- :content => ' friends',
45	- :attributes => { :href => /\profile\/testuser\/friends/ }
46	- }
47	- end
48	-
49	- should 'count communities' do
50	- mock_communities = mock
51	- owner.stubs(:communities).returns(mock_communities)
52	- mock_communities.stubs(:size).returns(23)
53	-
54	- assert_tag_in_string block.content, :tag => 'li', :descendant => {
55	- :tag => 'a',
56	- :descendant => { :tag => 'b', :content => '23' },
57	- :content => ' communities',
58	- :attributes => { :href => /\profile\/testuser\/communities/ }
59	- }
60	- end
61	-
62	- should 'count tags' do
63	- mock_tags = mock
64	- owner.stubs(:tags).returns(mock_tags)
65	- mock_tags.stubs(:size).returns(436)
66	-
67	- assert_tag_in_string block.content, :tag => 'li', :descendant => {
68	- :tag => 'a',
69	- :descendant => { :tag => 'b', :content => '436' },
70	- :content => ' tags',
71	- :attributes => { :href => /\profile\/testuser\/tags/ }
72	- }
73	- end
74	-
75	- should 'display its title' do
76	- block.stubs(:title).returns('My Network')
77	- assert_tag_in_string block.content, :content => 'My Network'	22	+ should 'display my-profile' do
		23	+ self.expects(:render).with(:file => 'blocks/my_network', :locals => {
		24	+ :title => 'My network',
		25	+ :owner => owner
		26	+ })
		27	+ instance_eval(& block.content)
78	end	28	end
79		29
80	end	30	end