bootswatch_rails 3.2.0.22 → 3.2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2006ea43501ef37e862e5075bef13a15cc9829a
-  data.tar.gz: f4e9466be1f2dd4964bafe6e3da8cd0250014dce
+  metadata.gz: c9b6d64a94c444c61214c3a4f0fca343ab569dbe
+  data.tar.gz: 0db44cda7ac19f2ee5405c6ca2427cbc11959506
 SHA512:
-  metadata.gz: 38ca818073bd18a3d0b7a0c65565054e4cb604096b4507b3d0ac55e975d2a4bb4be7a205ee5c88fc9740e16c91dd8fc234c8b2dbe11c973138a6b638415983c7
-  data.tar.gz: 18740e3490f9870db0b5f68af5e9a81205ec45647c5422bddba6bf8447541c8e1822f4313f4c7bd3e69e5f909d8d76a922d1c321ea4fb73051340d01fd93089e
+  metadata.gz: e1e8fdf32d93d9fb54b21c4d0ebcbd09c2b57a27f5adf821c72a987d95a81691e9993ef8874385d2073513d35ae1d296be3eb645320c4695765931762d7a6b9a
+  data.tar.gz: 4c39a739911cb688ec8dc7df82f8a172c2cd77d3fcb3d9aeb1e64dc486fbe1bfe55c99d4e33b03dd2ec3aa7c03254040171173edd08f5596b5b70af57cae7997

data/lib/bootswatch_rails/version.rb

@@ -1,6 +1,6 @@
 module BootswatchRails
   BOOTSTRAP = "3.2.0"
-  VERSION = "3.2.0.22"
+  VERSION = "3.2.0.24"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

data/lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb

@@ -1,15 +1,15 @@
 require 'rails/generators/active_record'
 
 module BootswatchRails
-  USER_STATUS = %w(guest member admin sysadm)
-
   module Generators
     class SorceryGenerator < ActiveRecord::Generators::Base
-      desc "Install model, views and controller for user with Sorcery."
+      desc "Install authentication (with Sorcery) and (optional) authorization."
       argument :name, type: :string, default: "user",
                banner: "user model (default 'user')"
       class_option :picture, type: :boolean, default: false,
                desc: 'Add picture to user (needs carrierwave)'
+      class_option :authorization, type: :boolean, default: true,
+               desc: 'Add dynamic athorization on top of authentication'
       class_option :user_activation, type: :boolean, default: false,
                desc: 'User activation by email with optional success email'
       class_option :reset_password, type: :boolean, default: false,
@@ -29,23 +29,41 @@ module BootswatchRails
       class_option :layout, type: :string, default: 'centered',
                desc: 'Layout to be used for rendering login.html.erb'
       source_root File.expand_path("../templates", __FILE__)
-      
-      def add_migration
+
+      def add_migrations
         migration_template "user_migration.rb", "db/migrate/create_#{table_name}.rb"
+        return unless options.authorization?
+        migration_template "role_migration.rb",       "db/migrate/create_roles.rb"
+        migration_template "assignment_migration.rb", "db/migrate/create_assignments.rb"
+        migration_template "ability_migration.rb",    "db/migrate/create_abilities.rb"
       end
 
-      def add_model
+      def add_models
         template "user_model.rb", "app/models/#{name}.rb"
+        return unless options.authorization?
+        template "role_model.rb",       "app/models/role.rb"
+        template "assignment_model.rb", "app/models/assignment.rb"
+        template "ability_model.rb",    "app/models/ability.rb"
+      end
+
+      def add_uploader
+        return unless options.picture?
+        template "picture_uploader.rb", "app/uploaders/picture_uploader.rb"
       end
 
       def add_mailer
         return unless reset_password?
-        template "user_mailer.rb", "app/mailers/#{name}_mailer.rb"
-        template "reset_password_email.html.erb", "app/views/#{name}_mailer/reset_password_email.html.erb"
+        template "user_mailer.rb", "app/mailers/#{mailer_name}.rb"
+        template "reset_password_email.html.erb", "app/views/#{mailer_name}/reset_password_email.html.erb"
       end
 
-      def add_controller
+      def add_controllers
         template "users_controller.rb", "app/controllers/#{table_name}_controller.rb"
+        return unless authorization?
+        # TODO
+        # template "roles_controller.rb",       "app/controllers/roles_controller.rb"
+        # template "assignments_controller.rb", "app/controllers/assignments_controller.rb"
+        # template "abilities_controller.rb",   "app/controllers/abilities_controller.rb"
       end
 
       def add_views
@@ -54,6 +72,8 @@ module BootswatchRails
         views.each do |view|
           template "#{view}.html.erb", "app/views/#{table_name}/#{view}.html.erb"
         end
+        return unless options.authorization?
+        # TODO
       end
 
       def add_routes
@@ -84,6 +104,12 @@ module BootswatchRails
           "  get '/logout' => '#{table_name}#log_out', as: :logout, format: false",
           ""
         ]
+        lines << [
+          "  resources :roles",
+          "  resources :assignments",
+          "  resources :abilities",
+          ""
+        ] if options.authorization?
         route lines.join("\n")
       end
 
@@ -117,6 +143,10 @@ module BootswatchRails
         options.picture?
       end
 
+      def authorization?
+        options.authorization?
+      end
+
       def user_activation?
         options.user_activation?
       end
@@ -180,8 +210,8 @@ module BootswatchRails
 
       def whitelist
         text = ":email, :name, :phone, :comment, :theme, " +
-        ":active, :status, :password, :password_confirmation"
-        text += ", :picture, :picture_cache" if has_picture?
+        ":active, :sysadm, :password, :password_confirmation"
+        text += ", :picture, :picture_cache" if options.picture?
       end
     end
   end

data/lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb

@@ -25,7 +25,9 @@
   <%%= f.input :active %>
   <%%= f.input :password %>
   <%%= f.input :password_confirmation %>
-  <%%= f.input :status %>
+  <%%- if current_<%= name %>.sysadmin and @<%= name %> != current_<%= name %> -%>
+    <%%= f.input :sysadm %>
+  <%%- end -%>
 
   <%%= f.button :submit, class: 'btn btn-primary' %>
   <%%- if @<%= name %>.new_record? -%>

data/lib/generators/bootswatch_rails/sorcery/templates/ability_migration.rb

@@ -0,0 +1,28 @@
+class CreateAbilities < ActiveRecord::Migration
+  def change
+    create_table :abilities do |t|
+      t.belongs_to :role, index: true
+      t.string :resource, null: false
+      t.boolean :create_new, default: false
+      t.boolean :read_own,   default: false
+      t.boolean :read_any,   default: false
+      t.boolean :update_own, default: false
+      t.boolean :update_any, default: false
+      t.boolean :delete_own, default: false
+      t.boolean :delete_any, default: false
+      t.boolean :user1_own,  default: false
+      t.boolean :user1_any,  default: false
+      t.string  :user1_name
+      t.boolean :user2_own,  default: false
+      t.boolean :user2_any,  default: false
+      t.string  :user2_name
+      t.boolean :user3_own,  default: false
+      t.boolean :user3_any,  default: false
+      t.string  :user3_name
+
+      t.timestamps
+    end
+
+    add_index :abilities, :resource, unique: true
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/ability_model.rb

@@ -0,0 +1,3 @@
+class Ability < ActiveRecord::Base
+  belongs_to :role
+end

data/lib/generators/bootswatch_rails/sorcery/templates/assignment_migration.rb

@@ -0,0 +1,10 @@
+class CreateAssignments < ActiveRecord::Migration
+  def change
+    create_table :assignments do |t|
+      t.belongs_to :<%= name %>, index: true
+      t.belongs_to :role, index: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/assignment_model.rb

@@ -0,0 +1,4 @@
+class Assignment < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :role
+end

data/lib/generators/bootswatch_rails/sorcery/templates/index.html.erb

@@ -3,13 +3,16 @@
 <table class="table table-striped table-hover">
   <thead>
     <tr>
-      <th><%%= t('activerecord.models.<%= name %>.one') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.name') %>
+          <br>
+          <%%= t('activerecord.attributes.<%= name %>.phone') %></th>
       <th><%%= t('activerecord.attributes.<%= name %>.comment') %></th>
 <%- if has_picture? -%>
       <th><%%= t('activerecord.attributes.<%= name %>.picture') %></th>
 <%- end -%>
-      <th><%%= t('activerecord.attributes.<%= name %>.active') %></th>
-      <th><%%= t('activerecord.attributes.<%= name %>.status') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.active') %>
+          <br>
+          <%%= t('activerecord.attributes.<%= name %>.sysadm') %></th>
       <th class="index-actions"><%%= t('actions.title') %></th>
     </tr>
   </thead>
@@ -17,13 +20,24 @@
   <tbody>
     <%% @<%= table_name %>.each do |<%= name %>| %>
       <tr>
-        <td><%%= mail_to(<%= name %>.email, <%= name %>.name) %><br><%%= <%= name %>.phone %></td>
-        <td><%%= <%= name %>.comment %></td>
+        <td>
+          <%%= mail_to(<%= name %>.email, <%= name %>.name) %>
+          <br>
+          <%%= <%= name %>.phone %>
+        </td>
+        <td>
+          <%%= <%= name %>.comment %>
+        </td>
 <%- if has_picture? -%>
-        <td><%%= image_tag(<%= name %>.picture_url(:thumb).to_s) %></td>
+        <td>
+          <%%= image_tag(<%= name %>.picture_url(:thumb).to_s) %>
+        </td>
 <%- end -%>
-        <td><%%= <%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
-        <td><%%= t('enums.<%= name %>.status.' + <%= name %>.status) %></td>
+        <td>
+          <%%= <%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %>
+          <br>
+          <%%= <%= name %>.sysadm ? t('simple_form.yes') : t('simple_form.no') %>
+        </td>
         <td class="index-actions">
           <%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
           <%%- if current_<%= name %>.status.to_sym == :sysadm or <%= name %> == current_<%= name %> -%>

data/lib/generators/bootswatch_rails/sorcery/templates/picture_uploader.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+class PictureUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
+  ## Seems to be gone in Rails 4.0 ???
+  ## include Sprockets::Helpers::RailsHelper
+  ## include Sprockets::Helpers::IsolatedHelper
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  version :thumb do
+    process :resize_to_limit => [100, 100]
+  end
+  version :carousel do
+    process :resize_to_fill => [600, 400]
+  end
+  version :display do
+    process :resize_to_limit => [600, 600]
+  end
+  version :avatar do
+    process :resize_to_limit => [300, 300]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

data/lib/generators/bootswatch_rails/sorcery/templates/role_migration.rb

@@ -0,0 +1,11 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table :roles do |t|
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    add_index :roles, :name, unique: true
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/role_model.rb

@@ -0,0 +1,5 @@
+class Role < ActiveRecord::Base
+  has_many :assignments
+  has_many :users, through: :assignments
+  has_many :abilities
+end

data/lib/generators/bootswatch_rails/sorcery/templates/roles_controller.rb

@@ -0,0 +1,80 @@
+class RolesController < ApplicationController
+  force_ssl if: :ssl_configured?
+  before_action :set_role, only: [:show, :edit, :update, :destroy]
+
+  # GET /roles
+  # GET /roles.json
+  def index
+    @roles = Role.all
+  end
+
+  # GET /roles/1
+  # GET /roles/1.json
+  def show
+  end
+
+  # GET /roles/new
+  def new
+    @role = Role.new
+  end
+
+  # GET /roles/1/edit
+  def edit
+  end
+
+  # POST /roles
+  # POST /roles.json
+  def create
+    @role = Role.new(role_params)
+
+    respond_to do |format|
+      if @role.save
+        format.html { redirect_to @role, notice: 'Role was successfully created.' }
+        format.json { render :show, status: :created, location: @role }
+      else
+        format.html { render :new }
+        format.json { render json: @role.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /roles/1
+  # PATCH/PUT /roles/1.json
+  def update
+    respond_to do |format|
+      if @role.update(role_params)
+        format.html { redirect_to @role, notice: 'Role was successfully updated.' }
+        format.json { render :show, status: :ok, location: @role }
+      else
+        format.html { render :edit }
+        format.json { render json: @role.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /roles/1
+  # DELETE /roles/1.json
+  def destroy
+    @role.destroy
+    respond_to do |format|
+      format.html { redirect_to roles_url, notice: 'Role was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Always enforce SSL for this controller
+    def ssl_configured?
+      Rails.env.production?
+    end
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_role
+      @role = Role.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def role_params
+      params.require(:role).permit(:name)
+    end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb

@@ -35,8 +35,8 @@
       <td><%%= @<%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
     </tr>
     <tr>
-      <td><%%= t('activerecord.attributes.<%= name %>.status') %></td>
-      <td><%%= t('enums.<%= name %>.status.' + @<%= name %>.status) %></td>
+      <td><%%= t('activerecord.attributes.<%= name %>.sysadm') %></td>
+      <td><%%= @<%= name %>.sysadm ? t('simple_form.yes') : t('simple_form.no') %></td>
     </tr>
 <%- if activity_logging? -%>
   <%%- if @<%= name %>.last_login_at.present? -%>

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml

@@ -29,19 +29,22 @@ de:
     reset_password_email:
       subject: "Kennwort für #{name} zurücksetzen"
 
-  enums:
-    <%= name %>:
-      status:
-        guest: "Gast"
-        member: "Mitglied"
-        admin: "Admin"
-        sysadm: "System-Admin"
-
   activerecord:
     models:
       <%= name %>:
         one: "Benutzer"
         other: "Benutzer"
+<%- if authorization? -%>
+      role:
+        one: "Rolle"
+        other: "Rollen"
+      assignment:
+        one: "Rollenzuordnung"
+        other: "Rollenzuordnungen"
+      ability:
+        one: "Fähigkeit"
+        other: Fähigkeiten"
+<%- end -%>
     attributes:
       <%= name %>:
         email: "E-Mail"
@@ -53,7 +56,7 @@ de:
 <%- end -%>
         theme: "Oberfläche"
         active: "Aktiv"
-        status: "Status"
+        sysadm: "Admin"
         password: "Kennwort"
         password_confirmation: "Kennwort wiederholen"
 <%- if remember_me? -%>
@@ -69,3 +72,29 @@ de:
         failed_logins_count: "Fehlversuche Anmeldung"
         lock_expires_at: "Gesperrt bis"
 <%- end -%>
+<%- if options.authorization? -%>
+      role:
+        name: "Bezeichnung"
+      assignment:
+        <%= name %>: "Benutzer"
+        role: "Rolle"
+      ability:
+        resource: "Tabelle"
+        create_new: "Neu Anlegen"
+        read_own: "Lesen Eigene"
+        read_any: "Lesen Alle"
+        update_own: "Edit Eigene"
+        update_any: "Edit Alle"
+        delete_own: "Löschen Eigene"
+        delete_any: "Löschen Alle"
+        user1_own: "Zusatz1 Eigene"
+        user1_any: "Zusatz1 Alle"
+        user1_name: "Zusatz1 Name"
+        user2_own: "Zusatz2 Eigene"
+        user2_any: "Zusatz2 Alle"
+        user2_name: "Zusatz2 Name"
+        user3_own: "Zusatz3 Eigene"
+        user3_any: "Zusatz3 Alle"
+        user3_name: "Zusatz3 Name"
+<%- end -%>
+

data/lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb

@@ -1,51 +1,51 @@
 class <%= migration_name.camelize %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
-      t.string :email, null: false
-      t.string :name
-      t.string :phone
-      t.text :comment
+      t.string   :email, null: false
+      t.string   :name
+      t.string   :phone
+      t.text     :comment
 <%- if has_picture? -%>
-      t.string :picture
+      t.string   :picture
 <%- end -%>
-      t.integer :theme, default: BootswatchRails::DEFAULT
-      t.boolean :active, default: true
-      t.integer :status, default: 0
+      t.integer  :theme, default: BootswatchRails::DEFAULT
+      t.boolean  :active, default: true
+      t.boolean  :sysadm, default: false
 
-      t.string :crypted_password, null: false
-      t.string :salt, null: false
+      t.string   :crypted_password, null: false
+      t.string   :salt, null: false
 <%- if user_activation? -%>
-      t.string :activation_state, default: nil
-      t.string :activation_token, default: nil
+      t.string   :activation_state, default: nil
+      t.string   :activation_token, default: nil
       t.datetime :activation_token_expires_at, default: nil
 <%- end -%>
 <%- if reset_password? -%>
-      t.string :reset_password_token, default: nil
+      t.string   :reset_password_token, default: nil
       t.datetime :reset_password_token_expires_at, default: nil
       t.datetime :reset_password_email_sent_at, default: nil
 <%- end -%>
 <%- if remember_me? -%>
-      t.boolean :remember_me
-      t.string :remember_me_token, default: nil
+      t.boolean  :remember_me
+      t.string   :remember_me_token, default: nil
       t.datetime :remember_me_token_expires_at, default: nil
 <%- end -%>
 <%- if brute_force_protection? -%>
-      t.integer :failed_logins_count, default: 0
+      t.integer  :failed_logins_count, default: 0
       t.datetime :lock_expires_at, default: nil
-      t.string :unlock_token, default: nil
+      t.string   :unlock_token, default: nil
 <%- end -%>
 <%- if activity_logging? -%>
       t.datetime :last_login_at, default: nil
       t.datetime :last_logout_at, default: nil
       t.datetime :last_activity_at, default: nil
-      t.string :last_login_from_ip_address, default: nil
+      t.string   :last_login_from_ip_address, default: nil
 <%- end -%>
 
       t.timestamps
     end
 
     add_index :<%= table_name %>, :email, unique: true
-    add_index :<%= table_name %>, :status
+    add_index :<%= table_name %>, :sysadm
 <%- if user_activation? -%>
     add_index :<%= table_name %>, :activation_token
 <%- end -%>

data/lib/generators/bootswatch_rails/sorcery/templates/user_model.rb

@@ -6,12 +6,13 @@ class <%= class_name %> < ActiveRecord::Base
   validates :password, confirmation: true
   validates :password_confirmation, presence: true, on: :create
 
+  has_many :assignments
+  has_many :roles, through: :assignments
+  has_many :abilities, through: :roles
+
 <%- if has_picture? -%>
   mount_uploader :picture, PictureUploader
 
 <%- end -%>
-  enum status: <%= BootswatchRails::USER_STATUS %>
-  validates :status, presence: true
-
   enum theme: BootswatchRails::THEMES
 end

data/vendor/assets/stylesheets/paper.css

@@ -3665,11 +3665,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .nav-tabs.nav-justified > .active > a,
 .nav-tabs.nav-justified > .active > a:hover,
 .nav-tabs.nav-justified > .active > a:focus {
-  border: 1px solid #dddddd;
+  border: 1px solid transparent;
 }
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid transparent;
     border-radius: 3px 3px 0 0;
   }
   .nav-tabs.nav-justified > .active > a,
@@ -3733,11 +3733,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .nav-tabs-justified > .active > a,
 .nav-tabs-justified > .active > a:hover,
 .nav-tabs-justified > .active > a:focus {
-  border: 1px solid #dddddd;
+  border: 1px solid transparent;
 }
 @media (min-width: 768px) {
   .nav-tabs-justified > li > a {
-    border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid transparent;
     border-radius: 3px 3px 0 0;
   }
   .nav-tabs-justified > .active > a,
@@ -5630,7 +5630,7 @@ button.close {
   margin-left: -11px;
   border-bottom-width: 0;
   border-top-color: rgba(0, 0, 0, 0);
-  border-top-color: rgba(0, 0, 0, 0.05);
+  border-top-color: rgba(0, 0, 0, 0.075);
   bottom: -11px;
 }
 .popover.top > .arrow:after {
@@ -5646,7 +5646,7 @@ button.close {
   margin-top: -11px;
   border-left-width: 0;
   border-right-color: rgba(0, 0, 0, 0);
-  border-right-color: rgba(0, 0, 0, 0.05);
+  border-right-color: rgba(0, 0, 0, 0.075);
 }
 .popover.right > .arrow:after {
   content: " ";
@@ -5660,7 +5660,7 @@ button.close {
   margin-left: -11px;
   border-top-width: 0;
   border-bottom-color: rgba(0, 0, 0, 0);
-  border-bottom-color: rgba(0, 0, 0, 0.05);
+  border-bottom-color: rgba(0, 0, 0, 0.075);
   top: -11px;
 }
 .popover.bottom > .arrow:after {
@@ -5676,7 +5676,7 @@ button.close {
   margin-top: -11px;
   border-right-width: 0;
   border-left-color: rgba(0, 0, 0, 0);
-  border-left-color: rgba(0, 0, 0, 0.05);
+  border-left-color: rgba(0, 0, 0, 0.075);
 }
 .popover.left > .arrow:after {
   content: " ";
@@ -6280,7 +6280,8 @@ body {
 p {
   margin: 0 0 1em;
 }
-input {
+input,
+button {
   -webkit-font-smoothing: antialiased;
   letter-spacing: .1px;
   text-rendering: optimizeLegibility;
@@ -6290,13 +6291,14 @@ a {
   -o-transition: all 0.2s;
   transition: all 0.2s;
 }
+textarea,
+textarea.form-control,
 input[type=text],
 input[type=password],
 input[type=email],
-textarea,
+input[type=number],
 [type=text].form-control,
-[type=password].form-control,
-textarea.form-control {
+[type=password].form-control {
   padding: 0;
   border: none;
   border-radius: 0;
@@ -6304,30 +6306,33 @@ textarea.form-control {
   box-shadow: inset 0 -1px 0 #dddddd;
   font-size: 16px;
 }
+textarea:focus,
+textarea.form-control:focus,
 input[type=text]:focus,
 input[type=password]:focus,
 input[type=email]:focus,
-textarea:focus,
+input[type=number]:focus,
 [type=text].form-control:focus,
-[type=password].form-control:focus,
-textarea.form-control:focus {
+[type=password].form-control:focus {
   -webkit-box-shadow: inset 0 -2px 0 #2196f3;
   box-shadow: inset 0 -2px 0 #2196f3;
 }
+textarea[disabled],
+textarea.form-control[disabled],
 input[type=text][disabled],
 input[type=password][disabled],
 input[type=email][disabled],
-textarea[disabled],
+input[type=number][disabled],
 [type=text].form-control[disabled],
 [type=password].form-control[disabled],
-textarea.form-control[disabled],
+textarea[readonly],
+textarea.form-control[readonly],
 input[type=text][readonly],
 input[type=password][readonly],
 input[type=email][readonly],
-textarea[readonly],
+input[type=number][readonly],
 [type=text].form-control[readonly],
-[type=password].form-control[readonly],
-textarea.form-control[readonly] {
+[type=password].form-control[readonly] {
   -webkit-box-shadow: none;
   box-shadow: none;
   border-bottom: 1px dotted #ddd;
@@ -6384,11 +6389,18 @@ select.form-control {
 }
 .nav-tabs > li.active > a:hover {
   border: none;
+  color: #2196f3;
 }
 .nav-tabs > li.disabled > a {
   -webkit-box-shadow: inset 0 -1px 0 #dddddd;
   box-shadow: inset 0 -1px 0 #dddddd;
 }
+.nav-tabs.nav-justified > li > a,
+.nav-tabs.nav-justified > li > a:hover,
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover {
+  border: none;
+}
 .nav-tabs .dropdown-menu {
   margin-top: 0;
 }
@@ -6413,7 +6425,7 @@ select.form-control {
 .alert-danger {
   background-color: #e51c23;
 }
-.alert a,
+.alert a:not(.close),
 .alert .alert-link {
   color: #fff;
   font-weight: bold;
@@ -6465,6 +6477,7 @@ select.form-control {
 .close {
   font-size: 34px;
   font-weight: 300;
+  line-height: 24px;
   opacity: 0.6;
 }
 .close:hover {

data/vendor/assets/stylesheets/yeti.css

@@ -891,7 +891,7 @@ html {
 body {
   font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 15px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #222222;
   background-color: #ffffff;
 }
@@ -938,7 +938,7 @@ img {
 }
 .img-thumbnail {
   padding: 4px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   border-radius: 0;
@@ -1243,7 +1243,7 @@ dl {
 }
 dt,
 dd {
-  line-height: 1.42857143;
+  line-height: 1.4;
 }
 dt {
   font-weight: bold;
@@ -1290,7 +1290,7 @@ blockquote small,
 blockquote .small {
   display: block;
   font-size: 80%;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #6f6f6f;
 }
 blockquote footer:before,
@@ -1329,7 +1329,7 @@ blockquote:after {
 address {
   margin-bottom: 21px;
   font-style: normal;
-  line-height: 1.42857143;
+  line-height: 1.4;
 }
 code,
 kbd,
@@ -1362,7 +1362,7 @@ pre {
   padding: 10px;
   margin: 0 0 10.5px;
   font-size: 14px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   word-break: break-all;
   word-wrap: break-word;
   color: #333333;
@@ -2067,7 +2067,7 @@ th {
 .table > tbody > tr > td,
 .table > tfoot > tr > td {
   padding: 8px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   vertical-align: top;
   border-top: 1px solid #dddddd;
 }
@@ -2337,18 +2337,18 @@ input[type="checkbox"]:focus {
 }
 output {
   display: block;
-  padding-top: 15px;
+  padding-top: 9px;
   font-size: 15px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #6f6f6f;
 }
 .form-control {
   display: block;
   width: 100%;
-  height: 51px;
-  padding: 14px 18px;
+  height: 39px;
+  padding: 8px 12px;
   font-size: 15px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #6f6f6f;
   background-color: #ffffff;
   background-image: none;
@@ -2393,8 +2393,8 @@ input[type="date"],
 input[type="time"],
 input[type="datetime-local"],
 input[type="month"] {
-  line-height: 51px;
-  line-height: 1.42857143 \0;
+  line-height: 39px;
+  line-height: 1.4 \0;
 }
 input[type="date"].input-sm,
 input[type="time"].input-sm,
@@ -2473,8 +2473,8 @@ fieldset[disabled] .checkbox label {
   cursor: not-allowed;
 }
 .form-control-static {
-  padding-top: 15px;
-  padding-bottom: 15px;
+  padding-top: 9px;
+  padding-bottom: 9px;
   margin-bottom: 0;
 }
 .form-control-static.input-lg,
@@ -2518,7 +2518,7 @@ select[multiple].input-lg {
   position: relative;
 }
 .has-feedback .form-control {
-  padding-right: 63.75px;
+  padding-right: 48.75px;
 }
 .form-control-feedback {
   position: absolute;
@@ -2526,9 +2526,9 @@ select[multiple].input-lg {
   right: 0;
   z-index: 2;
   display: block;
-  width: 51px;
-  height: 51px;
-  line-height: 51px;
+  width: 39px;
+  height: 39px;
+  line-height: 39px;
   text-align: center;
 }
 .input-lg + .form-control-feedback {
@@ -2681,11 +2681,11 @@ select[multiple].input-lg {
 .form-horizontal .checkbox-inline {
   margin-top: 0;
   margin-bottom: 0;
-  padding-top: 15px;
+  padding-top: 9px;
 }
 .form-horizontal .radio,
 .form-horizontal .checkbox {
-  min-height: 36px;
+  min-height: 30px;
 }
 .form-horizontal .form-group {
   margin-left: -15px;
@@ -2695,7 +2695,7 @@ select[multiple].input-lg {
   .form-horizontal .control-label {
     text-align: right;
     margin-bottom: 0;
-    padding-top: 15px;
+    padding-top: 9px;
   }
 }
 .form-horizontal .has-feedback .form-control-feedback {
@@ -2722,9 +2722,9 @@ select[multiple].input-lg {
   background-image: none;
   border: 1px solid transparent;
   white-space: nowrap;
-  padding: 14px 18px;
+  padding: 8px 12px;
   font-size: 15px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   border-radius: 0;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -3153,7 +3153,7 @@ tbody.collapse.in {
   padding: 3px 20px;
   clear: both;
   font-weight: normal;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #555555;
   white-space: nowrap;
 }
@@ -3202,7 +3202,7 @@ tbody.collapse.in {
   display: block;
   padding: 3px 20px;
   font-size: 12px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   color: #999999;
   white-space: nowrap;
 }
@@ -3491,7 +3491,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   vertical-align: middle;
 }
 .input-group-addon {
-  padding: 14px 18px;
+  padding: 8px 12px;
   font-size: 15px;
   font-weight: normal;
   line-height: 1;
@@ -3618,7 +3618,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 }
 .nav-tabs > li > a {
   margin-right: 2px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   border: 1px solid transparent;
   border-radius: 0 0 0 0;
 }
@@ -3973,8 +3973,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   border-bottom: 1px solid transparent;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  margin-top: -3px;
-  margin-bottom: -3px;
+  margin-top: 3px;
+  margin-bottom: 3px;
 }
 @media (min-width: 768px) {
   .navbar-form .form-group {
@@ -4053,8 +4053,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   border-bottom-left-radius: 0;
 }
 .navbar-btn {
-  margin-top: -3px;
-  margin-bottom: -3px;
+  margin-top: 3px;
+  margin-bottom: 3px;
 }
 .navbar-btn.btn-sm {
   margin-top: 4.5px;
@@ -4307,8 +4307,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 .pagination > li > span {
   position: relative;
   float: left;
-  padding: 14px 18px;
-  line-height: 1.42857143;
+  padding: 8px 12px;
+  line-height: 1.4;
   text-decoration: none;
   color: #008cba;
   background-color: transparent;
@@ -4573,7 +4573,7 @@ a.list-group-item.active > .badge,
   display: block;
   padding: 4px;
   margin-bottom: 21px;
-  line-height: 1.42857143;
+  line-height: 1.4;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   border-radius: 0;
@@ -5416,14 +5416,14 @@ button.close {
 .modal-header {
   padding: 15px;
   border-bottom: 1px solid #e5e5e5;
-  min-height: 16.42857143px;
+  min-height: 16.4px;
 }
 .modal-header .close {
   margin-top: -2px;
 }
 .modal-title {
   margin: 0;
-  line-height: 1.42857143;
+  line-height: 1.4;
 }
 .modal-body {
   position: relative;
@@ -6233,7 +6233,7 @@ button.close {
   background-color: #006687;
 }
 .btn {
-  padding: 14px 18px;
+  padding: 8px 12px;
 }
 .btn-lg {
   padding: 16px 20px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.22
+  version: 3.2.0.24
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -123,6 +123,10 @@ files:
 - lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/show.html.erb
 - lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb
 - lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/ability_migration.rb
+- lib/generators/bootswatch_rails/sorcery/templates/ability_model.rb
+- lib/generators/bootswatch_rails/sorcery/templates/assignment_migration.rb
+- lib/generators/bootswatch_rails/sorcery/templates/assignment_model.rb
 - lib/generators/bootswatch_rails/sorcery/templates/change.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/edit.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/index.html.erb
@@ -130,7 +134,11 @@ files:
 - lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/new.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/password.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/picture_uploader.rb
 - lib/generators/bootswatch_rails/sorcery/templates/reset_password_email.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/role_migration.rb
+- lib/generators/bootswatch_rails/sorcery/templates/role_model.rb
+- lib/generators/bootswatch_rails/sorcery/templates/roles_controller.rb
 - lib/generators/bootswatch_rails/sorcery/templates/show.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml
 - lib/generators/bootswatch_rails/sorcery/templates/user_mailer.rb
@@ -185,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Add bootswatch.com themes to the Rails asset pipeline