mirror of
https://github.com/nextcloud/server.git
synced 2024-08-10 02:11:09 +02:00
Indicate password strength using strengthify
* uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29
This commit is contained in:
parent
34559ef114
commit
5c1a9f35f1
2
3rdparty
2
3rdparty
@ -1 +1 @@
|
|||||||
Subproject commit 95ab25149c4903650a1113c01ccb1732fb089f14
|
Subproject commit faeedfcc0573868a2f0bde81f25a67a940c100ab
|
@ -63,3 +63,9 @@
|
|||||||
.ie8 #nojavascript {
|
.ie8 #nojavascript {
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */
|
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* IE8 doesn't have rounded corners, so the strengthify bar should be wider */
|
||||||
|
.lte8 #body-login .strengthify-wrapper {
|
||||||
|
width: 271px;
|
||||||
|
left: 6px;
|
||||||
|
}
|
||||||
|
@ -341,7 +341,7 @@ input[type="submit"].enabled {
|
|||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
#body-login form #adminaccount { margin-bottom:5px; }
|
#body-login form #adminaccount { margin-bottom:15px; }
|
||||||
#body-login form fieldset legend, #datadirContent label {
|
#body-login form fieldset legend, #datadirContent label {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@ -361,6 +361,21 @@ input[type="submit"].enabled {
|
|||||||
margin-left: -4px;
|
margin-left: -4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* strengthify wrapper */
|
||||||
|
#body-login .strengthify-wrapper {
|
||||||
|
display: inline-block;
|
||||||
|
position: relative;
|
||||||
|
left: 15px;
|
||||||
|
top: -21px;
|
||||||
|
width: 252px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tipsy for the strengthify wrapper looks better with following font settings */
|
||||||
|
#body-login .tipsy-inner {
|
||||||
|
font-weight: bold;
|
||||||
|
color: #ccc;
|
||||||
|
}
|
||||||
|
|
||||||
/* Icons for username and password fields to better recognize them */
|
/* Icons for username and password fields to better recognize them */
|
||||||
#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
|
#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
|
||||||
#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon {
|
#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon {
|
||||||
|
@ -7,9 +7,9 @@ $(document).ready(function() {
|
|||||||
oracle:!!$('#hasOracle').val(),
|
oracle:!!$('#hasOracle').val(),
|
||||||
mssql:!!$('#hasMSSQL').val()
|
mssql:!!$('#hasMSSQL').val()
|
||||||
};
|
};
|
||||||
|
|
||||||
$('#selectDbType').buttonset();
|
$('#selectDbType').buttonset();
|
||||||
|
|
||||||
if($('#hasSQLite').val()){
|
if($('#hasSQLite').val()){
|
||||||
$('#use_other_db').hide();
|
$('#use_other_db').hide();
|
||||||
$('#use_oracle_db').hide();
|
$('#use_oracle_db').hide();
|
||||||
@ -63,17 +63,27 @@ $(document).ready(function() {
|
|||||||
form.submit();
|
form.submit();
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
// Expand latest db settings if page was reloaded on error
|
// Expand latest db settings if page was reloaded on error
|
||||||
var currentDbType = $('input[type="radio"]:checked').val();
|
var currentDbType = $('input[type="radio"]:checked').val();
|
||||||
|
|
||||||
if (currentDbType === undefined){
|
if (currentDbType === undefined){
|
||||||
$('input[type="radio"]').first().click();
|
$('input[type="radio"]').first().click();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
|
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
|
||||||
$('#datadirContent').hide(250);
|
$('#datadirContent').hide(250);
|
||||||
$('#databaseField').hide(250);
|
$('#databaseField').hide(250);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#adminpass').strengthify({
|
||||||
|
zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
|
||||||
|
titles: [
|
||||||
|
t('core', 'Very weak password'),
|
||||||
|
t('core', 'Weak password'),
|
||||||
|
t('core', 'So-so password'),
|
||||||
|
t('core', 'Good password'),
|
||||||
|
t('core', 'Strong password')
|
||||||
|
]
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
@ -20,6 +20,8 @@ if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
|
||||||
|
OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
|
||||||
OC_Util::addScript('setup');
|
OC_Util::addScript('setup');
|
||||||
|
|
||||||
$hasSQLite = class_exists('SQLite3');
|
$hasSQLite = class_exists('SQLite3');
|
||||||
|
@ -59,6 +59,7 @@
|
|||||||
<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
|
<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
|
||||||
<input type="checkbox" id="show" name="show" />
|
<input type="checkbox" id="show" name="show" />
|
||||||
<label for="show"></label>
|
<label for="show"></label>
|
||||||
|
<div class="strengthify-wrapper"></div>
|
||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
@ -147,3 +147,16 @@ table.shareAPI td { padding-bottom: 0.8em; }
|
|||||||
/* HELP */
|
/* HELP */
|
||||||
.pressed {background-color:#DDD;}
|
.pressed {background-color:#DDD;}
|
||||||
|
|
||||||
|
/* PASSWORD */
|
||||||
|
.strengthify-wrapper {
|
||||||
|
position: absolute;
|
||||||
|
left: 189px;
|
||||||
|
width: 131px;
|
||||||
|
margin-top: -7px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* OPERA hack for strengthify*/
|
||||||
|
doesnotexist:-o-prefocus, .strengthify-wrapper {
|
||||||
|
left: 185px;
|
||||||
|
width: 129px;
|
||||||
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
|
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
|
||||||
|
* 2013, Morris Jobke <morris.jobke@gmail.com>
|
||||||
* This file is licensed under the Affero General Public License version 3 or later.
|
* This file is licensed under the Affero General Public License version 3 or later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
@ -243,6 +244,17 @@ $(document).ready(function(){
|
|||||||
$('#sendcropperbutton').click(function(){
|
$('#sendcropperbutton').click(function(){
|
||||||
sendCropData();
|
sendCropData();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#pass2').strengthify({
|
||||||
|
zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
|
||||||
|
titles: [
|
||||||
|
t('core', 'Very weak password'),
|
||||||
|
t('core', 'Weak password'),
|
||||||
|
t('core', 'So-so password'),
|
||||||
|
t('core', 'Good password'),
|
||||||
|
t('core', 'Strong password')
|
||||||
|
]
|
||||||
|
});
|
||||||
} );
|
} );
|
||||||
|
|
||||||
OC.Encryption = {
|
OC.Encryption = {
|
||||||
|
@ -13,6 +13,8 @@ $defaults = new OC_Defaults(); // initialize themable default strings and urls
|
|||||||
// Highlight navigation entry
|
// Highlight navigation entry
|
||||||
OC_Util::addScript( 'settings', 'personal' );
|
OC_Util::addScript( 'settings', 'personal' );
|
||||||
OC_Util::addStyle( 'settings', 'settings' );
|
OC_Util::addStyle( 'settings', 'settings' );
|
||||||
|
OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
|
||||||
|
OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
|
||||||
OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
|
OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
|
||||||
OC_Util::addStyle( '3rdparty', 'chosen' );
|
OC_Util::addStyle( '3rdparty', 'chosen' );
|
||||||
\OC_Util::addScript('files', 'jquery.fileupload');
|
\OC_Util::addScript('files', 'jquery.fileupload');
|
||||||
@ -20,6 +22,8 @@ if (\OC_Config::getValue('enable_avatars', true) === true) {
|
|||||||
\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
|
\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
|
||||||
\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
|
\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Highlight navigation entry
|
||||||
OC_App::setActiveNavigationEntry( 'personal' );
|
OC_App::setActiveNavigationEntry( 'personal' );
|
||||||
|
|
||||||
$storageInfo=OC_Helper::getStorageInfo('/');
|
$storageInfo=OC_Helper::getStorageInfo('/');
|
||||||
|
@ -44,6 +44,8 @@ if($_['passwordChangeSupported']) {
|
|||||||
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
|
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
|
||||||
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
|
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
|
||||||
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
|
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
|
||||||
|
<br/>
|
||||||
|
<div class="strengthify-wrapper"></div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
<?php
|
<?php
|
||||||
|
Loading…
Reference in New Issue
Block a user