Download as
Browse Code »

Commit 407767bb33201c9dea8825d666c13d389e462df0

Authored by Rodrigo Souto
1 parent a4f93f99
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

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 769  
770 770 serialize :languages
771 771  
  772 + before_validation do |environment|
  773 + environment.default_language = nil if environment.default_language.blank?
  774 + end
  775 +
772 776 validate :default_language_available
773 777 validate :languages_available
774 778  
... ...
app/views/admin_panel/_site_info.rhtml
  Diff comments   View file @407767b
1 1 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
2 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 16 <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
... ...