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

Merge branch 'devel'

Browse Source
This commit is contained in:
nuxsmin
2015-09-24 02:34:11 +02:00
parent b7ef6de033 1844f9917a
commit e7f2d8a8d3
19 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/themes/classic/account.inc
View File

@@ -264,7 +264,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="<?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo ($gotData) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo ($gotData) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<?php else: ?>
<?php if($field->type === \SP\CustomFields::TYPE_PASSWORD && !$showViewPass):?>

2
inc/themes/classic/categories.inc
View File

@@ -37,7 +37,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="<?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50"
maxlength="500"
value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<?php else: ?>

2
inc/themes/classic/customers.inc
View File

@@ -37,7 +37,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="<?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50"
maxlength="500"
value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<?php else: ?>

2
inc/themes/classic/groups.inc
View File

@@ -51,7 +51,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="<?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50"
maxlength="500"
value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<?php else: ?>

2
inc/themes/classic/users.inc
View File

@@ -138,7 +138,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="<?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50"
maxlength="500s"
value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<?php else: ?>

2
inc/themes/material-blue/account.inc
View File

@@ -309,7 +309,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="mdl-textfield__input fg-blue100 <?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo ($gotData) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo ($gotData) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<label class="mdl-textfield__label" for="<?php echo $field->name; ?>"><?php echo $field->text; ?></label>
</div>

2
inc/themes/material-blue/categories.inc
View File

@@ -45,7 +45,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="mdl-textfield__input fg-blue100 <?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<label class="mdl-textfield__label" for="<?php echo $field->name; ?>"><?php echo $field->text; ?></label>
</div>

1
inc/themes/material-blue/css/material.min.css.map
View File

File diff suppressed because one or more lines are too long

2
inc/themes/material-blue/css/styles.css
View File

@@ -18,7 +18,6 @@ table {
}
#tblTools, #tblAccion {
border: none;
border: 1px solid #d9d9d9;
background-color: #f9f9f9;
vertical-align: middle;
@@ -1169,7 +1168,6 @@ footer #status {
footer #status .status-info{
padding: .5em;
text-decoration: underline;
}
footer #session {

2
inc/themes/material-blue/customers.inc
View File

@@ -46,7 +46,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="mdl-textfield__input fg-blue100 <?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<label class="mdl-textfield__label" for="<?php echo $field->name; ?>"><?php echo $field->text; ?></label>
</div>

73
inc/themes/material-blue/footer.inc
View File

@@ -1,35 +1,42 @@
</div> <!-- Close container -->
<footer>
<?php if ($loggedIn): ?>
<div id="session">
<i class="material-icons" title="<?php echo _('Salir'); ?>" OnClick="sysPassUtil.Common.doLogout();">exit_to_app</i>
<?php if ($showPassIcon): ?>
<i class="material-icons" 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; ?>')">security</i>
<?php endif; ?>
<i class="material-icons" title="<?php echo _('Preferencias de usuario'); ?>"
OnClick="sysPassUtil.Common.doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_USR_PREFERENCES; ?>)">account_circle</i>
<?php printf('%s (%s) %s', $userName, $userGroup, $adminApp); ?>
</div>
<?php endif; ?>
<div id="project">
<a href="<?php echo $appInfo['appwebsite']; ?>" target="_blank" class="active-tooltip"
title="<?php echo _('Ayuda :: FAQ :: Changelog'); ?>">
<?php echo $appInfo['appname'], ' ', $appVersion; ?>
</a>
&nbsp;::&nbsp;
<a href="<?php echo $appInfo['appblog']; ?>" target="_blank" class="active-tooltip"
title="<?php echo _('Un proyecto de cygnux.org'); ?>">cygnux.org</a>
</div> <!-- Close Project -->
<div id="status">
<span class="status-info"><?php echo (DEBUG) ? 'Debug ON' : ''; ?></span>
<span class="status-info active-tooltip" title="<?php echo _('Indica si la conexión utiliza HTTPS.') . '<br><br>' . _('Las claves de formularios enviados se encriptan mediante PKI, el resto de datos no.'); ?>"><?php echo ($httpsEnabled) ? _('Seguro') : _('Inseguro'); ?></span>
<span class="status-info"><?php echo ($isDemoMode) ? 'Demo' : ''; ?></span>
<div id="updates"></div>
</div>
</footer> <!-- Close footer -->
</div> <!-- Close wrap -->
</body> <!-- Close BODY...almost done..go..go..go -->
</div> <!-- Close container -->
<footer>
<?php if ($loggedIn): ?>
<div id="session">
<i class="material-icons" title="<?php echo _('Salir'); ?>" OnClick="sysPassUtil.Common.doLogout();">exit_to_app</i>
<?php if ($showPassIcon): ?>
<i class="material-icons" 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; ?>')">security</i>
<?php endif; ?>
<i class="material-icons" title="<?php echo _('Preferencias de usuario'); ?>"
OnClick="sysPassUtil.Common.doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_USR_PREFERENCES; ?>)">account_circle</i>
<?php printf('%s (%s) %s', $userName, $userGroup, $adminApp); ?>
</div>
<?php endif; ?>
<div id="project">
<a href="<?php echo $appInfo['appwebsite']; ?>" target="_blank" class="active-tooltip"
title="<?php echo _('Ayuda :: FAQ :: Changelog'); ?>">
<?php echo $appInfo['appname'], ' ', $appVersion; ?>
</a>
&nbsp;::&nbsp;
<a href="<?php echo $appInfo['appblog']; ?>" target="_blank" class="active-tooltip"
title="<?php echo _('Un proyecto de cygnux.org'); ?>">cygnux.org</a>
</div>
<!-- Close Project -->
<div id="status">
<span class="status-info"><?php echo (DEBUG) ? 'Debug ON' : ''; ?></span>
<span class="status-info active-tooltip"
title="<?php echo _('Indica si la conexión utiliza HTTPS.') . '<br><br>' . _('Las claves de formularios enviados se encriptan mediante PKI, el resto de datos no.'); ?>">
<i class="material-icons">
<?php echo ($httpsEnabled) ? 'lock' : 'lock_open'; ?>
</i>
</span>
<span class="status-info"><?php echo ($isDemoMode) ? 'Demo' : ''; ?></span>
<div id="updates"></div>
</div>
</footer> <!-- Close footer -->
</div> <!-- Close wrap -->
</body> <!-- Close BODY...almost done..go..go..go -->
</html> <!-- Close HTML...ufff too much work!! :)) -->
<!-- Insert coin . . . -->

2
inc/themes/material-blue/groups.inc
View File

@@ -60,7 +60,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="mdl-textfield__input fg-blue100 <?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<label class="mdl-textfield__label" for="<?php echo $field->name; ?>"><?php echo $field->text; ?></label>
</div>

1
inc/themes/material-blue/js/material.min.js.map
View File

File diff suppressed because one or more lines are too long

2
inc/themes/material-blue/users.inc
View File

@@ -181,7 +181,7 @@
<input id="<?php echo $field->name; ?>" name="customfield[<?php echo $field->id; ?>]"
type="<?php echo $field->typeName; ?>"
class="mdl-textfield__input fg-blue100 <?php echo ($field->type === \SP\CustomFieldsBase::TYPE_PASSWORD) ? 'passwordfield__input-show' : ''; ?>"
maxlength="50" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
maxlength="500" value="<?php echo (!$isView) ? \SP\Html::sanitize($field->value) : ''; ?>"
<?php echo ($field->required) ? 'required' : ''; ?>>
<label class="mdl-textfield__label" for="<?php echo $field->name; ?>"><?php echo $field->text; ?></label>
</div>

BIN
res/register.eot
View File

Binary file not shown.

BIN
res/register.otf
View File

Binary file not shown.

BIN
res/register.ttf
View File

Binary file not shown.

BIN
res/register.woff
View File

Binary file not shown.

BIN
res/register.woff2
View File

Binary file not shown.