trusty-cms 2.0.21.alpha → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a70dc8977477fc05f0c0f564bc8c16f4ceb5af1
-  data.tar.gz: 6aadac44daf584414af090b62ce6b8e1fee405ac
+  metadata.gz: cbc79bc42da160d18107b6fafe34bfc19002d072
+  data.tar.gz: dcc5d74e7c208b3466df33de59688048b6b0d8ad
 SHA512:
-  metadata.gz: 39b212b91013312d84f24890b0f54295987f3500f1989bdf2c45c118c361d1308f4ca70691f4f4f8630968f4336b6d29d33330269eade03ac8a3e235a1bc1ab8
-  data.tar.gz: fb688c23a8a656026905e7e01b0697f3e074f93e77bb42192e45ad752525fbdb115f8cef2784323e1f0e8c81437c9dc66c0c2f97acdf0657a10fd5e279e2e756
+  metadata.gz: 3cd77d4f1670ca2af673a1084ed67354134f101543d8c0d551b4c51f2a3bacc3dd86782824cce800a7e1dfd0926a62d0b081f6800c2273d2392a584c08654e4c
+  data.tar.gz: 0fde4925450e19b85b9d237a7519731303ab7c3f5ede08df0861241a970b1c91bdd718ba5a3589aa7bcaf04a5608744402bcd061427c729476e24d88ac1c4477

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.21.alpha)
+    trusty-cms (2.0.21)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)

data/app/controllers/admin/password_resets_controller.rb

@@ -4,8 +4,12 @@ class Admin::PasswordResetsController < ApplicationController
 
   def create
     user = User.find_by_email(params[:email])
-    user.send_password_reset if user
-    redirect_to welcome_path, :notice => "Email sent with password reset instructions."
+    if user
+      user.send_password_reset
+      redirect_to welcome_path, :notice => "Email sent with password reset instructions."
+    else
+      redirect_to welcome_path, :notice => "Email not registered. Double check your spelling or seek out your Admin."
+    end
   end
 
   def edit

data/app/mailers/password_mailer.rb

@@ -1,5 +1,7 @@
 class PasswordMailer < ActionMailer::Base
 
+  default :from => ENV['ORG_FROM_EMAIL'] ||= "admin@trustycms.com"
+
   def password_reset(user)
     @user = user
     mail :to => user.email, :subject => "Password Reset for TrustyCMS"

data/app/views/admin/password_resets/edit.html.haml

@@ -1,23 +1,27 @@
-%h1= t('reset_your_password')
+- body_classes << "single_form"
 
-= form_for @user, :url => admin_password_reset_path(params[:id]) do |f|
-  - if @user.errors.any?
-    .error_messages
-      %h2 Form is invalid
-      %ul
-        - for message in @user.errors.full_messages
-          %li= message
-  %p
-    %label{:for=>"password"}= t('password')
-    = f.password_field :password
-  %p
-    %label{:for=>"password_confirmation"}= t('password_confirmation')
-    = f.password_field :password_confirmation
-  .actions= f.submit "Update Password"
+#single_form
 
-%p.version
-= t('powered_by')
-%a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
-= t('version')
-= TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."
+  %h3= t('reset_your_password')
+
+  = form_for @user, :url => admin_password_reset_path(params[:id]) do |f|
+    - if @user.errors.any?
+      .error_messages
+        %h2 Form is invalid
+        %ul
+          - for message in @user.errors.full_messages
+            %li= message
+    %p
+      %label{:for=>"password"}= t('password')
+      = f.password_field :password
+    %p
+      %label{:for=>"password_confirmation"}= t('password_confirmation')
+      = f.password_field :password_confirmation
+    .actions= f.submit "Update Password"
+
+  %p.version
+  = t('powered_by')
+  %a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
+  = t('version')
+  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."
 

data/app/views/admin/password_resets/new.html.haml

@@ -1,14 +1,18 @@
-%h1= t('reset_your_password')
-
-= form_tag admin_password_resets_path, :method => :post do
-  %p
-    %label{:for=>"email"}= t('email')
-    = text_field_tag :email, params[:email], :class => 'textbox', :maxlength => 70, :size => 70
-  .actions
-    = submit_tag "Reset Password"
-
-%p.version
-= t('powered_by')
-%a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
-= t('version')
-= TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."
+- body_classes << "single_form"
+
+#single_form
+
+  %h3= t('reset_your_password')
+
+  = form_tag admin_password_resets_path, :method => :post do
+    %p
+      %label{:for=>"email"}= t('email')
+      = text_field_tag :email, params[:email], :class => 'textbox', :maxlength => 70, :size => 70
+    .actions
+      = submit_tag "Reset Password"
+
+  %p.version
+  = t('powered_by')
+  %a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
+  = t('version')
+  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."

data/app/views/password_mailer/password_reset.html.haml

@@ -1,3 +1,8 @@
-= link_to('Reset Your Password', edit_admin_password_reset_url(@user.password_reset_token))
+= "Hi, #{@user.name} -"
 
-If you did not request your password to be reset, please alert your TrustyCMS Admin.
+%p
+  We received a request to reset your password.
+%p
+  = link_to('Click here to reset', edit_admin_password_reset_url(@user.password_reset_token))
+%p
+  If you did not request your password to be reset, please alert your TrustyCMS Admin.

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "2.0.21.alpha"
+    VERSION = "2.0.21"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 2.0.21.alpha
+  version: 2.0.21
 platform: ruby
 authors:
 - TrustyCms CMS dev team