gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-02-15 09:40:59 +01:00
commit c6243813bf
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer-dist.json
View File

@ -7,8 +7,8 @@
"require": { "require": {
"robthree/twofactorauth": "^1.5", "robthree/twofactorauth": "^1.5",
"sabre/dav": "^3.", "sabre/dav": "^4.",
"sabre/xml": "^1.4.", "sabre/xml": "*",
"slim/slim": "^3.0", "slim/slim": "^3.0",
"erusev/parsedown": "*", "erusev/parsedown": "*",
"erusev/parsedown-extra": "*", "erusev/parsedown-extra": "*",

16
views/bootstrap/class.Settings.php
View File

@ -59,7 +59,14 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$class = 'input-medium'; $class = 'input-medium';
else else
$class = 'input-small'; $class = 'input-small';
$html .= '<div class="input-group'.($type=='password' ? ' show-hide-password' : '').'">';
$html .= '<input '.($type=='password' ? 'type="password"' : ($type=='number' ? 'type="number"' : ($type=='color' ? 'type="color"' : 'type="text"'))).' class="form-control '.$class.'" name="'.$name.'" value="'.$value.'" placeholder="'.$placeholder.'"/>'; $html .= '<input '.($type=='password' ? 'type="password"' : ($type=='number' ? 'type="number"' : ($type=='color' ? 'type="color"' : 'type="text"'))).' class="form-control '.$class.'" name="'.$name.'" value="'.$value.'" placeholder="'.$placeholder.'"/>';
if($this->getTheme() == 'bootstrap4' && $type == 'password') {
$html .= '<div class="input-group-addon">';
$html .= '<a href=""><i class="fa fa-eye-slash" style="position: absolute; right: 15px; top: 10px;" aria-hidden="true"></i></a>';
$html .= '</div>';
}
$html .= '</div>';
} }
return $html; return $html;
} /* }}} */ } /* }}} */
@ -161,7 +168,14 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
?> ?>
<tr title="<?= getMLText($title."_desc") ?>"> <tr title="<?= getMLText($title."_desc") ?>">
<td><?= getMLText($title) ?></td> <td><?= getMLText($title) ?></td>
<td><input name="<?= $name ?>" type="checkbox" <?php if ($settings->{"_".$name}) echo "checked" ?> /></td> <td>
<?php
if($this->isVisible($name))
echo '<input name="'.$name.'" type="checkbox" '.($settings->{"_".$name} ? "checked" : '').' />';
else
echo getMLText('settings_conf_field_not_editable');
echo "</td>\n";
?>
</tr> </tr>
<?php <?php
} /* }}} */ } /* }}} */

15
views/bootstrap4/styles/application.js
View File

@ -284,6 +284,21 @@ $(document).ready( function() {
$($(this).data("target")+' .modal-header h3').html($(this).data("modal-title")); $($(this).data("target")+' .modal-header h3').html($(this).data("modal-title"));
}); });
$('body').on('click', '.show-hide-password a', function(ev){
ev.preventDefault();
// console.log($(this).closest('input'));
// console.log($(ev.target).parent().parent().children('input'));
if($('.show-hide-password input').attr("type") == "text"){
$('.show-hide-password input').attr('type', 'password');
$('.show-hide-password i').addClass( "fa-eye-slash" );
$('.show-hide-password i').removeClass( "fa-eye" );
}else if($('.show-hide-password input').attr("type") == "password"){
$('.show-hide-password input').attr('type', 'text');
$('.show-hide-password i').removeClass( "fa-eye-slash" );
$('.show-hide-password i').addClass( "fa-eye" );
}
});
// $('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); }); // $('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
initMost(); initMost();