padrino-admin 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa5241218d4e62f8664281acaf75964a7b5b662
-  data.tar.gz: 089b931c4d3e737172ef6232a9c93ac620197e36
+  metadata.gz: 10ff66cffdd5d7835371089b8a73b6eb42e5e85c
+  data.tar.gz: f3da8b3bfebc8df965b7a5b82bb7673b09ac7287
 SHA512:
-  metadata.gz: b5945cd2a39ba565ed28e72162f60f697f6d80e6614127bf2fca30a7ab699eb70d4a856f334c2534528e35b571308a5cb6871eeed0be75345181bfc76978a58d
-  data.tar.gz: c937c3b00babd88d49325a6edc47d98ba9637343c958c2c98155fd063f48ad36c541471ac8b93c217e0d3477acf2e20d75bbe666263434a55420dd133bc19ee3
+  metadata.gz: 4210af693f831978fec6f41a0f76a7717dc55cc9d25a2be4e02a8ccbe065026b5eb631c639f433d068708982c53a1ebe30e954ceaa882ca146b60b703b726682
+  data.tar.gz: 9ae257671b3db25e8c7bfdb303ebfaa862d5ff54a2c05c8d18a707a233eb5887bf8103714c678acc7fde5d9e5a89ae846fbe466487f213f75f10682bea502f39

data/lib/padrino-admin/generators/templates/account/activerecord.rb.tt

@@ -19,7 +19,7 @@ class <%= @model_name %> < ActiveRecord::Base
   # This method is for authentication purpose.
   #
   def self.authenticate(email, password)
-    account = first(:conditions => ["lower(email) = lower(?)", email]) if email.present?
+    account = where("lower(email) = lower(?)", email).first if email.present?
     account && account.has_password?(password) ? account : nil
   end
 

data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt

@@ -18,16 +18,16 @@
       </div>
       <div class="login-body modal-body">
 
-        <%%=  {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe %>
+        <%%= {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe %>
 
         <div class="form-group">
           <label for="email" class="col-lg-2 control-label"><%%= pat('login.email') %></label>
-          <div class="col-lg-10"><%%= email_field_tag :email, :value => params[:email], :autofocus => true, :class => 'form-control' %></div>
+          <div class="col-lg-10"><%%= email_field_tag :email, :id => :email, :value => params[:email], :autofocus => true, :class => 'form-control' %></div>
         </div>
 
         <div class="form-group">
           <label for="password" class="col-lg-2 control-label"><%%= pat('login.password') %></label>
-          <div class="col-lg-10"><%%= password_field_tag :password, :class => 'form-control' %></div>
+          <div class="col-lg-10"><%%= password_field_tag :password, :id => :password, :class => 'form-control' %></div>
         </div>
 
         <fieldset class="login-control-group-last control-group">
@@ -41,4 +41,4 @@
     <%% end %>
     <%%= javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
   </body>
-</html>
+</html>

data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt

@@ -8,30 +8,30 @@
     %meta{:content => 'text/html; charset=utf-8', 'http-equiv' => 'Content-Type'}
     %meta{:name => :viewport, :content => 'width=device-width,initial-scale=1'}
     %title= @title.present? ? "#{@title} | Padrino Admin" : "#{pat('login.title')} | Padrino Admin"
-    =favicon_tag 'favicon.ico'
-    =stylesheet_link_tag 'bootstrap', 'application'
+    = favicon_tag 'favicon.ico'
+    = stylesheet_link_tag 'bootstrap', 'application'
   %body
     = form_tag url(:sessions, :create), :class=>'login form-horizontal' do
       .login-header.modal-header
         .login-logo=image_tag('logo.png', :alt => "Padrino's logo", :height => 250, :width => 193)
       .login-body.modal-body
-        =  {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
+        = {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
 
         .form-group
           %label.col-lg-2.control-label{:for => :email}= pat('login.email')
-          .col-lg-10=email_field_tag :email, :value => params[:email], :autofocus => true, :class =>'form-control'
+          .col-lg-10= email_field_tag :email, :id => :email, :value => params[:email], :autofocus => true, :class =>'form-control'
 
         .form-group
           %label.col-lg-2.control-label{:for => :password}= pat('login.password')
-          .col-lg-10=password_field_tag :password, :class =>'form-control'
+          .col-lg-10= password_field_tag :password, :id => :password, :class =>'form-control'
 
         %fieldset.login-control-group-last.control-group
           .login-controls.controls
             %label.login-bypass-label.checkbox
-              =check_box_tag :bypass
-              =pat('login.bypass')
+              = check_box_tag :bypass
+              = pat('login.bypass')
 
       .login-footer.modal-footer
-        =submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
+        = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
 
-        =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+        = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt

@@ -20,11 +20,11 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
 
           div class='form-group'
             label for="email" class='col-lg-2 control-label' = pat('login.email')
-            div class='col-lg-10'  = email_field_tag :email, :value => params[:email], :autofocus => true, :class => 'form-control'
+            div class='col-lg-10'  = email_field_tag :email, :id => :email, :value => params[:email], :autofocus => true, :class => 'form-control'
 
           div class='form-group'
             label for="password" class='col-lg-2 control-label' = pat('login.password')
-            div class='col-lg-10'  = password_field_tag :password, :class => 'form-control'
+            div class='col-lg-10' = password_field_tag :password, :id => :password, :class => 'form-control'
 
           fieldset class='login-control-group-last control-group'
             div class='login-controls controls'

data/lib/padrino-admin/locale/admin/ja.yml

@@ -7,7 +7,7 @@ ja:
         password: "パスワード"
         bypass: "ログインを省略する"
         sign_in: "ログイン"
-        error: "メールアドレスかパスワードが間違っています."
+        error: "メールアドレスかパスワードが間違っています。"
       save: "保存"
       save_and_continue: "保存して続行"
       cancel: "キャンセル"
@@ -31,13 +31,13 @@ ja:
       new_title: "新規 %{model}"
       create_title: "%{model} の作成"
       create_success: "%{model} は正常に作成されました。"
-      create_error: "%{model} を作成できませんでした"
+      create_error: "%{model} を作成できませんでした。"
       edit_title: "%{model} の編集"
       edit_warning: "ID %{id} の %{model} が見つかりませんでした。"
       update_title: "%{model} の編集"
       update_success: "ID %{id} の %{model} は正常に更新されました。"
       update_error: "%{model} を更新できませんでした。"
-      update_warning: "ID %{id} の %{model} が見つかりませんでした"
+      update_warning: "ID %{id} の %{model} が見つかりませんでした。"
       delete_title: "%{model} を削除しますか？"
       delete_success: "ID %{id} の %{model} は正常に削除されました。"
       delete_error: "を削除することができません %{model}！"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement