rails-theme-helper 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12f6ea880129fb00c40433fa950f8f046197f4b
-  data.tar.gz: 3eece4189ca77ee4d878249deec52026f7f54a98
+  metadata.gz: a2d0d49950455a4edf8f9e8a589b5cba77c6ebca
+  data.tar.gz: b7b410d215413b1facc06640a89455df6e7a6e9d
 SHA512:
-  metadata.gz: aff60216bb8e05fdf29a4cd67683303a934f6348e0e71d2543355a896eadda0049e737dd3e4c8b4701815db2322bbb4d6dfb6419b505351bb4d2ab37278b6dd4
-  data.tar.gz: 1cec0d8df8caae5f1c873d5aeaadb2b7ac20231967dc0b80a2c29e8587c29fc7cc385efc2aa83de9f968cdb2c248f258327b9a05adb88679ab8059e4c7b8697c
+  metadata.gz: 82b2c4f7105201bc05f22446128d3cb08068ee8f1e70084b797faa695fbd6a5f96409389c0eec6815e71e3c2e4da69e6016b730e1e52c8afcafaaa03df129e0c
+  data.tar.gz: 3882856228868b6accb4c13b259ffab48fa3545fe2c5a56fd046d3188ea209b2c7cbd083febb44c0ca7b748e7dbb244f2e421f7434ec6c20968fc549276efb05

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Tse-Ching Ho
+Copyright (c) 2012-2014 Tse-Ching Ho
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,6 +2,8 @@
 
 This gem helps you build themes for rails.
 
+Bootstrap 3.x is supported from version 0.1.0.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/app/assets/stylesheets/rails_theme/simple_layout.css.sass

@@ -1,12 +1,12 @@
 #main
-  margin-top: 40px
+  margin-top: 60px
 
 #site-name
   h1
     margin: 0
     a
       margin: 0 10px 0 0
-      padding: 0
+      padding: 0.8em 0
   h2
     margin: 0
     font-size: 10px

data/app/helpers/rails_theme/bootstrap/dropdown_helper.rb

@@ -11,15 +11,21 @@ module RailsTheme
         link_to text, url, options
       end
 
-      def dropdown_btn text, url = '#', options = {}
+      def dropdown_btn text, options = {}
+        text = text.html_safe << ' '
+        text << content_tag(:span, nil, class: 'caret')
         options = {
-          class: 'btn dropdown-toggle'
+          name: nil,
+          type: 'button',
+          class: 'btn dropdown-toggle',
+          data: { toggle: 'dropdown' }
         }.deep_merge options
-        dropdown_toggle text, url, options
+        button_tag text, options
       end
 
       def dropdown_menu options = {}, &block
         options = {
+          role: 'menu',
           class: 'dropdown-menu'
         }.deep_merge options
         render_list options, &block

data/app/helpers/rails_theme/bootstrap/form_helper.rb

@@ -4,7 +4,7 @@ module RailsTheme
       def submit_button f, label = nil, options = {}
         options = {
           name: nil,
-          class: 'btn-primary'
+          class: 'btn btn-primary'
         }.deep_merge options
         f.button :submit, label, options
       end

data/app/helpers/rails_theme/bootstrap/link_helper.rb

@@ -8,9 +8,10 @@ module RailsTheme
       end
 
       def link_to_show url, options = {}
-        icon_class = options.delete(:icon_class) || 'icon-eye-open'
+        icon_class = options.delete(:icon_class) || 'glyphicon glyphicon-eye-open'
         options = {
-          class: 'btn',
+          role: 'button',
+          class: 'btn btn-default',
           icon_class: icon_class,
           title: t('helpers.show')
         }.deep_merge options
@@ -19,9 +20,10 @@ module RailsTheme
       end
 
       def link_to_new url, options = {}
-        icon_class = options.delete(:icon_class) || 'icon-plus'
+        icon_class = options.delete(:icon_class) || 'glyphicon glyphicon-plus'
         options = {
-          class: 'btn',
+          role: 'button',
+          class: 'btn btn-default',
           icon_class: icon_class,
           title: t('helpers.new')
         }.deep_merge options
@@ -29,9 +31,10 @@ module RailsTheme
       end
 
       def link_to_edit url, options = {}
-        icon_class = options.delete(:icon_class) || 'icon-edit'
+        icon_class = options.delete(:icon_class) || 'glyphicon glyphicon-edit'
         options = {
-          class: 'btn',
+          role: 'button',
+          class: 'btn btn-default',
           icon_class: icon_class,
           title: t('helpers.edit')
         }.deep_merge options
@@ -39,11 +42,12 @@ module RailsTheme
       end
 
       def link_to_destroy url, options = {}
-        icon_class = options.delete(:icon_class) || 'icon-trash'
+        icon_class = options.delete(:icon_class) || 'glyphicon glyphicon-trash'
         options = {
           method: :delete,
           data: { confirm: t('helpers.are_you_sure') },
-          class: 'btn',
+          role: 'button',
+          class: 'btn btn-default',
           icon_class: icon_class,
           title: t('helpers.destroy')
         }.deep_merge options

data/app/helpers/rails_theme/bootstrap/modal_helper.rb

@@ -35,27 +35,30 @@ module RailsTheme
             target: modal_id,
             type: 'html'
           },
-          class: 'modal-open btn'
+          class: 'modal-open btn btn-default'
         }.deep_merge options
         link_to_edit url, options
       end
 
       def link_to_close_button
         options = {
+          type: 'button',
+          name: nil,
           data: { dismiss: 'modal' },
-          class: 'btn'
+          class: 'btn btn-default'
         }
-        link_to t('helpers.close'), '#', options
+        button_tag t('helpers.close'), options
       end
 
       def modal_close_button
         options = {
           type: 'button',
           name: nil,
+          'aria-hidden' => 'true',
           data: { dismiss: 'modal' },
           class: 'close'
         }
-        button_tag 'x', options
+        button_tag '×'.html_safe, options
       end
     end
   end

data/app/helpers/rails_theme/layout_helper.rb

@@ -25,5 +25,26 @@ module RailsTheme
       end
       content_tag(:ul, items, options)
     end
+
+    def flash_box key, value
+      alert_class = case key
+      when :notice
+        'alert-warning'
+      when :error
+        'alert-danger'
+      else
+        "alert-#{key}"
+      end
+      button_options = {
+        type: 'button',
+        name: nil,
+        class: 'close',
+        data: { dismiss: 'alert' },
+        'aria-hidden' => 'true'
+      }
+      content_tag :div, class: "alert #{alert_class} alert-dismissable #{key}" do
+        button_tag('&times;'.html_safe, button_options) << value
+      end
+    end
   end
 end

data/app/views/application/_flash_messages.html.erb

@@ -4,8 +4,6 @@
 
 <div class="messages">
   <% flash.each do |key, value| %>
-    <%= content_tag :div, class: "alert alert-#{key} #{key}" do
-      link_to('&times;'.html_safe, '#', class: 'close', data: { dismiss: 'alert'}) << value
-    end %>
+    <%= flash_box key, value %>
   <% end %>
 </div>

data/app/views/application/_header.html.erb

@@ -1,10 +1,15 @@
-<hgroup id="site-name">
-  <h1><%= link_to t('site.title'), secure_root_url, class: 'brand' %></h1>
-  <h2><%= t('site.subtitle') %></h2>
-</hgroup>
+<div class="navbar-header">
+  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+    <span class="sr-only"><%= t('site.nav_toggle') %></span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+  </button>
+  <hgroup id="site-name">
+    <h1><%= link_to t('.site_title'), secure_root_url, class: 'navbar-brand' %></h1>
+    <h2><%= t('site.subtitle') %></h2>
+  </hgroup>
+</div>
 
-<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-  <span class="icon-bar"></span>
-  <span class="icon-bar"></span>
-  <span class="icon-bar"></span>
-</a>
+<div class="navbar-collapse collapse">
+</div>

data/config/locales/rails_theme.en.yml

@@ -33,3 +33,4 @@ en:
     title: 'RailsTheme'
     author: 'Tse-Ching Ho'
     subtitle: 'helps you build themes for rails'
+    nav_toggle: 'Toggle navigation'

data/config/locales/rails_theme.zh-TW.yml

@@ -33,3 +33,4 @@ zh-TW:
     title: 'RailsTheme'
     author: '何澤清'
     subtitle: '幫助您建置 Rails 主題套件'
+    nav_toggle: '切換導覽列'

data/lib/rails-theme-helper/version.rb

@@ -1,3 +1,3 @@
 module RailsThemeHelper
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rails-theme-helper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem helps you build themes for rails
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,19 +94,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: helps you build themes for rails
 test_files: []
-has_rdoc: