Merge commit 'refs/merge-requests/236' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/236

Merge commit 'refs/merge-requests/236' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/236
Daniela Feitosa
2 parents f037897f 938c96a1
Showing 5 changed files with 39 additions and 42 deletions Show diff stats
app/helpers/article_helper.rb
app/helpers/folder_helper.rb
app/views/profile_editor/edit.rhtml
test/functional/cms_controller_test.rb
test/unit/cms_helper_test.rb
@@ -2,14 +2,19 @@ module ArticleHelper
   def custom_options_for_article(article)
     @article = article
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'))
+       )
+     ) +
     content_tag('h4', _('Options')) +
     content_tag('div',
-      content_tag(
-        'div',
-        check_box(:article, :published) +
-        content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) +
-
       (article.profile.has_members? ?
       content_tag(
         'div',
@@ -58,13 +58,20 @@ module FolderHelper
   def custom_options_for_article(article)
     @article = article
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'))
+       )
+     ) +
     content_tag('h4', _('Options')) +
     content_tag('div',
-      content_tag(
-        'div',
-        check_box(:article, :published) +
-        content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) + (article.can_display_hits? ?
+      (article.can_display_hits? ?
       content_tag(
         'div',
         check_box(:article, :display_hits) +
@@ -24,33 +24,16 @@
   <h2><%= _('Privacy options') %></h2>
   <% if profile.person? %>
-  <table>
-    <tr>
-      <th style='text-align: right;'>
-        <%= _('This profile is:') %>
-      </th>
-      <th>
-        <%= radio_button 'profile_data', 'public_profile', 'true' %>
-        <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
-      </th>
-      <th style='padding: 2px 10px 2px 2px;'>
-        <%= radio_button 'profile_data', 'public_profile', 'false' %>
-        <label for="profile_data_public_profile_false"><u><%= _('Private') %></u></label>
-      </th>
-    </tr>
-    <tr>
-      <td> <%= _('Activate Intranet access (restricted area only for me)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Include my contact in directory of people') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show my contents to all internet users') %> </td><td><%= _('Yes') %></td><td><%= _('No') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show my contents to my friends (person)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-  </table>
+    <div>
+      <%= radio_button 'profile_data', 'public_profile', 'true' %>
+      <%= content_tag('label', _('Public'), :for => 'profile_data_public_profile_true') %>
+      &mdash; show my contents to all internet users
+    </div>
+    <div>
+      <%= radio_button 'profile_data', 'public_profile', 'false' %>
+      <%= content_tag('label', _('Private'), :for => 'profile_data_public_profile_false') %>
+      &mdash; show my contents only to friends
+    </div>
   <% else %>
   <table>
     <tr>
@@ -570,15 +570,16 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'display published option' do
     get :edit, :profile => profile.identifier, :id => profile.home_page.id
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[published]', :checked => 'checked' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_true', :checked => 'checked' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_false' }
   end
   should "display properly a non-published articles' status" do
     article = profile.articles.create!(:name => 'test', :published => false)
     get :edit, :profile => profile.identifier, :id => article.id
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[published]' }
-    assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[published]', :checked => 'checked' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_true' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_false', :checked => 'checked' }
   end
   should 'be able to add image with alignment' do
@@ -10,7 +10,8 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   should 'show default options for article' do
     CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
     result = options_for_article(RssFeed.new(:profile => Profile.new))
-    assert_match /id="article_published" name="article\[published\]" type="checkbox" value="1"/, result
+    assert_match /id="article_published_true" name="article\[published\]" type="radio" value="true"/, result
+    assert_match /id="article_published_false" name="article\[published\]" type="radio" value="false"/, result
     assert_match /id="article_accept_comments" name="article\[accept_comments\]" type="checkbox" value="1"/, result
   end
	@@ -24,33 +24,16 @@		@@ -24,33 +24,16 @@
24	<h2><%= _('Privacy options') %></h2>	24	<h2><%= _('Privacy options') %></h2>
25		25
26	<% if profile.person? %>	26	<% if profile.person? %>
27	- <table>
28	- <tr>
29	- <th style='text-align: right;'>
30	- <%= _('This profile is:') %>
31	- </th>
32	- <th>
33	- <%= radio_button 'profile_data', 'public_profile', 'true' %>
34	- <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
35	- </th>
36	- <th style='padding: 2px 10px 2px 2px;'>
37	- <%= radio_button 'profile_data', 'public_profile', 'false' %>
38	- <label for="profile_data_public_profile_false"><u><%= _('Private') %></u></label>
39	- </th>
40	- </tr>
41	- <tr>
42	- <td> <%= _('Activate Intranet access (restricted area only for me)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
43	- </tr>
44	- <tr>
45	- <td> <%= _('Include my contact in directory of people') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
46	- </tr>
47	- <tr>
48	- <td> <%= _('Show my contents to all internet users') %> </td><td><%= _('Yes') %></td><td><%= _('No') %></td>
49	- </tr>
50	- <tr>
51	- <td> <%= _('Show my contents to my friends (person)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
52	- </tr>
53	- </table>	27	+ <div>
		28	+ <%= radio_button 'profile_data', 'public_profile', 'true' %>
		29	+ <%= content_tag('label', _('Public'), :for => 'profile_data_public_profile_true') %>
		30	+ — show my contents to all internet users
		31	+ </div>
		32	+ <div>
		33	+ <%= radio_button 'profile_data', 'public_profile', 'false' %>
		34	+ <%= content_tag('label', _('Private'), :for => 'profile_data_public_profile_false') %>
		35	+ — show my contents only to friends
		36	+ </div>
54	<% else %>	37	<% else %>
55	<table>	38	<table>
56	<tr>	39	<tr>