Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
nuxsmin
2016-10-27 10:12:13 +02:00
parent f53e0c6700 c4c5b7334e
commit 496f494da6
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/themes/classic/customfields.inc
View File

@@ -18,7 +18,7 @@
<select name="type" id="sel-type" size="1" class="sel-chosen-ns">
<?php foreach ($types as $id => $type): ?>
<option
value='<?php echo $id; ?>' <?php echo ($gotData && $id === $field->getType()) ? 'selected' : ''; ?>><?php echo strtoupper($type); ?></option>
value='<?php echo $id; ?>' <?php echo ($gotData && $id === $field->getType()) ? 'selected' : ''; ?>><?php echo $type[1]; ?></option>
<?php endforeach; ?>
</select>
</td>
@@ -29,7 +29,7 @@
<select name="module" id="sel-module" size="1" class="sel-chosen-ns">
<?php foreach ($modules as $id => $module): ?>
<option
value='<?php echo $id; ?>' <?php echo ($gotData && $id === $field->getModule()) ? 'selected' : ''; ?>><?php echo strtoupper($module); ?></option>
value='<?php echo $id; ?>' <?php echo ($gotData && $id === $field->getModule()) ? 'selected' : ''; ?>><?php echo $module; ?></option>
<?php endforeach; ?>
</select>
</td>

5
inc/themes/classic/ldap.inc
View File

@@ -80,6 +80,11 @@
<td class="descField">
<?php echo _('Clave de conexión'); ?>
<img src="imgs/help.png" title="<?php echo _('Ayuda'); ?>" class="inputImgMini help-tooltip"/>
<div class="tooltip" for="help-ldap_bindpass" style="display:none;">
<p>
<?php echo _('Clave del usuario de conexión a LDAP.'); ?>
</p>
</div>
</td>
<td class="valField">
<input type="password" id="ldap_bindpass" name="ldap_bindpass" value="<?php echo $ldapBindPass; ?>"

6
inc/themes/classic/sessionbar.inc
View File

@@ -1,17 +1,15 @@
<div id="header">
<div id="session" class="midround shadow">
<?php printf('%s (%s) %s', $userName, $userGroup, $adminApp); ?>
<?php if ($showPassIcon): ?>
<?php echo $userName, ' (', $userGroup, ') ', $adminApp; ?>
<img src="imgs/key.png" class="iconMini"
title="<?php echo _('Cambiar clave de usuario'); ?>"
data-itemid="<?php echo $userId; ?>"
Onclick="sysPassUtil.Common.usrUpdPass(this,<?php echo \SP\Controller\ActionsInterface::ACTION_USR_USERS_EDITPASS; ?>, '<?php echo $sk; ?>')" />
<?php else: ?>
<?php echo $userName, ' (', $userGroupName, ') ', $adminApp; ?>
<?php endif; ?>
<img src="imgs/preferences.png" class="iconMini" title="<?php echo _('Preferencias'); ?>"
data-itemid="<?php echo $userId; ?>"
OnClick="sysPassUtil.Common.doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_USR_PREFERENCES; ?>)" />
<img src="imgs/exit.png" title="<?php echo _('Salir'); ?>" OnClick="sysPassUtil.Common.doLogout();"/>
</div>
</div>
</div>