admin/_version.haml
admin/password/change.haml
admin/password/confirm.email
admin/password/confirm.haml
admin/password/oops.haml
admin/password/reset.haml
images/admin/single_form_shadow.png
stylesheets/admin/modules/_links.sass
@@ -1,24 +1,25 @@
-- body_classes << "login"
+- body_classes << "single_form"
- @logged_out = true
-#login
+- # For toggling the prototype
+- allow_password_reset = boolean_param(:password_reset, true)
+
+#single_form
%h1 Please Login
-
%form{:method=>"post", :action=>"/admin/pages/"}
%p
%label{:for=>"user_login"} Username or E-mail Address
%input.textbox.activate{:name=>"user[login]", :id=>"user_login", :type=>"text", :value=>"", :maxlength=>"40", :size=>"40"}/
%p
%label{:for=>"user_password"} Password
- %input.textbox.password{:name=>"user[password]", :id=>"user_password", :type=>"password", :value=>"", :maxlength=>"40", :size=>"40"}/
-
- %span.remember_me
- %input.checkbox{:name=>"user[remember_me]", :id=>"user_remember_me", :type=>"checkbox"}/
- %label.checkbox{:for=>"user_remember_me"} Remember me
+ %input.textbox.password{:name=>"user[password]", :id=>"user_password", :type=>"password", :value=>"", :maxlength=>"40", :size=>"40", :style=>('width: 60%' if allow_password_reset)}/
+ - if allow_password_reset
+ %span.forgot_password
+ %a{:href=>"/admin/password/reset"} I forgot my password
+ %p.remember_me
+ %input.checkbox{:name=>"user[remember_me]", :id=>"user_remember_me", :type=>"checkbox"}/
+ %label.checkbox{:for=>"user_remember_me"} Remember me in this browser
%p.buttons
%input.button{:type=>"submit", :value=>"Login"}/
-%p.version
- Powered by
- %a{:href=>"http://radiantcms.org"} Radiant CMS
- version 0.9.0
\ No newline at end of file
+= render :partial => "version"
\ No newline at end of file
admin/login.haml
@@ -1 +1 @@
-/admin/login/
\ No newline at end of file
+/admin/login
\ No newline at end of file
admin/logout.redirect
@@ -4,6 +4,7 @@
@import modules/opacity.sass
@import modules/rounded.sass
@import modules/shadow.sass
+@import modules/links.sass
// Partials
@import partials/reset.sass
stylesheets/admin/main.sass
@@ -3,10 +3,12 @@ body
font-family: "Lucida Grande", "Bitstream Vera Sans", Helvetica, Verdana, Arial, sans-serif
a
- color: #0066cc
+ +default-link
+ &.alt
+ +alt-link
-a:hover
- text-decoration: none
+big
+ font-size: 110%
h1
font-size: 180%
stylesheets/admin/partials/_base.sass
@@ -70,7 +70,7 @@
button, input.button
font-size: 150%
a
- color: red
+ +alt-link
p.more_or_less
margin: 0 0 1em
padding: 4px 0 5px
@@ -227,31 +227,57 @@ body.reversed
.box
+box-shadow(2px, 2px, 5px, rgba(0,0,0,0.3))
-body.login
+body.single_form
#content
- #login
+ #single_form
background: #f5f1e2 url(/images/admin/vertical_tan_gradient.png) center -15px repeat-x
border: 0.35em solid #efead3
padding: 0.5em 1.5em
padding-right: 22px
position: relative
- width: 26em
+ width: 28em
+round-corners(6px)
h1
font-size: 140%
margin: 0.75em 0 1.25em
+ p
+ font-size: 90%
+ &.intro, &.error
+ font-size: 100%
+ line-height: 1.4
+ &.error
+ color: #cc0000
+ label
+ font-size: 105%
+ &.checkbox
+ font-size: 90%
+ ul
+ font-size: 90%
+ list-style: disc
+ padding-left: 2em
+ li
+ margin-bottom: 0.5em
input.textbox
width: 98.5%
- &.password
- width: 60%
span.remember_me
- position: relative
+ color: #333
font-size: 95%
+ margin-left: 1em
+ label
+ margin: 0
+ a
+ margin: 0
+ +default-link
+ span.forgot_password
+ position: relative
top: -3px
+ margin: 0 1em
+ a
+ +default-link
.buttons
margin: 1.75em 0 1em
p.version
- background: url(/images/admin/login_shadow.png) top center no-repeat
+ background: url(/images/admin/single_form_shadow.png) top center no-repeat
color: #666
font-size: 80%
padding-top: 10px
stylesheets/admin/partials/_forms.sass
@@ -2,9 +2,9 @@ body.reversed
background-color: #9e9e9e
color: white
-body.login
+body.single_form
#content
text-align: center
- #login
- margin: 8em auto 0
+ #single_form
+ margin: 6em auto 0
text-align: left
stylesheets/admin/partials/_layout.sass
@@ -6,5 +6,5 @@
color: #060
#error
- background-color: #e3b2b2
- color: #630000
\ No newline at end of file
+ background-color: #f3c2c2
+ color: #770000
\ No newline at end of file
stylesheets/admin/partials/_messages.sass
@@ -159,6 +159,8 @@ module ViewHelpers
include FlashHelper
module ParamsHelper
+
+ # Key based access to query parameters. Keys can be strings or symbols.
def params
@params ||= begin
q = request.query.dup
@@ -166,6 +168,23 @@ module ViewHelpers
q
end
end
+
+ # Extract the value for a bool param. Handy for rendering templates in
+ # different states.
+ def boolean_param(key, default = false)
+ key = key.to_s.intern
+ value = params[key]
+ return default if value.nil?
+ case value.strip.downcase
+ when 'true'
+ true
+ when 'false'
+ false
+ else
+ raise 'Invalid value'
+ end
+ end
+
end
include ParamsHelper
view_helpers.rb
images/admin/login_shadow.png
191f7c59dcc1546b0bbab0f00d6263606e87f9ed
John W. Long
me@johnwlong.com
http://github.com/radiant/radiant-prototype/commit/b4f5d765a4a2ee840a65a715d44b096a1a0635ea
b4f5d765a4a2ee840a65a715d44b096a1a0635ea
2009-10-01T14:10:14-07:00
2009-10-01T14:10:14-07:00
allow a user to reset their password
08e6c38c152cc4569cfd025db2f0f87d751e1ea5
John W. Long
me@johnwlong.com