bootswatch_rails 3.3.0.4 → 3.3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146e09c0bf1abcabc3d6d87f3bbd3036575897c6
-  data.tar.gz: 1e233be8a713f31131520741f9320010806c565e
+  metadata.gz: 0d0d6efb0c4b56a2af9105b3c8167d0de16b0af0
+  data.tar.gz: b15a82573f9e3e328dca1173468ec18e15c05fd4
 SHA512:
-  metadata.gz: d2dbc2d8b5b14ebfe17a980ccae826883dd05ea78809ee7e8c9b412a0656b3d81b0a20773e08d5f9ed65afb1658ea3d4e7ca1f9d70678bf67ab05cfbce82878d
-  data.tar.gz: 3e8f4c4fe612de084ac4065d4ea5296687d6d67543fa35bd96d7df86c1ac134930bf1f42f7872f8b912ac797a121ec3005949c4b760c1d87792a8a10fc807626
+  metadata.gz: 0921b682e32e3b93677183b82e5de17177b6e95e4040e87b6ee603ff144342ff5d9a08c0a7e235d5abe1aa4d463f5f7f452dbb56555163638a90a2053223daa9
+  data.tar.gz: 54ebe17cd7b7d9b826e3bee0f7166f3542ec2ab27c68402e0e86f2923a281b3e38387c5f99a5cd7fbebcd15c053c5a427e5858e2ce7d1b490132baa4c1e1df5f

data/lib/bootswatch_rails/version.rb

@@ -2,7 +2,7 @@ module BootswatchRails
   BOOTSTRAP = "3.3.0"
   BOOTSWATCH = "3.2.0"
   FONT_AWESOME = "4.2.0"
-  VERSION = "3.3.0.4"
+  VERSION = "3.3.0.5"
 
   THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 0

data/lib/generators/bootswatch_rails/install/templates/head.html.erb

@@ -2,6 +2,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+  <%%= favicon_link_tag 'favicon.ico' %>
   <title><%%= content_for?(:title) ? yield(:title) : app_name %></title>
 
   <%%= stylesheet_link_tag 'application', media: 'all'<%= turbolinks %> %>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/edit.html.erb

@@ -1,4 +1,5 @@
 <%%- page_title t('activerecord.models.<%= singular_table_name %>.one') -%>
 <h2><%%= t('headers.edit', name: t('activerecord.models.<%= singular_table_name %>.one')) %></h2>
+<%%- content_for(:help) { "<%= singular_table_name %>_edit" } -%>
 
 <%%= render 'form' %>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/index.html.erb

@@ -1,5 +1,6 @@
 <%%- page_title t('activerecord.models.<%= singular_table_name %>.other') -%>
 <h2><%%= t('headers.index', name: t('activerecord.models.<%= singular_table_name %>.other')) %></h2>
+<%%- content_for(:help) { "<%= singular_table_name %>_index" } -%>
 
 <table class="table table-striped table-hover">
   <thead>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/new.html.erb

@@ -1,4 +1,5 @@
 <%%- page_title t('activerecord.models.<%= singular_table_name %>.one') -%>
 <h2><%%= t('headers.new', name: t('activerecord.models.<%= singular_table_name %>.one')) %></h2>
+<%%- content_for(:help) { "<%= singular_table_name %>_new" } -%>
 
 <%%= render 'form' %>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/show.html.erb

@@ -1,5 +1,6 @@
 <%%- page_title t('activerecord.models.<%= singular_table_name %>.one') -%>
 <h2><%%= t('headers.show', name: t('activerecord.models.<%= singular_table_name %>.one')) %></h2>
+<%%- content_for(:help) { "<%= singular_table_name %>_show" } -%>
 
 <table class="table table-striped table-hover">
   <tbody>

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

@@ -3,15 +3,17 @@ require 'rails/generators/active_record'
 module BootswatchRails
   module Generators
     class SorceryGenerator < ActiveRecord::Generators::Base
-      desc "Install authentication (with Sorcery) and (optional) authorization."
+      desc "Install authentication (with Sorcery) and setup users."
       argument :name, type: :string, default: "user",
                banner: "name of the user model"
       class_option :picture, type: :boolean, default: false,
                desc: 'Add picture to user (needs carrierwave)'
       class_option :gravatar, type: :boolean, default: false,
                desc: 'Add Gravatar image to user (uses email)'
-      class_option :authorization, type: :boolean, default: false,
-               desc: 'Add dynamic athorization on top of authentication'
+      class_option :authority, type: :boolean, default: false,
+               desc: 'Add athorization (requires authority gem)'
+      class_option :add_attr, type: :array, banner: "FIELD[:TYPE][:INDEX] ...",
+               desc: 'Setup additional attributes for user model'
       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,
@@ -34,18 +36,10 @@ module BootswatchRails
 
       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_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
@@ -66,11 +60,6 @@ module BootswatchRails
 
       def add_controllers
         template "users_controller.rb", "app/controllers/#{table_name}_controller.rb"
-        return unless options.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
@@ -79,8 +68,6 @@ 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
@@ -111,12 +98,6 @@ 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
 
@@ -151,6 +132,17 @@ module BootswatchRails
 
       protected
 
+      def added_fields
+        list = options.add_attr || []
+        array = []
+        list.each do |entry|
+          name, type, index = entry.split(':')
+          type, index = ["string", type] if %w(index uniq).include? type
+          array << [name, type, index]
+        end
+        array
+      end
+
       def submodules
         modules = []
         modules << ":user_activation"        if options.user_activation?
@@ -180,6 +172,9 @@ module BootswatchRails
         text = ":email, :name, :phone, :comment, :theme, " +
         ":active, :sysadm, :password, :password_confirmation"
         text += ", :picture, :picture_cache" if options.picture?
+        added_fields.each do |field|
+          text += ", #{field[0]}"
+        end
         text
       end
     end

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

@@ -28,6 +28,9 @@
   <%%- if current_<%= name %>.sysadm and @<%= name %> != current_<%= name %> -%>
     <%%= f.input :sysadm %>
   <%%- end -%>
+<%- added_fields.each do |field| -%>
+    <%%= f.input :<%= field[0] %> %>
+<%- end -%>
 
   <%%= f.button :submit, class: 'btn btn-primary' %>
   <%%- if @<%= name %>.new_record? -%>

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

@@ -1,5 +1,6 @@
 <%%- page_title t('sorcery.reset.choose') -%>
 <h2><%%= t('sorcery.reset.choose') %></h2>
+<%%- content_for(:help) { "<%= name %>_change" } -%>
 
 <%%= simple_form_for(@<%= name %>, url: {action: "refresh"}) do |f| %>
   <%%= f.error_notification %>

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

@@ -1,4 +1,5 @@
 <%%- page_title t('headers.edit', name: t('activerecord.models.<%= name %>.one')) -%>
 <h2><%%= t('headers.edit', name: t('activerecord.models.<%= name %>.one')) %></h2>
+<%%- content_for(:help) { "<%= name %>_edit" } -%>
 
 <%%= render 'form' %>

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

@@ -1,5 +1,6 @@
 <%%- page_title t('headers.index', name: t('activerecord.models.<%= name %>.other')) -%>
 <h2><%%= t('headers.index', name: t('activerecord.models.<%= name %>.other')) %></h2>
+<%%- content_for(:help) { "<%= name %>_index" } -%>
 
 <table class="table table-striped table-hover">
   <thead>
@@ -14,6 +15,9 @@
       <th><%%= t('activerecord.attributes.<%= name %>.gravatar') %></th>
 <%- end -%>
       <th><%%= t('activerecord.attributes.<%= name %>.active') %></th>
+<%- added_fields.each do |field| -%>
+      <th><%%= t('activerecord.attributes.<%= name %>.<%= field[0] %>') %></th>
+<%- end -%>
       <th class="index-actions"><%%= t('actions.title') %></th>
     </tr>
   </thead>
@@ -45,6 +49,11 @@
           (<%%= t('activerecord.attributes.<%= name %>.sysadm') %>)
         <%%- end -%>
         </td>
+<%- added_fields.each do |field| -%>
+        <td>
+          <%%= <%= name %>.<%= field[0] %> %>
+        </td>
+<%- end -%>
         <td class="index-actions">
           <%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
           <%%- if current_<%= name %>.sysadm or <%= name %> == current_<%= name %> -%>

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

@@ -1,5 +1,6 @@
 <%%- page_title t('sorcery.header') -%>
 <h2><%%= t('sorcery.header') %></h2>
+<%%- content_for(:help) { "<%= name %>_login" } -%>
 
 <%%= simple_form_for(@<%= name %>, url: {action: "access"}) do |f| %>
   <%%= f.error_notification %>

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

@@ -1,4 +1,5 @@
 <%%- page_title t('headers.new', name: t('activerecord.models.<%= name %>.one')) -%>
 <h2><%%= t('headers.new', name: t('activerecord.models.<%= name %>.one')) %></h2>
+<%%- content_for(:help) { "<%= name %>_new" } -%>
 
 <%%= render 'form' %>

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

@@ -1,5 +1,6 @@
 <%%- page_title t('sorcery.reset.header') -%>
 <h2><%%= t('sorcery.reset.header') %></h2>
+<%%- content_for(:help) { "<%= name %>_password" } -%>
 
 <%%= simple_form_for(@<%= name %>, url: {action: "reset"}) do |f| %>
   <%%= f.error_notification %>

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

@@ -1,5 +1,6 @@
 <%%- page_title @<%= name %>.name -%>
 <h2><%%= @<%= name %>.name %></h2>
+<%%- content_for(:help) { "<%= name %>_show" } -%>
 
 <table class="table table-striped table-hover">
   <tbody>
@@ -45,6 +46,12 @@
       <td><%%= t('activerecord.attributes.<%= name %>.sysadm') %></td>
       <td><%%= @<%= name %>.sysadm ? t('simple_form.yes') : t('simple_form.no') %></td>
     </tr>
+<%- added_fields.each do |field| -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.<%= field[0] %>') %></td>
+      <td><%%= @<%= name %>.<%= field[0] %> %></td>
+    </tr>
+<%- end -%>
 <%- if options.activity_logging? -%>
   <%%- if @<%= name %>.last_login_at.present? -%>
     <tr>

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

@@ -34,17 +34,7 @@ de:
       <%= name %>:
         one: "Benutzer"
         other: "Benutzer"
-<%- if options.authorization? -%>
-      role:
-        one: "Rolle"
-        other: "Rollen"
-      assignment:
-        one: "Rollenzuordnung"
-        other: "Rollenzuordnungen"
-      ability:
-        one: "Fähigkeit"
-        other: Fähigkeiten"
-<%- end -%>
+        new: "Neuer Benutzer"
     attributes:
       <%= name %>:
         email: "E-Mail"
@@ -75,29 +65,4 @@ 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

@@ -11,6 +11,12 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
       t.integer  :theme, default: BootswatchRails::DEFAULT
       t.boolean  :active, default: true
       t.boolean  :sysadm, default: false
+<%- if added_fields.any? -%>
+
+  <%- added_fields.each do |field| -%>
+      t.<%= field[1] %>  :<%= field[0] %>
+  <%- end -%>
+<%- end -%>
 
       t.string   :crypted_password, null: false
       t.string   :salt, null: false
@@ -46,6 +52,15 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
 
     add_index :<%= table_name %>, :email, unique: true
     add_index :<%= table_name %>, :sysadm
+<%- if added_fields.any? -%>
+  <%- added_fields.each do |field| -%>
+    <%- if field[2] == "uniq" -%>
+    add_index :<%= table_name %>, :<%= field[0] %>, unique: true
+    <%- elsif field[2] == "index" -%>
+    add_index :<%= table_name %>, :<%= field[0] %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
 <%- if options.user_activation? -%>
     add_index :<%= table_name %>, :activation_token
 <%- end -%>

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

@@ -10,12 +10,6 @@ class <%= class_name %> < ActiveRecord::Base
   scope :active, -> { where(active: true) }
   scope :sysadms, -> { where(sysadm: true) }
   
-<%- if options.authorization? -%>
-  has_many :assignments
-  has_many :roles, through: :assignments
-  has_many :abilities, through: :roles
-
-<%- end -%>
 <%- if options.picture? -%>
   mount_uploader :picture, PictureUploader
 

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

@@ -1,6 +1,6 @@
 class <%= controller_name.camelize %> < ApplicationController
   force_ssl if: :ssl_configured?
-  skip_before_filter :require_login, only: [:log_in, :access, :password, :reset, :change, :refresh, :log_out]
+  skip_before_action :require_login, only: [:log_in, :access, :password, :reset, :change, :refresh, :log_out]
   before_action :set_<%= name %>, only: [:show, :edit, :update, :destroy]
 
   # GET /<%= table_name %>

data/vendor/assets/stylesheets/cosmo.css

@@ -6447,6 +6447,27 @@ table .info a,
 .panel-default .close {
   color: #333333;
 }
+a.list-group-item-success.active {
+  background-color: #3fb618;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #379f15;
+}
+a.list-group-item-warning.active {
+  background-color: #ff7518;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #fe6600;
+}
+a.list-group-item-danger.active {
+  background-color: #ff0039;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #e60033;
+}
 .modal .close {
   color: #333333;
 }

data/vendor/assets/stylesheets/cyborg.css

@@ -6424,6 +6424,32 @@ a.thumbnail:focus,
 a.thumbnail.active {
   border-color: #282828;
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border-color: #282828;
+}
+a.list-group-item-success.active {
+  background-color: #77b300;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #669a00;
+}
+a.list-group-item-warning.active {
+  background-color: #ff8800;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #e67a00;
+}
+a.list-group-item-danger.active {
+  background-color: #cc0000;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #b30000;
+}
 .jumbotron h1,
 .jumbotron h2,
 .jumbotron h3,

data/vendor/assets/stylesheets/darkly.css

@@ -6542,6 +6542,32 @@ textarea:focus {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border-color: #464545;
+}
+a.list-group-item-success.active {
+  background-color: #00bc8c;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #00a379;
+}
+a.list-group-item-warning.active {
+  background-color: #f39c12;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #e08e0b;
+}
+a.list-group-item-danger.active {
+  background-color: #e74c3c;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #e43725;
+}
 .popover {
   color: #ffffff;
 }

data/vendor/assets/stylesheets/flatly.css

@@ -6518,6 +6518,32 @@ input:focus {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border-color: #ecf0f1;
+}
+a.list-group-item-success.active {
+  background-color: #18bc9c;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #15a589;
+}
+a.list-group-item-warning.active {
+  background-color: #f39c12;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #e08e0b;
+}
+a.list-group-item-danger.active {
+  background-color: #e74c3c;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #e43725;
+}
 .panel-default .close {
   color: #2c3e50;
 }

data/vendor/assets/stylesheets/lumen.css

@@ -6659,6 +6659,32 @@ label {
   -webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.05);
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border-color: #dddddd;
+}
+a.list-group-item-success.active {
+  background-color: #28b62c;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #23a127;
+}
+a.list-group-item-warning.active {
+  background-color: #ff851b;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #ff7701;
+}
+a.list-group-item-danger.active {
+  background-color: #ff4136;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #ff291c;
+}
 .jumbotron {
   border: 1px solid #e7e7e7;
   -webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.05);

data/vendor/assets/stylesheets/paper.css

@@ -6565,10 +6565,18 @@ input[type=number][readonly],
 }
 select,
 select.form-control {
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-box-shadow: none;
-  box-shadow: none;
+  border: 0;
+  border-radius: 0;
+  -webkit-appearance: none;
+  -webkit-box-shadow: inset 0 -1px 0 #dddddd;
+  box-shadow: inset 0 -1px 0 #dddddd;
+  font-size: 16px;
+  padding-left: 0px;
+}
+select:focus,
+select.form-control:focus {
+  -webkit-box-shadow: inset 0 -2px 0 #2196f3;
+  box-shadow: inset 0 -2px 0 #2196f3;
 }
 .has-warning input,
 .has-warning .form-control,

data/vendor/assets/stylesheets/slate.css

@@ -6704,6 +6704,32 @@ a.thumbnail:focus,
 a.thumbnail.active {
   border-color: #0c0d0e;
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border-color: rgba(0, 0, 0, 0.6);
+}
+a.list-group-item-success.active {
+  background-color: #62c462;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #4fbd4f;
+}
+a.list-group-item-warning.active {
+  background-color: #f89406;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #df8505;
+}
+a.list-group-item-danger.active {
+  background-color: #ee5f5b;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #ec4844;
+}
 .jumbotron {
   border: 1px solid rgba(0, 0, 0, 0.6);
 }

data/vendor/assets/stylesheets/superhero.css

@@ -6494,6 +6494,32 @@ label,
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+  border: none;
+}
+a.list-group-item-success.active {
+  background-color: #5cb85c;
+}
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  background-color: #4cae4c;
+}
+a.list-group-item-warning.active {
+  background-color: #f0ad4e;
+}
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  background-color: #eea236;
+}
+a.list-group-item-danger.active {
+  background-color: #d9534f;
+}
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  background-color: #d43f3a;
+}
 .panel {
   border: none;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.3.0.4
+  version: 3.3.0.5
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -125,10 +125,6 @@ files:
 - lib/generators/bootswatch_rails/skip_login/skip_login_generator.rb
 - 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/gravatar_helper.rb
@@ -139,9 +135,6 @@ files:
 - 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

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

@@ -1,28 +0,0 @@
-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

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

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

@@ -1,10 +0,0 @@
-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

@@ -1,4 +0,0 @@
-class Assignment < ActiveRecord::Base
-  belongs_to :<%= name %>
-  belongs_to :role
-end

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

@@ -1,11 +0,0 @@
-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

@@ -1,5 +0,0 @@
-class Role < ActiveRecord::Base
-  has_many :assignments
-  has_many :<%= table_name %>, through: :assignments
-  has_many :abilities
-end

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

@@ -1,80 +0,0 @@
-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