padrino-admin 0.10.7 → 0.11.0

data/lib/padrino-admin/generators/templates/slim/app/base/index.slim.tt

@@ -1,25 +1,12 @@
-#block-text.block
-  .content
-    h2.title Dashboard
-    .inner
-      p.first
-        ' Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        ' Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-        ' Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-        span.hightlight
-          | Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-      p
-        span.small
-          | Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
-      p
-        span.gray
-          | Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
-      hr
-      p
-        ' Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        ' Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-        ' Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-        span.hightlight
-          | Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+div class="base-text"
+  p Padrino is a ruby framework built upon the Sinatra web library
+  p It was created to make it fun and easy to code more advanced web applications while still adhering to the spirit that makes Sinatra great!
+  p Padrino comes shipped with a slick and beautiful Admin Interface, with the following features:
 
-- content_for :sidebar, partial("base/sidebar")
+div class="base-icons"
+  div class="btn-group"
+    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, mongomapper, mongoid, couchrest" = tag_icon("cogs icon-2x", "Orm Agnostic")
+    div class="btn btn-success" title="User Authentication Support, User Authorization Management" = tag_icon("group icon-2x", "Authentication")
+    div class="btn btn-info" title="Erb, Haml, Slim Rendering Support" = tag_icon("tasks icon-2x", "Template Agnostic")
+    div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations" = tag_icon("flag icon-2x", "Multi Language")
+    div class="btn btn-danger" title="You can create a new 'admin interface' by providing a single Model" = tag_icon("magic icon-2x", "Scaffold")

data/lib/padrino-admin/generators/templates/slim/app/errors/403.slim.tt

@@ -0,0 +1,3 @@
+p = tag_icon 'minus-sign icon-3x'
+h1 = pat('custom_errors.403.title')
+p = pat('custom_errors.403.description')

data/lib/padrino-admin/generators/templates/slim/app/errors/404.slim.tt

@@ -0,0 +1,3 @@
+p= tag_icon 'warning-sign icon-3x'
+h1= pat('custom_errors.404.title')
+p= pat('custom_errors.404.description')

data/lib/padrino-admin/generators/templates/slim/app/errors/500.slim.tt

@@ -0,0 +1,3 @@
+p = tag_icon 'beaker icon-3x'
+h1 = pat('custom_errors.500.title')
+p = pat('custom_errors.500.description')

data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -1,31 +1,48 @@
-doctype html
-html lang='en' xmlns='http://www.w3.org/1999/xhtml'
+doctype 5
+html lang='en'
   head
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
     meta content='text/html; charset=utf-8' http-equiv='Content-Type'
-    title Padrino Admin
-    == stylesheet_link_tag 'base', 'themes/<%= options[:theme] %>/style'
+    meta name='viewport' content='width=device-width,initial-scale=1'
+    title = @title.present? ? "#{@title} | Padrino Admin" : "Padrino Admin"
+    = favicon_tag 'favicon.ico'
+    link href='http://fonts.googleapis.com/css?family=Varela' rel='stylesheet'
+    = stylesheet_link_tag 'bootstrap', 'application'
 
   body
-    #container
-      #header
-        h1 == link_to 'Padrino Admin', url(:base_index)
-        #user-navigation
-          ul.wat-cf
-            li == link_to pat(:profile), url(:<%= @model_plural %>, :edit, :id => current_account.id)
-            li == button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
-        #main-navigation
-          ul.wat-cf
+    div class='navbar navbar-fixed-top'
+      div class='navbar-inner'
+        div class='container'
+          = link_to 'Padrino', url(:base_index), :class => 'navbar-brand', :title => 'Padrino Admin'
+
+          ul class='nav pull-right'
+            li class='navbar-edit-account' = link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
+            li class='navbar-logout' = button_to(pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') do
+              = content_tag :button, tag_icon(:off), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+
+          ul class='nav pull-left'
             - project_modules.each do |project_module|
-              li class=(:active if request.path_info =~ /^#{project_module.path}/)
-                == link_to project_module.human_name, project_module.path('/admin')
-      #wrapper.wat-cf
-        .flash == [:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join
-        #main
-          == yield
-          #footer
-            .block
-              p
-                ' Copyright &copy; #{Time.now.year} Your Site - Powered by
-                == link_to "Padrino v.#{Padrino.version}", 'http://www.padrinorb.com', :target => :_blank
-        #sidebar
-          == yield_content :sidebar
+              li class={"navbar-module #{'active' if request.path_info =~ /^#{project_module.path}/}"}
+                = link_to project_module.human_name, project_module.path('/admin')
+
+    div class='container main'
+      div class='main-wrapper'
+        = [:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+        div class='row' = yield
+        div class='main-wrapper-push'
+
+    footer
+      div class='footer-wrapper container'
+        p class='pull-left'
+          ' Copyright &copy; #{Time.now.year} Your Site -
+          b Powered by Padrino v.#{Padrino.version}
+        ul class='pull-right footer-links'
+          li = link_to tag_icon(:home, 'web'), 'http://www.padrinorb.com', :target => :_blank, :class => 'footer-links-link'
+          li = link_to tag_icon(:heart, 'blog'), 'http://www.padrinorb.com/blog', :target => :_blank, :class => 'footer-links-link'
+          li = link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', :target => :_blank, :class => 'footer-links-link'
+          li = link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', :target => :_blank, :class => 'footer-links-link'
+
+    =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap.min' : %w[bootstrap/bootstrap-affix bootstrap/bootstrap-alert bootstrap/bootstrap-button bootstrap/bootstrap-carousel bootstrap/bootstrap-collapse bootstrap/bootstrap-dropdown bootstrap/bootstrap-tooltip bootstrap/bootstrap-transition bootstrap/bootstrap-typeahead bootstrap/bootstrap-modal bootstrap/bootstrap-popover bootstrap/bootstrap-scrollspy bootstrap/bootstrap-tab]), :application

data/lib/padrino-admin/generators/templates/slim/app/layouts/error.slim.tt

@@ -0,0 +1,19 @@
+doctype 5
+html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+  head
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    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(:custom_errors.title)} | Padrino Admin"
+    = favicon_tag 'favicon.ico'
+    link href='http://fonts.googleapis.com/css?family=Varela' rel='stylesheet'
+    = stylesheet_link_tag 'bootstrap', 'application'
+
+  body
+    div class="custom-error text-center"
+      div class="custom-error-body muted" = yield
+      div class="custom-error-footer"
+        = link_to tag_icon('arrow-left'),"#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn pull-left", :title => "Go Back"

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

@@ -1,31 +1,35 @@
-doctype html
-html lang='en' xmlns='http://www.w3.org/1999/xhtml'
+doctype 5
+html lang="en" xmlns="http://www.w3.org/1999/xhtml"
   head
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
     meta content='text/html; charset=utf-8' http-equiv='Content-Type'
-    title Padrino Admin
-    == stylesheet_link_tag 'base', 'themes/<%= options[:theme] %>/style'
+    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'
 
   body
-    #container
-      #box
-        h1 Padrino Admin
-        #block-login.block
-          h2 Login Box
-          .content.login
-            .flash == [:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join
-            - form_tag url(:sessions, :create), :class => 'form login' do
-              .group.wat-cf
-                .left
-                   label.label.right Login
-                .right == text_field_tag :email, :value => params[:email], :class => :text_field
-              .group.wat-cf
-                .left
-                   label.label.right Password
-                .right == password_field_tag :password, :value => params[:password], :class => :text_field
-              - if Padrino.env == :development
-                .group.wat-cf
-                  .left
-                     label.label.right Bypass login?
-                  .right == check_box_tag :bypass
-              .group.navform.wat-cf
-                .right == submit_tag 'Sign In', :class => :button
+    - form_tag url(:sessions, :create), :class=>'login form-horizontal' do
+        div class="login-header modal-header"
+          div class="login-logo" = image_tag('logo.png', :alt => "Padrino's logo", :height => 250, :width => 193)
+        div class="login-body modal-body"
+          = [:error, :warning, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+
+          fieldset class='control-group'
+            label for="email" class='login-input-label control-label' = pat('login.email')
+            div class='login-controls controls' = email_field_tag :email, :value => params[:email], :autofocus => true
+          fieldset class='control-group'
+            label for='password' class='login-input-label control-label' = pat('login.password')
+            div class='login-controls controls' = password_field_tag :password, :value => params[:password]
+          fieldset class='login-control-group-last control-group'
+            div class='login-controls controls'
+              label class="login-bypass-label checkbox"
+                = check_box_tag :bypass
+                | #{pat('login.bypass')}
+
+        div class="login-footer modal-footer"
+          = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
+    = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap.min' : %w[bootstrap/bootstrap-affix bootstrap/bootstrap-alert bootstrap/bootstrap-button bootstrap/bootstrap-carousel bootstrap/bootstrap-collapse bootstrap/bootstrap-dropdown bootstrap/bootstrap-tooltip bootstrap/bootstrap-transition bootstrap/bootstrap-typeahead bootstrap/bootstrap-modal bootstrap/bootstrap-popover bootstrap/bootstrap-scrollspy bootstrap/bootstrap-tab]), :application

data/lib/padrino-admin/generators/templates/slim/page/_form.slim.tt

@@ -1,14 +1,16 @@
-<%- @orm.column_fields.each do |column| -%>
-.group
-  == f.label :<%= column[:name] %>
-  == f.error_message_on :<%= column[:name] %>
-  == f.<%= column[:field_type] %> :<%= column[:name] %>, :class => :<%= column[:field_type] %>
-  br
-  span.description Ex: a simple text
+<%- @orm.column_fields.each_with_index do |column, index| -%>
+- error = <%= @orm.has_error(column[:name]) %>
+fieldset class='control-group#{error ? ' has-error' : ''}'
+  = f.label :<%= column[:name] %>, :class => 'control-label'
+  div class='controls'
+    = f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'input-xlarge input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%>
 
+    span class='help-inline' = error ? f.error_message_on(:<%= column[:name] %>, :class => 'text-error') : pat(:example)
 <%- end -%>
 
-.group.navform.wat-cf
-  == f.submit pat(:save), :class => :button
-  == "&nbsp;"
-  == f.submit pat(:cancel), :onclick => "window.location='#{url(:<%= @orm.name_plural %>, :index)}';return false", :class => :button
+div class="form-actions"
+  = f.submit pat(:save), :class => 'btn btn-primary'
+  |&nbsp;
+  = f.submit pat(:save_and_continue), :class => 'btn btn-info', :name => 'save_and_continue'
+  |&nbsp;
+  = link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn'

data/lib/padrino-admin/generators/templates/slim/page/edit.slim.tt

@@ -1,16 +1,8 @@
-.block
-  .secondary-navigation
-    ul.wat-cf
-      li.first == link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
-      li == link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
-      li.active == link_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
-  .content
-    h2.title
-      = pat(:edit)
-      == "&nbsp;"
-      = mt(:<%= @orm.name_singular %>)
-    .inner
-      == form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => :form do |f|
-        == partial '<%= @orm.name_plural %>/form', :locals => { :f => f }
+ul class="nav nav-tabs"
+  li = link_to tag_icon(:list, pat(:list)), url(:<%= @orm.name_plural %>, :index)
+  li = link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
+  li class="active" = link_to tag_icon(:edit, pat(:edit)), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
 
-- content_for :sidebar, partial("base/sidebar")
+div class="tabs-content"
+  - form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => 'form-horizontal' do |f|
+    = partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

data/lib/padrino-admin/generators/templates/slim/page/index.slim.tt

@@ -1,30 +1,56 @@
-.block
-  .secondary-navigation
-    ul.wat-cf
-      li.first.active == link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
-      li == link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
-  .content
-    h2.title
-      == pat(:all)
-      == '&nbsp;'
-      == mt(:<%= @orm.name_plural %>)
-    .inner
-      table.table
-        tr
+ul class="nav nav-tabs"
+  li class="active" = link_to tag_icon(:list, pat(:list)), url(:<%= @orm.name_plural %>, :index)
+  li = link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
+
+div class="tabs-content"
+  table class="table table-striped table-hover table-condensed" id="list"
+    thead
+      tr
+        th class='header list-menu'
+          div class='dropdown'
+            a href='#' class='list-menu-toggle.dropdown-toggle dropdown-toggle' data-toggle='dropdown'
+              = tag_icon :magic
+              span class='caret'
+            ul class='list-menu dropdown-menu' role='dropdown'
+              li class='list-menu-wrapper' = link_to tag_icon(:check, pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
+              li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('check-empty', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
+              li class='list-menu-divider divider'
+              li class='list-menu-wrapper list-menu-wrapper-disabled'
+                = link_to tag_icon(:trash, pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
+                div class='list-menu-popover-delete-selected popover right'
+                  div class='arrow'
+                  h3 class='popover-title' = pat(:delete_selected_title)
+                  div class='popover-content'
+                    - form_tag url(:<%= @orm.name_plural %>, :destroy_many), :method => :delete do
+                      = hidden_field_tag :<%= @orm.name_singular %>_ids, :'data-delete-many-ids' => true
+                      = submit_tag  pat(:delete), :class =>'list-menu-popover-delete-selected-btn btn btn-danger btn-small'
+                      div class='btn btn-small cancel' = pat(:cancel)
+        <%- @orm.columns.each_with_index do |column, i| -%>
+        th class='header' = :<%= column.name %>
+        <%- end -%>
+        th class='header list-row-action-header'
+
+    tbody
+      -@<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>|
+        tr class='list-row'
+          td class='list-column list-selectable' = check_box_tag '<%= @orm.name_singular %>_ids[]', :value => <%= @orm.name_singular %>.id, :class => 'list-selectable-checkbox'
           <%- @orm.columns.each_with_index do |column, i| -%>
-          th<%= ".first" if i==0 %>=mat(:<%= @orm.name_singular %>, :<%= column.name %>)
+          <%- if column.name == 'created_at' || column.name == 'updated_at' -%>
+          td class='list-column' = time_ago_in_words <%= @orm.name_singular %>.<%= column.name %>
+          <%- elsif column.type == :boolean -%>
+          td class='list-column' = <%= @orm.name_singular %>.<%= column.name %> ? tag_icon(:ok) : tag_icon(:remove)
+          <%- else -%>
+          td class='list-column' = <%= @orm.name_singular %>.<%= column.name %>
           <%- end -%>
-          th.last == '&nbsp;'
-        - @<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>|
-          tr
-            <%- @orm.columns.each_with_index do |column, i| -%>
-            td<%= ".first" if i==0 %>=<%= @orm.name_singular %>.<%= column.name %>
-            <%- end -%>
-            td.last
-              == button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to
-              == ' | '
-              == button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to, :onsubmit => "return confirm('#{pat(:confirm)}')"
-      .actions-bar.wat-cf
-        .actions == '&nbsp;'
-
--content_for :sidebar, partial("base/sidebar")
+          <%- end -%>
+          td class='list-column list-row-action'
+            div class='list-row-action-wrapper'
+              = link_to tag_icon(:edit), :href => url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :rel => :tooltip, :title => "#{pat(:edit)} <%= @orm.name_singular %>", :class => 'list-row-action-wrapper-link'
+              = link_to tag_icon(:trash), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
+              div class='popover list-row-action-popover-delete-one left'
+                div class='arrow'
+                h3 class='popover-title' = pat(:delete, :model => "<%= @orm.name_singular %>")
+                div class='popover-content'
+                  - form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do
+                    = submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small'
+                    div class='btn btn-small cancel' = pat(:cancel)

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

@@ -1,15 +1,7 @@
-.block
-  .secondary-navigation
-    ul.wat-cf
-      li.first == link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
-      li.active == link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
-  .content
-    h2.title
-      = pat(:new)
-      == '&nbsp;'
-      = mt(:<%= @orm.name_singular %>)
-    .inner
-      - form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => :form do |f|
-        == partial "<%= @orm.name_plural %>/form", :locals => { :f => f }
+ul class="nav nav-tabs"
+  li = link_to tag_icon(:list, pat(:list)), url(:<%= @orm.name_plural %>, :index)
+  li class="active" = link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
 
-- content_for :sidebar, partial("base/sidebar")
+div class="tabs-content"
+  - form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => 'form-horizontal' do |f|
+    = partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -53,15 +53,17 @@ module Padrino
         # By default this method is used in Admin Apps.
         #
         def login_required
-          store_location! if store_location
-          return access_denied unless allowed?
+          unless allowed?
+            store_location! if store_location
+            access_denied
+          end
         end
 
         ##
-        # Store in session[:return_to] the env['HTTP_REFERER']
+        # Store in session[:return_to] the env['REQUEST_URI']
         #
         def store_location!
-          session[:return_to] = env['HTTP_REFERER']
+          session[:return_to] = env['REQUEST_URI']
         end
 
         ##

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -5,9 +5,28 @@ module Padrino
     #
     module Helpers
       ##
-      # i18n translation helpers for admin to retrieve words based on locale.
+      # Admin helpers
       #
       module ViewHelpers
+        ##
+        # Icon's Bootstrap helper
+        #
+        # @param [Symbol] icon
+        #  The specified icon type
+        #
+        # @param [Symbol] tag
+        #   The HTML tag.
+        #
+        # @return [String] html tag with prepend icon
+        #
+        # @example
+        #   tag_icon(:edit, :list)
+        #
+        def tag_icon(icon, tag = nil)
+          content = content_tag(:i, '', :class=> "icon-#{icon.to_s}")
+          content << " #{tag.to_s}"
+        end
+
         ##
         # Translates a given word for padrino admin
         #
@@ -25,8 +44,10 @@ module Padrino
         #   # => t("padrino.admin.profile",  :default => "My Profile")
         #   pat(:profile, "My Profile")
         #
-        def padrino_admin_translate(word, default=nil)
-          t("padrino.admin.#{word}", :default => (default || word.to_s.humanize))
+        def padrino_admin_translate(word,*args)
+          options = args.extract_options!
+          options[:default] ||= word.to_s.humanize
+          t("padrino.admin.#{word}", options)
         end
         alias :pat :padrino_admin_translate
 
@@ -45,9 +66,10 @@ module Padrino
         #   mat(:account, :email)
         #
         def model_attribute_translate(model, attribute)
-          t("models.#{model}.attributes.#{attribute}", :default => attribute.to_s.humanize)
+          t("models.\#{model}.attributes.\#{attribute}", :default => attribute.to_s.humanize)
         end
-        alias :mat :model_attribute_translate
+        alias :t_attr :model_attribute_translate
+        alias :mat :t_attr
 
         ##
         # Translates model name