rails-settings-ui 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35170acf6f2b81de2e8e368c2b6b331dcb62424f
-  data.tar.gz: 2b27477c0ae361c5313ac8f96c9dffb836c34964
+  metadata.gz: 6d3a038194e89a8a7763fe2006fe8b94a29fbb16
+  data.tar.gz: 72815478e3fd16400fca0df170a1677958b2a211
 SHA512:
-  metadata.gz: 4c3bc793c4b48437cd199ce5bfd00f2f58f85f7f34aa745bbb94dc3e66548672b0702ba2f5163e1099d7f502e2266c5a4976bea698f4c604480f97d1ea52c9eb
-  data.tar.gz: d84cc9d7fa14ee053108323e295ae180e3206b63357aca28392620ceb54ea93a9d93e61d91249470357abd16bc199fabf053084dc7e8c437fdcd0a566ce42700
+  metadata.gz: 4ee0a49062d8163ed58825f9a37f86bc9a0624dc7cb65f1ab64f57eb45d12df104aae2a44da016c3e51097a9adac770f57b44bebcb020db273bb88ded1b21666
+  data.tar.gz: a9427ec7b832c29951567f7a679b44389db06894f395184ae59b8c773448a4ce4b0aa50c6ac3bd6948f40f470bb123a1621e59d6f0fbacb676ea1c86e4842e56

data/README.md

@@ -16,11 +16,23 @@ How to
 
 Add to Gemfile
 
-    gem 'rails-settings-ui'
+if you use bootstrap 2
+
+    gem 'rails-settings-ui', '~> 0.2.0'
+
+for bootstrap 3
+
+    gem 'rails-settings-ui', '~> 0.3.0'
+
+then add
+
     gem 'rails-settings-cached'
-    # or
+
+or
+
     gem 'rails-settings'
-    # or your fork of rails-settings
+
+or your fork of rails-settings.
 
 Setup:
 
@@ -103,6 +115,9 @@ To validation work is required the default settings in the proper format, eg:
 
 Views
 -------------
+
+You can render all rails-settings-ui views inside your app layout (for nice looking you will need include bootstrap, eg: `@import 'bootstrap';` in your applications.css.scss):
+
     Rails.application.config.to_prepare do
       # Use admin layout:
       RailsSettingsUi::ApplicationController.module_eval do

data/app/helpers/rails_settings_ui/settings_helper.rb

@@ -9,7 +9,7 @@ module RailsSettingsUi::SettingsHelper
     elsif [TrueClass, FalseClass].include?(setting_value.class)
       checkbox_field(setting_name, setting_value)
     else
-      text_field(setting_name, setting_value)
+      text_field(setting_name, setting_value, class: 'form-control')
     end
   end
 
@@ -17,7 +17,7 @@ module RailsSettingsUi::SettingsHelper
     default_setting_values = I18n.t("settings.attributes.#{setting_name}.labels", default: {}).map do |label, value|
       [label, value]
     end
-    select_tag("settings[#{setting_name.to_s}]", options_for_select(default_setting_values, setting_value))
+    select_tag("settings[#{setting_name.to_s}]", options_for_select(default_setting_values, setting_value), class: 'form-control')
   end
 
   def checkboxes_group_field(setting_name, all_settings)
@@ -33,11 +33,11 @@ module RailsSettingsUi::SettingsHelper
     check_box_tag("settings[#{setting_name.to_s}]", nil, setting_value).html_safe
   end
 
-  def text_field(setting_name, setting_value)
+  def text_field(setting_name, setting_value, options = {})
     field = if setting_value.to_s.size > 30
-      text_area_tag("settings[#{setting_name}]", setting_value.to_s, rows: 10)
+      text_area_tag("settings[#{setting_name}]", setting_value.to_s, options.merge(rows: 10))
     else
-      text_field_tag("settings[#{setting_name}]", setting_value.to_s)
+      text_field_tag("settings[#{setting_name}]", setting_value.to_s, options)
     end
 
     help_block_content = I18n.t("settings.attributes.#{setting_name}.help_block", default: '')
@@ -45,6 +45,6 @@ module RailsSettingsUi::SettingsHelper
   end
 
   def message_for_default_value_missing
-    content_tag(:span, I18n.t("settings.errors.default_missing"), class: "label label-important")
+    content_tag(:span, I18n.t("settings.errors.default_missing"), class: "label label-warning")
   end
 end

data/app/views/layouts/rails_settings_ui/application.html.haml

@@ -8,11 +8,10 @@
     = stylesheet_link_tag "rails_settings_ui/application"
     = csrf_meta_tags
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
+    .container
+      .navbar.navbar-default
         .container-fluid
-          %a.brand{href: "/"} Rails settings ui
-    .container-fluid
-      .row-fluid
-        .content= yield
+          .navbar-header
+            %a.navbar-brand{href: "/"} Rails settings ui
+      .row= yield
       %footer

data/app/views/rails_settings_ui/settings/index.html.haml

@@ -1,10 +1,10 @@
-%ul.breadcrumb
+%ol.breadcrumb
   %li.active= t('settings.index.title')
 
 - if @casted_settings && @casted_settings[:errors].any?
-  .alert.alert-error= t('settings.index.settings_include_errors')
+  .alert.alert-danger= t('settings.index.settings_include_errors')
 
-= form_tag [:update_all], method: :put, class: 'form-inline' do
+= form_tag [:update_all], method: :put, class: 'form' do
   %table.table.table-striped
     %thead
       %tr
@@ -17,9 +17,9 @@
             %td= I18n.t("settings.attributes.#{name}.name")
             %td.setting-value
               - setting_with_error = @casted_settings && @casted_settings[:errors].include?(name)
-              %div{class: "control-group #{ setting_with_error ? 'error' : ''}"}
+              %div{class: "form-group #{ setting_with_error ? 'has-error' : ''}"}
                 = setting_field(name, value, @settings)
                 - if setting_with_error
-                  %span.help-inline= @casted_settings[:errors][name]
+                  %span.help-block= @casted_settings[:errors][name]
 
-  = submit_tag t('settings.index.save_all'), class: 'btn btn-info'
+  = submit_tag t('settings.index.save_all'), class: 'btn btn-primary btn-lg'

data/lib/rails-settings-ui/engine.rb

@@ -7,10 +7,6 @@ module ::RailsSettingsUi
   class Engine < Rails::Engine
     isolate_namespace RailsSettingsUi
 
-    initializer "assets_precompile" do |app|
-      app.config.assets.precompile += %w( glyphicons-halflings.png glyphicons-halflings-white.png)
-    end
-
     config.generators do |g|
       g.test_framework      :rspec,        fixture: false
       g.fixture_replacement :factory_girl, dir: 'spec/factories'

data/lib/rails-settings-ui/version.rb

@@ -1,3 +1,3 @@
 module RailsSettingsUi
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrey Morskov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,30 +56,30 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement