Download as
Browse Code »

Commit 407767bb33201c9dea8825d666c13d389e462df0

Authored by Rodrigo Souto
1 parent a4f93f99
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

On the way of the interface...

Showing 2 changed files with 17 additions and 0 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @407767b
@@ -769,6 +769,10 @@ class Environment < ActiveRecord::Base @@ -769,6 +769,10 @@ class Environment < ActiveRecord::Base
769 769
770 serialize :languages 770 serialize :languages
771 771
  772 + before_validation do |environment|
  773 + environment.default_language = nil if environment.default_language.blank?
  774 + end
  775 +
772 validate :default_language_available 776 validate :default_language_available
773 validate :languages_available 777 validate :languages_available
774 778
app/views/admin_panel/_site_info.rhtml
  Diff comments   View file @407767b
1 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %> 1 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
2 <%= required f.text_field(:reports_lower_bound, :size => 3) %> 2 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
  3 +<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
  4 +<%= label_tag :languages, _('Available languages') %>
  5 +<br />
  6 +<% counter = 0 %>
  7 +<table>
  8 +<% Noosfero.locales.each do |value, name| %>
  9 + <%= "<tr>" if counter%3==0 %>
  10 + <% counter += 1 %>
  11 + <%= content_tag('td', labelled_check_box(name, "environment[languages][#{value}]", true, environment.available_locales.include?(value))) %>
  12 + <%= "</tr>" if counter%3==0 %>
  13 +<% end %>
  14 +</table>
  15 +<br />
3 <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %> 16 <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>