* [DEV] UI tweaks

This commit is contained in:
nuxsmin
2016-11-21 14:49:03 +01:00
parent e7d1f0b752
commit 6b7b4663e4
5 changed files with 117 additions and 78 deletions

View File

@@ -198,7 +198,7 @@ class AccountsSearchItem
*/
public function getShortCustomerName()
{
return Html::truncate($this->AccountSearchData->getCustomerName(), $this->textMaxLength);
return Html::truncate($this->AccountSearchData->getCustomerName(), $this->textMaxLength / 3);
}
/**

View File

@@ -1666,6 +1666,10 @@ fieldset.warning a {
width: 100%;
}
footer {
display: none;
}
footer,
footer .footer-parts {
justify-content: space-between;

File diff suppressed because one or more lines are too long

View File

@@ -21,12 +21,12 @@
<div class="field-name"><?php echo _('Cliente'); ?></div>
<?php if (!empty($AccountSearchItem->getCustomerLink())): ?>
<a href="<?php echo $AccountSearchItem->getCustomerLink(); ?>" target="blank"
title="<?php echo _('Buscar en Wiki'); ?>&nbsp;<?php echo $AccountSearchData->getCustomerName(); ?>">
<span class="mdl-chip mdl-chip--contact">
title="<?php echo _('Buscar en Wiki'); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?>
<span class="mdl-chip mdl-chip--contact">
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white">
<?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"><?php echo $AccountSearchData->getCustomerName(); ?></span>
<span class="mdl-chip__text" title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
</a>
<?php else: ?>
@@ -34,7 +34,7 @@
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white">
<?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"><?php echo $AccountSearchData->getCustomerName(); ?></span>
<span class="mdl-chip__text" title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
<?php endif; ?>
</div>
@@ -85,78 +85,78 @@
</div>
<div class="label-right">
<?php if ($AccountSearchItem->isShow()): ?>
<div class="account-info">
<?php if ($AccountSearchItem->isPasswordExpired()): ?>
<i class="material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"
title="<?php echo _('Clave Caducada'); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></i>
<?php endif; ?>
<div class="account-info">
<?php if ($AccountSearchItem->isPasswordExpired()): ?>
<i class="material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"
title="<?php echo _('Clave Caducada'); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></i>
<?php endif; ?>
<?php if ($AccountSearchData->getAccountIsPrivate() === 0): ?>
<i id="accesses-<?php echo $AccountSearchData->getAccountId(); ?>"
class="material-icons">face</i>
<?php if ($AccountSearchData->getAccountIsPrivate() === 0): ?>
<i id="accesses-<?php echo $AccountSearchData->getAccountId(); ?>"
class="material-icons">face</i>
<div class="mdl-tooltip" for="accesses-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Permisos'), '<br>', $AccountSearchItem->getAccesses(); ?>
</div>
<?php else: ?>
<i class="material-icons" title="<?php echo _('Cuenta Privada'); ?>">lock</i>
<?php endif; ?>
<div class="mdl-tooltip" for="accesses-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Permisos'), '<br>', $AccountSearchItem->getAccesses(); ?>
</div>
<?php else: ?>
<i class="material-icons" title="<?php echo _('Cuenta Privada'); ?>">lock</i>
<?php endif; ?>
<?php if ($AccountSearchItem->isFavorite()): ?>
<i class="material-icons icon-favorite mdl-color-text--amber-A100"
title="<?php echo _('Eliminar Favorito'); ?>"
data-action-id-on="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_ADD; ?>"
data-action-id-off="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_DELETE; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountId(); ?>"
data-status="<?php echo 'on'; ?>">star</i>
<?php else: ?>
<i class="material-icons icon-favorite"
title="<?php echo _('Marcar Favorito'); ?>"
data-action-id-on="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_ADD; ?>"
data-action-id-off="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_DELETE; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountId(); ?>"
data-status="<?php echo 'off'; ?>">star_border</i>
<?php endif; ?>
<?php if ($AccountSearchItem->isFavorite()): ?>
<i class="material-icons icon-favorite mdl-color-text--amber-A100"
title="<?php echo _('Eliminar Favorito'); ?>"
data-action-id-on="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_ADD; ?>"
data-action-id-off="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_DELETE; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountId(); ?>"
data-status="<?php echo 'on'; ?>">star</i>
<?php else: ?>
<i class="material-icons icon-favorite"
title="<?php echo _('Marcar Favorito'); ?>"
data-action-id-on="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_ADD; ?>"
data-action-id-off="<?php echo \SP\Core\ActionsInterface::ACTION_ACC_FAVORITES_DELETE; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountId(); ?>"
data-status="<?php echo 'off'; ?>">star_border</i>
<?php endif; ?>
<?php if ($AccountSearchData->getAccountNotes() !== ''): ?>
<i id="notes-<?php echo $AccountSearchData->getAccountId(); ?>" class="material-icons">speaker_notes</i>
<div class="mdl-tooltip" for="notes-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Notas'), '<br>', $AccountSearchItem->getShortNotes(); ?>
</div>
<?php endif; ?>
<?php if ($AccountSearchData->getAccountNotes() !== ''): ?>
<i id="notes-<?php echo $AccountSearchData->getAccountId(); ?>" class="material-icons">speaker_notes</i>
<div class="mdl-tooltip" for="notes-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Notas'), '<br>', $AccountSearchItem->getShortNotes(); ?>
</div>
<?php endif; ?>
<?php if ($AccountSearchItem->getNumFiles() > 0): ?>
<i id="attachments-<?php echo $AccountSearchData->getAccountId(); ?>"
class="material-icons">attach_file</i>
<div class="mdl-tooltip"
for="attachments-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Archivos adjuntos'), ': ', $AccountSearchItem->getNumFiles(); ?>
</div>
<?php endif; ?>
<?php if ($AccountSearchItem->getNumFiles() > 0): ?>
<i id="attachments-<?php echo $AccountSearchData->getAccountId(); ?>"
class="material-icons">attach_file</i>
<div class="mdl-tooltip"
for="attachments-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Archivos adjuntos'), ': ', $AccountSearchItem->getNumFiles(); ?>
</div>
<?php endif; ?>
<?php if (isset($wikiFilter)): ?>
<?php if (preg_match('/^(' . $wikiFilter . ').*/i', $AccountSearchData->getAccountName())): ?>
<?php if (\SP\Account\AccountsSearchItem::$dokuWikiEnabled): ?>
<a href="<?php echo $wikiPageUrl, $AccountSearchData->getAccountName(); ?>"
target="_blank">
<i class="material-icons"
title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
</a>
<i class="btn-action material-icons fg-green100"
title="<?php echo _('Ver en Wiki'); ?>"
data-action-id="<?php echo \SP\Core\ActionsInterface::ACTION_WIKI_VIEW; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountName(); ?>"
data-onclick="wiki/show">library_books</i>
<?php else: ?>
<a href="<?php echo $wikiPageUrl, $AccountSearchData->getAccountName(); ?>"
target="_blank">
<i class="material-icons"
title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
</a>
<?php if (isset($wikiFilter)): ?>
<?php if (preg_match('/^(' . $wikiFilter . ').*/i', $AccountSearchData->getAccountName())): ?>
<?php if (\SP\Account\AccountsSearchItem::$dokuWikiEnabled): ?>
<a href="<?php echo $wikiPageUrl, $AccountSearchData->getAccountName(); ?>"
target="_blank">
<i class="material-icons"
title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
</a>
<i class="btn-action material-icons fg-green100"
title="<?php echo _('Ver en Wiki'); ?>"
data-action-id="<?php echo \SP\Core\ActionsInterface::ACTION_WIKI_VIEW; ?>"
data-item-id="<?php echo $AccountSearchData->getAccountName(); ?>"
data-onclick="wiki/show">library_books</i>
<?php else: ?>
<a href="<?php echo $wikiPageUrl, $AccountSearchData->getAccountName(); ?>"
target="_blank">
<i class="material-icons"
title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
</a>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
<?php if ($AccountSearchItem->isShow() || $AccountSearchItem->isShowRequest()): ?>

View File

@@ -10,11 +10,11 @@
<?php /** @var \SP\Html\DataGrid\DataGridAction $action */
foreach ($actions as $action): ?>
<a class="btn-menu mdl-navigation__link"
title="<?php echo $action->getTitle(); ?>"
data-action-id="<?php echo $action->getId(); ?>"
<?php foreach ($action->getData() as $dataName => $dataValue):?>
<?php echo 'data-', $dataName, '="', $dataValue , '"'; ?>
<?php endforeach;?>>
title="<?php echo $action->getTitle(); ?>"
data-action-id="<?php echo $action->getId(); ?>"
<?php foreach ($action->getData() as $dataName => $dataValue): ?>
<?php echo 'data-', $dataName, '="', $dataValue, '"'; ?>
<?php endforeach; ?>>
<i class="material-icons"><?php echo $action->getIcon()->getIcon(); ?></i>
</a>
<?php endforeach; ?>
@@ -29,13 +29,48 @@
<a class="btn-menu mdl-navigation__link"
title="<?php echo $action->getTitle(); ?>"
data-action-id="<?php echo $action->getId(); ?>"
<?php foreach ($action->getData() as $dataName => $dataValue):?>
<?php echo 'data-', $dataName, '="', $dataValue , '"'; ?>
<?php endforeach;?>>
<?php foreach ($action->getData() as $dataName => $dataValue): ?>
<?php echo 'data-', $dataName, '="', $dataValue, '"'; ?>
<?php endforeach; ?>>
<i class="material-icons"><?php echo $action->getIcon()->getIcon(); ?></i>
<?php echo $action->getTitle(); ?>
</a>
<?php endforeach; ?>
<?php if ($showPassIcon): ?>
<a class="btn-action mdl-navigation__link"
title="<?php echo _('Cambiar clave de usuario'); ?>"
data-onclick="appMgmt/show"
data-action-id="<?php echo \SP\Core\ActionsInterface::ACTION_USR_USERS_EDITPASS; ?>"
data-item-id="<?php echo $userId; ?>"
data-sk="<?php echo $sk; ?>">
<i class="btn-action material-icons">security</i>
<?php echo _('Cambiar clave de usuario'); ?>
</a>
<?php endif; ?>
<a class="btn-menu mdl-navigation__link"
title="<?php echo _('Preferencias de usuario'); ?>"
data-action-id="<?php echo \SP\Core\ActionsInterface::ACTION_USR_PREFERENCES; ?>">
<i class="btn-action material-icons">account_circle</i>
<?php printf('%s (%s) %s', $userName, $userGroup, $adminApp); ?>
</a>
<a class="btn-action mdl-navigation__link" title="<?php echo _('Salir'); ?>"
data-onclick="main/logout">
<i class="material-icons">exit_to_app</i>
<?php echo _('Salir'); ?>
</a>
<a class="mdl-navigation__link" href="#">
<?php if ($httpsEnabled): ?>
<i class="material-icons mdl-color-text--teal-500">lock</i>
<?php else: ?>
<i class="material-icons mdl-color-text--red-900">lock_open</i>
<?php endif; ?>
<?php if ($isDemoMode): ?>
<span class="status-info"><?php echo _('Demo'); ?></span>
<?php endif; ?>
<?php echo $appInfo['appname'], ' ', $appVersion; ?>
</a>
</nav>
</div>
<main class="mdl-layout__content">