cms-fortress 1.3.2 → 1.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cms-fortress (1.3.0)
+    cms-fortress (1.3.2)
       aasm (~> 3.2)
       cancan (>= 1.6.9)
       comfortable_mexican_sofa (~> 1.12.0)

data/app/assets/stylesheets/cms/fortress/session.css

@@ -8,7 +8,19 @@ body {
 }
 
 .form-signin {
-  max-width: 300px;
+  padding: 19px 29px 29px;
+  margin: 3em auto 20px;
+  background-color: #fff;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+          box-shadow: 0 1px 2px rgba(0,0,0,.05);
+}
+
+.form-reset-password {
   padding: 19px 29px 29px;
   margin: 3em auto 20px;
   background-color: #fff;

data/app/controllers/cms/fortress/users/passwords_controller.rb

@@ -0,0 +1,5 @@
+class Cms::Fortress::Users::PasswordsController < Devise::PasswordsController
+  layout 'cms/fortress/session'
+
+end
+

data/app/views/cms/fortress/users/passwords/edit.html.haml

@@ -0,0 +1,19 @@
+= render :partial => 'cms/fortress/shared/navbar'
+.container
+  .row
+    .col-sm-6.col-sm-offset-3
+
+      = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form', class: 'form-reset-password' }) do |f|
+        %h3 Change your password
+        = devise_error_messages!
+        = f.hidden_field :reset_password_token
+        .form-group
+          = f.label :password, "New password"
+          = f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
+        .form-group
+          = f.label :password_confirmation, "Confirm new password"
+          = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
+
+        = f.submit "Change my password"
+
+        = render "devise/shared/links"

data/app/views/cms/fortress/users/passwords/new.html.haml

@@ -0,0 +1,14 @@
+= render :partial => 'cms/fortress/shared/navbar'
+.container
+  .row
+    .col-sm-6.col-sm-offset-3
+      = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: 'form', class: 'form-reset-password' }) do |f|
+        %h3 Forgot your password?
+        = devise_error_messages!
+        .form-group
+          = f.label :email
+          = f.email_field :email, autofocus: true, class: 'form-control'
+
+        = f.submit "Send me reset password instructions", class: 'btn btn-default'
+
+        = render "devise/shared/links"

data/app/views/cms/fortress/users/sessions/new.html.haml

@@ -1,15 +1,20 @@
 = render :partial => 'cms/fortress/shared/navbar'
-= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:role => "form", :class => "form-signin" }) do |f|
-  %h3.form-signin-heading= t('cms.fortress.users.sessions.new.sign_in')
-  .form-group
-    = f.email_field :email, :autofocus => true, :placeholder => t('cms.fortress.users.sessions.new.email_address'), :class => "form-control"
-  .form-group
-    = f.password_field :password, :placeholder => t('cms.fortress.users.sessions.new.password'), :class => "form-control"
+.container
+  .row
+    .col-sm-6.col-sm-offset-3
+      = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:role => "form", :class => "form-signin" }) do |f|
+        %h3.form-signin-heading= t('cms.fortress.users.sessions.new.sign_in')
+        .form-group
+          = f.label :email
+          = f.email_field :email, :autofocus => true, :placeholder => t('cms.fortress.users.sessions.new.email_address'), :class => "form-control"
+        .form-group
+          = f.label :password
+          = f.password_field :password, :placeholder => t('cms.fortress.users.sessions.new.password'), :class => "form-control"
 
-  - if devise_mapping.rememberable?
-    .checkbox
-      %label.checkbox
-        = f.check_box :remember_me
-        = t('cms.fortress.users.sessions.new.remember_me')
-  = f.submit t('cms.fortress.users.sessions.new.sign_in'), :class => "btn btn-primary btn-md"
-  = render "devise/shared/links"
+        - if devise_mapping.rememberable?
+          .checkbox
+            %label.checkbox
+              = f.check_box :remember_me
+              = t('cms.fortress.users.sessions.new.remember_me')
+        = f.submit t('cms.fortress.users.sessions.new.sign_in'), :class => "btn btn-primary btn-md"
+        = render "devise/shared/links"

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.2"
+  s.version   = "1.3.3"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2014-09-15"
+  s.date              = "2014-09-20"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]

data/lib/cms/fortress/routes/admin.rb

@@ -9,7 +9,8 @@ class ActionDispatch::Routing::Mapper
         :sign_in => 'login', :sign_out => 'logout'
       },
       :controllers => {
-        :sessions => 'cms/fortress/users/sessions'
+        :sessions => 'cms/fortress/users/sessions',
+        :passwords => 'cms/fortress/users/passwords'
       }
 
     scope path, module: 'cms/fortress' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/assets/stylesheets/cms/fortress/themes/wide.css.scss
 - app/controllers/cms/fortress/admin_controller.rb
 - app/controllers/cms/fortress/roles_controller.rb
+- app/controllers/cms/fortress/users/passwords_controller.rb
 - app/controllers/cms/fortress/users/sessions_controller.rb
 - app/controllers/cms/fortress/users_controller.rb
 - app/helpers/cms/fortress/application_helper.rb
@@ -335,6 +336,8 @@ files:
 - app/views/cms/fortress/users/edit.html.haml
 - app/views/cms/fortress/users/index.html.haml
 - app/views/cms/fortress/users/new.html.haml
+- app/views/cms/fortress/users/passwords/edit.html.haml
+- app/views/cms/fortress/users/passwords/new.html.haml
 - app/views/cms/fortress/users/sessions/.DS_Store
 - app/views/cms/fortress/users/sessions/new.html.haml
 - app/views/comfy/admin/cms/pages/_form.html.haml