Download as
Browse Code »

Commit 2e89b8666c4c944c6ab34e9a775c2c294b7184e8

Authored by Daniela Feitosa
1 parent 0c29ae21
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

Added labelled_checkbox 

(ActionItem1717)
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @2e89b86
@@ -882,7 +882,8 @@ module ApplicationHelper @@ -882,7 +882,8 @@ module ApplicationHelper
882 end 882 end
883 883
884 def profile_field_privacy_selector(profile, name) 884 def profile_field_privacy_selector(profile, name)
885 - profile.public? ? content_tag('div', check_box_tag('profile_data[fields_privacy][' + name + ']', 'public', profile.public_fields.include?(name)) + label_tag('profile_data_fields_privacy_' + name, _('Public')), :class => 'field-privacy-selector') : '' 885 + return '' unless profile.public?
  886 + content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector')
886 end 887 end
887 888
888 def template_stylesheet_path 889 def template_stylesheet_path
app/helpers/profile_editor_helper.rb
  Diff comments   View file @2e89b86
@@ -146,8 +146,8 @@ module ProfileEditorHelper @@ -146,8 +146,8 @@ module ProfileEditorHelper
146 end 146 end
147 147
148 def unchangeable_privacy_field(profile) 148 def unchangeable_privacy_field(profile)
149 - if profile.public?  
150 - check_box_tag('', '', true, :disabled => true) + ' ' + _('Public') 149 + if profile.public?
  150 + labelled_check_box(_('Public'), '', '', true, :disabled => true)
151 else 151 else
152 '' 152 ''
153 end 153 end