Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* disabled for ie8/9 placeholder.

Browse Source
This commit is contained in:
wangyidong
2015-11-27 14:06:59 +08:00
parent 9fe3b5ca05
commit 7acbf8c7bd
8 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/my/view/editprofile.html.php
View File

@@ -55,7 +55,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
@@ -105,7 +105,7 @@
<th class='w-120px'><?php echo $lang->user->verifyPassword;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control' placeholder='{$lang->user->placeholder->verify}'");?>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
</tr>
</table>

1
module/user/model.php
View File

@@ -328,6 +328,7 @@ class userModel extends model
$userID = $oldUser->id;
$user = fixer::input('post')
->setDefault('join', '0000-00-00')
->setDefault('password', '')
->setIF($this->post->password1 != false, 'password', md5($this->post->password1))
->remove('password1, password2, groups,verifyPassword')
->get();

2
module/user/view/batchcreate.html.php
View File

@@ -61,7 +61,7 @@
<th colspan='2'><?php echo $lang->user->verifyPassword?></th>
<td colspan='7'>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
</tr>
<tr><td colspan='9' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>

2
module/user/view/batchedit.html.php
View File

@@ -57,7 +57,7 @@
<th colspan='2'><?php echo $lang->user->verifyPassword?></th>
<td colspan='6'>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
</tr>
<tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>

2
module/user/view/create.html.php
View File

@@ -79,7 +79,7 @@
<th><?php echo $lang->user->verifyPassword;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
</tr>

2
module/user/view/delete.html.php
View File

@@ -24,7 +24,7 @@
</th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control' placeholder='{$lang->user->placeholder->verify}'");?>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
<td class='w-100px'><?php echo html::submitButton($lang->delete);?></td>
</tr>

2
module/user/view/edit.html.php
View File

@@ -56,7 +56,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>

1
www/js/my.full.js
View File

@@ -1369,6 +1369,7 @@ function fixedTfootAction(formID)
if($(formID).size() == 0) return false;
var $table = $(formID).find('table:last');
var $tfoot = $table.find('tfoot');
if($tfoot.size() == 0) return false;
$tfoot.removeClass('fixedTfootAction');
var $inputgroup = $tfoot.find('.table-actions').children('.input-group');