BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7fbc4f5b
Commit
7fbc4f5b
authored
Oct 23, 2014
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected the layout of the strength indicator to be more consistent throughout the application.
Fixed a test that was looking for an outdated HTML ID
parent
7039c986
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
password_strength.js.coffee
app/assets/javascripts/password_strength.js.coffee
+3
-3
profile.scss
app/assets/stylesheets/sections/profile.scss
+10
-2
edit.html.haml
app/views/devise/passwords/edit.html.haml
+1
-1
new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
profile.rb
features/steps/profile/profile.rb
+1
-1
No files found.
app/assets/javascripts/password_strength.js.coffee
View file @
7fbc4f5b
...
@@ -7,10 +7,11 @@ overwritten_rules =
...
@@ -7,10 +7,11 @@ overwritten_rules =
$
(
document
).
ready
->
$
(
document
).
ready
->
profileOptions
=
{}
profileOptions
=
{}
profileOptions
.
ui
=
profileOptions
.
ui
=
container
:
"#password-strength"
showProgressBar
:
false
showVerdicts
InsideProgressBar
:
tru
e
showVerdicts
:
fals
e
showPopover
:
true
showPopover
:
true
showErrors
:
true
showErrors
:
true
showStatus
:
true
errorMessages
:
overwritten_messages
errorMessages
:
overwritten_messages
profileOptions
.
rules
=
profileOptions
.
rules
=
activated
:
overwritten_rules
activated
:
overwritten_rules
...
@@ -19,7 +20,6 @@ $(document).ready ->
...
@@ -19,7 +20,6 @@ $(document).ready ->
deviseOptions
.
common
=
deviseOptions
.
common
=
usernameField
:
"#user_username"
usernameField
:
"#user_username"
deviseOptions
.
ui
=
deviseOptions
.
ui
=
container
:
"#password-strength"
showPopover
:
true
showPopover
:
true
showErrors
:
true
showErrors
:
true
showVerdicts
:
false
showVerdicts
:
false
...
...
app/assets/stylesheets/sections/profile.scss
View file @
7fbc4f5b
...
@@ -117,6 +117,14 @@
...
@@ -117,6 +117,14 @@
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.progress
{
.has-success
input
{
margin-top
:
10px
;
background-color
:
#C3FF88
!
important
;
}
.has-error
input
{
background-color
:
#FFA0A0
!
important
;
}
.has-warning
input
{
background-color
:
#FFEC8B
!
important
;
}
}
app/views/devise/passwords/edit.html.haml
View file @
7fbc4f5b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
=
f
.
hidden_field
:reset_password_token
.form-group
#password-strength
.form-group
=
f
.
password_field
:password
,
class:
"form-control top"
,
id:
"user_password_recover"
,
placeholder:
"New password"
,
required:
true
=
f
.
password_field
:password
,
class:
"form-control top"
,
id:
"user_password_recover"
,
placeholder:
"New password"
,
required:
true
%div
%div
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
...
...
app/views/profiles/passwords/new.html.haml
View file @
7fbc4f5b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
.form-group
.form-group
=
f
.
label
:current_password
,
class:
'control-label'
=
f
.
label
:current_password
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
.form-group
#password-strength
.form-group
=
f
.
label
:password
,
class:
'control-label'
=
f
.
label
:password
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
,
id:
'user_password_profile'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
,
id:
'user_password_profile'
.form-group
.form-group
...
...
features/steps/profile/profile.rb
View file @
7fbc4f5b
...
@@ -146,7 +146,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
...
@@ -146,7 +146,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step
'I submit new password'
do
step
'I submit new password'
do
fill_in
:user_current_password
,
with:
'12345678'
fill_in
:user_current_password
,
with:
'12345678'
fill_in
:user_password
,
with:
'12345678'
fill_in
:user_password
_profile
,
with:
'12345678'
fill_in
:user_password_confirmation
,
with:
'12345678'
fill_in
:user_password_confirmation
,
with:
'12345678'
click_button
"Set new password"
click_button
"Set new password"
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment