From f534e6ca7b30f8e639b59e78ea85926c1441b450 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 7 May 2012 15:55:45 +0800 Subject: [PATCH] Ray's changes for site_info --- app/assets/stylesheets/style.css.erb | 16 ++++++ app/helpers/application_helper.rb | 2 +- app/views/admin/sites/site_info.html.erb | 71 ++++++++++++++---------- 3 files changed, 58 insertions(+), 31 deletions(-) diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 06d56c70d..b4410a47f 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -636,6 +636,22 @@ .adbanner-action { margin-bottom: 20px; } +.textarea-height-s { + resize: none; + max-height: 150px; +} +.textarea-height-m { + resize: none; + max-height: 250px; +} +.textarea-height-l { + resize: none; + max-height: 350px; +} +.textarea-height-xl { + resize: none; + max-height: 500px; +} [class^="icons-"] { display: inline-block; width: 16px; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8829dfef2..ffb0d8570 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -150,7 +150,7 @@ module ApplicationHelper end def active_when_current_locale_eq(locale) - locale.to_sym == I18n.locale ? 'active': '' + locale.to_sym == I18n.locale ? 'active in': '' end end diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index 93e1a3583..a29eccb3d 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -1,4 +1,5 @@ -<%= form_for @site, :url => admin_site_path(@site) do |f| %> +
+<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
-
+
<% @site_valid_locales.each do |locale|%> - <%= content_tag :div, :class => "tab-pane #{active_when_current_locale_eq locale}", :id => "#{locale}" do %> -
- <%= t :title %> - <%= f.fields_for :title, @site.title do |f| %> - <%= f.text_field locale %> - <% end %> + <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale}", :id => "#{locale}" do %> +
+ +
+ <%= f.fields_for :title, @site.title do |f| %> + <%= f.text_field locale, :class => "input-xxlarge" %> + <% end %> +

In addition to freeform text, any HTML5 text-based input appears like so.

+
-
- <%= t :keywords %> - <%= f.fields_for :keywords, @site.keywords do |f| %> - <%= f.text_field locale %> - <% end %> +
+ +
+ <%= f.fields_for :keywords, @site.keywords do |f| %> + <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> + <% end %> +

In addition to freeform text, any HTML5 text-based input appears like so.

+
-
- <%= t :description %> - <%= f.fields_for :description, @site.description do |f| %> - <%= f.text_field locale %> - <% end %> +
+ +
+ <%= f.fields_for :description, @site.description do |f| %> + <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> + <% end %> +

In addition to freeform text, any HTML5 text-based input appears like so.

+
-
- <%= t :footer %> - <%= f.fields_for :footer, @site.footer do |f| %> - <%= f.text_area locale, :class => "tinymce_textarea" %> - <% end %> +
+ +
+ <%= f.fields_for :footer, @site.footer do |f| %> + <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %> + <% end %> +
<% end %> <% end %> -
-
-<% end %> \ No newline at end of file +
+ <%= f.submit t("submit"), :class => "btn btn-primary" %> + <%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %> +
+<% end %> +
\ No newline at end of file