* [MOD] New Material Design using Google MDL (work in progress).

* [FIX] Fixed issue with action buttons.
* [MOD] Minor UI tweaks.
This commit is contained in:
nuxsmin
2015-07-23 01:00:53 +02:00
parent 9089d4f0b1
commit ef05bb707d
18 changed files with 148 additions and 170 deletions

View File

@@ -8,7 +8,7 @@
</div>
<?php if ($showform): ?>
<form method="post" name="frmaccount" id="frmAccount">
<form method="post" name="frmaccount" id="frmAccount" onsubmit="saveAccount('frmAccount'); return false;">
<?php endif; ?>
<table class="data round">
<tr>
@@ -206,15 +206,15 @@
</tr>
<?php endif; ?>
<?php if ($showform): ?>
<input type="hidden" name="hash" value="<?php echo $changesHash; ?>">
<input type="hidden" name="next" value="<?php echo $nextaction; ?>">
<input type="hidden" name="actionId" value="<?php echo $actionId; ?>">
<?php if ($gotData): ?>
<input type="hidden" name="accountid" value="<?php echo $accountId; ?>"/>
<?php endif; ?>
<input type="hidden" name="sk" value="<?php echo $sk; ?>">
<input type="hidden" name="isAjax" value="1">
<?php if ($showform): ?>
<input type="hidden" name="hash" value="<?php echo $changesHash; ?>">
<input type="hidden" name="next" value="<?php echo $nextaction; ?>">
<input type="hidden" name="actionId" value="<?php echo $actionId; ?>">
<?php if ($gotData): ?>
<input type="hidden" name="accountid" value="<?php echo $accountId; ?>"/>
<?php endif; ?>
<input type="hidden" name="sk" value="<?php echo $sk; ?>">
<input type="hidden" name="isAjax" value="1">
</form>
<?php endif; ?>
@@ -354,7 +354,7 @@
<?php endif; ?>
<?php if ($gotData && $accountIsHistory): ?>
<form method="post" name="frmaccount" id="frmAccount">
<form method="post" name="frmaccount" id="frmAccount" onsubmit="saveAccount('frmAccount'); return false;">
<input type="hidden" name="hash" value="<?php echo $changesHash; ?>">
<input type="hidden" name="actionId"
value="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT_RESTORE; ?>">
@@ -366,55 +366,55 @@
<div class="action">
<?php if ($showDelete): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-red80" OnClick="delAccount(<?php echo $accountId; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_DELETE; ?>,'<?php echo $sk; ?>');" title="<?php echo _('Eliminar Cuenta'); ?>">
<button id="btnDelete" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-red80" OnClick="delAccount(<?php echo $accountId; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_DELETE; ?>,'<?php echo $sk; ?>');" title="<?php echo _('Eliminar Cuenta'); ?>">
<i class="material-icons">delete</i>
</button>
<?php endif; ?>
<?php if ($showRestore): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="saveAccount('frmAccount');" title="<?php echo _('Restaurar cuenta desde este punto'); ?>">
<i class="material-icons">restore</i>
</button>
<?php endif; ?>
<?php if ($showViewPass): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" onClick="viewPass(<?php echo $accountId; ?>,1,<?php echo $accountIsHistory; ?>)" title="<?php echo _('Ver Clave'); ?>">
<button id="btnViewPass" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" onClick="viewPass(<?php echo $accountId; ?>,1,<?php echo $accountIsHistory; ?>)" title="<?php echo _('Ver Clave'); ?>">
<i class="material-icons">lock_open</i>
</button>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" onmousedown="viewPass(<?php echo $accountId; ?>, false, <?php echo $accountIsHistory; ?>)" title="<?php echo _('Copiar Clave en Portapapeles'); ?>">
<button id="btnClipPass" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" onmousedown="viewPass(<?php echo $accountId; ?>, false, <?php echo $accountIsHistory; ?>)" title="<?php echo _('Copiar Clave en Portapapeles'); ?>">
<i class="material-icons clip-pass-button"
data-clipboard-target="clip-pass-text">content_paste</i>
</button>
<?php endif; ?>
<?php if ($showEditPass): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-orange80" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT_PASS; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Modificar Clave de Cuenta'); ?>">
<button id="btnEditPass" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-orange80" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT_PASS; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Modificar Clave de Cuenta'); ?>">
<i class="material-icons">lock_outline</i>
</button>
<?php endif; ?>
<?php if ($gotData && $accountIsHistory): ?>
<button id="btnBack" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountParentId; ?>)" title="<?php echo _('Ver Actual'); ?>">
<i class="material-icons">arrow_back</i>
</button>
<?php else: ?>
<button id="btnBack" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo $lastAction; ?>, <?php echo $actionId; ?>,<?php echo $accountParentId; ?>)" title="<?php echo _('Atrás'); ?>">
<i class="material-icons">arrow_back</i>
</button>
<?php endif; ?>
<?php if ($showEdit): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-orange80" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Modificar Cuenta'); ?>">
<button id="btnEdit" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-orange80" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Modificar Cuenta'); ?>">
<i class="material-icons">mode_edit</i>
</button>
<?php elseif (!$showEdit && $actionId == \SP\Controller\ActionsInterface::ACTION_ACC_VIEW && \SP\Util::mailrequestIsEnabled()): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_REQUEST; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Solicitar Modificación'); ?>">
<button id="btnRequest" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_REQUEST; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo $accountId; ?>)" title="<?php echo _('Solicitar Modificación'); ?>">
<i class="material-icons">email</i>
</button>
<?php endif; ?>
<?php if ($gotData && $accountIsHistory): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountParentId; ?>)" title="<?php echo _('Ver Actual'); ?>">
<i class="material-icons">arrow_back</i>
</button>
<?php else: ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" OnClick="doAction(<?php echo $lastAction; ?>, <?php echo $actionId; ?>,<?php echo $accountParentId; ?>)" title="<?php echo _('Atrás'); ?>">
<i class="material-icons">arrow_back</i>
<?php if ($showRestore): ?>
<button id="btnRestore" name="btnRestore" type="submit" form="frmAccount" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80" title="<?php echo _('Restaurar cuenta desde este punto'); ?>">
<i class="material-icons">restore</i>
</button>
<?php endif; ?>
<?php if ($showSave): ?>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80" OnClick="saveAccount('frmAccount');" title="<?php echo _('Guardar'); ?>">
<button id="btnSave" name="btnRestore" type="submit" form="frmAccount" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80" title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
<?php endif; ?>

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo $header; ?></H2>
<form method="post" name="frmCategories" id="frmCategories">
<form method="post" name="frmCategories" id="frmCategories" onsubmit="appMgmtSave('frmCategories'); return false;">
<table class="fancydata">
<tbody>
<tr>
@@ -39,8 +39,8 @@
</form>
<div id="resCheck"><span id="resFancyAccion"></span></div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmCategories');" title="<?php echo _('Guardar'); ?>">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
form="frmCategories" title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

View File

@@ -155,32 +155,17 @@ i{cursor: pointer;}
font-weight: bold;
}
a {
a, a:visited {
text-decoration: none;
color: #339;
color: rgba(68, 138, 255, 1);
}
a:visited {
a:hover, a:active, a:focus {
text-decoration: none;
color: #339;
}
a:hover {
text-decoration: none;
color: orangered;
color: rgba(68, 138, 255, .6);
cursor: pointer;
}
a:active {
text-decoration: none;
color: #BB0000;
}
a:focus {
text-decoration: none;
color: #FF0000;
}
#nojs {
width: 80%;
margin: auto;

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo $header; ?></H2>
<form method="post" name="frmCustomers" id="frmCustomers">
<form method="post" name="frmCustomers" id="frmCustomers" onsubmit="appMgmtSave('frmCustomers'); return false;">
<table class="fancydata">
<tbody>
<tr>
@@ -39,8 +39,8 @@
</form>
<div id="resCheck"><span id="resFancyAccion"></span></div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmCustomers');" title="<?php echo _('Guardar'); ?>">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
form="frmCustomers" title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

View File

@@ -3,7 +3,7 @@
<i id="history-icon" class="material-icons"><?php echo $title['icon']; ?></i>
</div>
<form method="post" name="editpass" id="frmEditPass">
<form method="post" name="editpass" id="frmEditPass" onsubmit="saveAccount('frmEditPass'); return false;">
<table class="data round">
<tr>
<td class="descField"><?php echo _('Nombre'); ?></td>
@@ -39,7 +39,7 @@
<td class="valField">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="password2" name="password2" type="password" required class="mdl-textfield__input fg-blue100"
maxlength="255" OnKeyUp="checkPassLevel(this.value)" autocomplete="off">
maxlength="255" autocomplete="off">
<label class="mdl-textfield__label" for="password2"><?php echo _('Clave'); ?></label>
</div>
<span class="passLevel fullround" title="<?php echo _('Nivel de fortaleza de la clave'); ?>"></span>
@@ -51,21 +51,22 @@
<input type="hidden" name="next" value="<?php echo $nextaction; ?>">
<input type="hidden" name="sk" value="<?php echo $sk; ?>">
<input type="hidden" name="isAjax" value="1">
<div class="action">
<button id="btnBack" type="button" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="doAction(<?php echo $lastAction; ?>, <?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)"
title="<?php echo _('Atrás'); ?>">
<i class="material-icons">arrow_back</i>
</button>
<button id="btnSave" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>
</form>
<div class="action">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="saveAccount('frmEditPass');" title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="doAction(<?php echo $lastAction; ?>, <?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $accountId; ?>)"
title="<?php echo _('Atrás'); ?>">
<i class="material-icons">arrow_back</i>
</button>
</div>
<script>
$(function () {
$('input:password:visible:first').focus();

View File

@@ -1,31 +1,28 @@
</div> <!-- Close container -->
<footer>
<?php if($loggedIn): ?>
<div id="session">
<i class="material-icons" title="<?php echo _('Salir'); ?>" OnClick="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="usrUpdPass(this,<?php echo \SP\Controller\ActionsInterface::ACTION_USR_USERS_EDITPASS; ?>, '<?php echo $sk; ?>')">security</i>
<?php endif; ?>
<?php echo $userName, ' (', $userGroup, ') ', $adminApp; ?>
</div>
<?php endif; ?>
</div> <!-- Close container -->
<footer>
<?php if ($loggedIn): ?>
<div id="session">
<i class="material-icons" title="<?php echo _('Salir'); ?>" OnClick="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="usrUpdPass(this,<?php echo \SP\Controller\ActionsInterface::ACTION_USR_USERS_EDITPASS; ?>, '<?php echo $sk; ?>')">security</i>
<?php endif; ?>
<?php echo $userName, ' (', $userGroup, ') ', $adminApp; ?>
</div>
<?php endif; ?>
<div id="updates"></div>
<div id="status"><?php echo (DEBUG) ? 'Debug ON' : ''; ?></div>
<div id="project">
<a href="<?php echo $appInfo['appwebsite']; ?>" target="_blank"
title="<?php echo _('Ayuda :: FAQ :: Changelog'); ?>"><?php echo $appInfo['appname'], ' ', $appVersion; ?></a>
&nbsp;::&nbsp;
<a href="<?php echo $appInfo['appblog']; ?>" target="_blank"
title="<?php echo _('Un proyecto de cygnux.org'); ?>">cygnux.org</a>
</div>
<!-- Close Project -->
</footer> <!-- Close footer -->
<script>$('input[type="text"], select, textarea').placeholder().mouseenter(function () {
$(this).focus();
});</script>
</div> <!-- Close wrap -->
</body>
</html>
<div id="updates"></div>
<div id="status"><?php echo (DEBUG) ? 'Debug ON' : ''; ?></div>
<div id="project">
<a href="<?php echo $appInfo['appwebsite']; ?>" target="_blank"
title="<?php echo _('Ayuda :: FAQ :: Changelog'); ?>"><?php echo $appInfo['appname'], ' ', $appVersion; ?></a>
&nbsp;::&nbsp;
<a href="<?php echo $appInfo['appblog']; ?>" target="_blank"
title="<?php echo _('Un proyecto de cygnux.org'); ?>">cygnux.org</a>
</div> <!-- Close Project -->
</footer> <!-- Close footer -->
</div> <!-- Close wrap -->
</body> <!-- Close BODY...almost done..go..go..go -->
</html> <!-- Close HTML...ufff too much work!! :)) -->
<!-- Insert coin . . . -->

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo $header; ?></H2>
<form method="post" name="frmGroups" id="frmGroups">
<form method="post" name="frmGroups" id="frmGroups" onsubmit="appMgmtSave('frmGroups'); return false;">
<table class="fancydata">
<tbody>
<tr>
@@ -39,8 +39,8 @@
</form>
<div id="resCheck"><span id="resFancyAccion"></span></div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmGroups');" title="<?php echo _('Guardar'); ?>">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
form="frmGroups" title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -36,9 +36,13 @@ jQuery.extend(jQuery.fancybox.defaults, {
type: 'ajax',
autoWidth: 'true',
autoHeight: 'true',
autoResize: 'true',
autoCenter: 'true',
fitToView: 'true',
minHeight: 50,
padding: 0,
helpers: {overlay: {css: {'background': 'rgba(0, 0, 0, 0.1)'}}},
keys: {close: [27]},
afterShow: function () {
"use strict";
@@ -473,12 +477,8 @@ function saveAccount(frm) {
var data = $("#" + frm).serialize();
var id = $('input[name="accountid"]').val();
var savetyp = $('input[name="savetyp"]').val();
var action = $('input[name="next"]').val();
$('#btnGuardar').attr('disabled', true);
$.fancybox.showLoading();
$.ajax({
type: 'POST',
dataType: 'json',
@@ -491,20 +491,13 @@ function saveAccount(frm) {
if (status === 0) {
resMsg("ok", description);
if (savetyp === 1) {
$('#btnSave').hide();
} else {
$('#btnSave').attr('disabled', true);
}
if (action && id) {
doAction(action, 'accsearch', id);
doAction(action, 1, id);
}
} else if (status === 10) {
doLogout();
} else {
resMsg("error", description);
$('#btnSave').removeAttr("disabled");
}
},
error: function (jqXHR, textStatus, errorThrown) {
@@ -512,7 +505,6 @@ function saveAccount(frm) {
resMsg("error", txt);
},
complete: function () {
$.fancybox.hideLoading();
}
});
}
@@ -1159,12 +1151,6 @@ function resMsg(type, txt, url, action) {
return alertify.error(txt);
}
jQuery('#dialog').load(html).dialog('open').afterClose(function () {
if (typeof action !== "undefined") {
eval(action);
}
});
/* $.fancybox(html, {
afterLoad: function () {
$('.fancybox-skin,.fancybox-outer,.fancybox-inner').css({

View File

@@ -24,7 +24,7 @@
*/
$jsFilesTheme = array(
array('href' => \SP\Init::$THEMEPATH . '/js/functions.js', 'min' => true),
// array('href' => \SP\Init::$THEMEPATH . '/js/material.min.js.map', 'min' => false),
array('href' => \SP\Init::$THEMEPATH . '/js/material.min.js', 'min' => false),
array('href' => \SP\Init::$THEMEPATH . '/js/functions.js', 'min' => true),
);

View File

@@ -62,7 +62,7 @@
</form>
</div>
<div id="boxButton">
<button id="btnLogin" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" title="<?php echo _('Acceder'); ?>">
<button id="btnLogin" form="frmLogin" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" title="<?php echo _('Acceder'); ?>">
<i class="material-icons">play_arrow</i>
</button>
</div>
@@ -104,8 +104,6 @@
<script>
$(function(){
$('#btnLogin').click(function(){$('#frmLogin').submit();});
$("#pass, #mpass").keyup(function(event){
if(event.keyCode == 13){
$('#frmLogin').submit();

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo $header; ?></H2>
<form method="post" name="frmProfiles" id="frmProfiles">
<form method="post" name="frmProfiles" id="frmProfiles" onsubmit="appMgmtSave('frmProfiles'); return false;">
<table class="fancydata">
<tbody>
<tr>
@@ -163,8 +163,8 @@
<?php if (!$isView): ?>
<div id="resCheck"><span id="resFancyAccion"></span></div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmProfiles');" title="<?php echo _('Guardar'); ?>">
<button form="frmProfiles" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

View File

@@ -1,6 +1,6 @@
<div id="title" class="midroundup titleNormal"><?php echo _('Solicitar Modificación de Cuenta'); ?></div>
<form method="post" name="requestmodify" id="frmRequestModify">
<form method="post" name="requestmodify" id="frmRequestModify" onsubmit="sendRequest(); return false;">
<table class="data round">
<tr>
<td class="descField"><?php echo _('Nombre'); ?></td>
@@ -24,8 +24,10 @@
<tr>
<td class="descField"><?php echo _('Petición'); ?></td>
<td class="valField">
<textarea name="description" cols="30" rows="5"
placeholder="<?php echo _('Descripción de la petición'); ?>" maxlength="1000"></textarea>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<textarea class="mdl-textfield__input fg-blue100" rows= "3" id="description" name="description" maxlength="1000"></textarea>
<label class="mdl-textfield__label" for="description"><?php echo _('Descripción de la petición'); ?></label>
</div>
</td>
</tr>
</table>
@@ -34,14 +36,16 @@
<input type="hidden" name="isAjax" value="1">
</form>
<div class="action">
<ul>
<li>
<img SRC="imgs/back.png" title="<?php echo _('Atrás'); ?>" class="inputImg" id="btnBack"
OnClick="doAction('<?php echo $lastAction; ?>', <?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>)"/>
</li>
<li>
<img SRC="imgs/check.png" title="<?php echo _('Enviar'); ?>" class="inputImg" id="btnSave"
OnClick="sendRequest();"/>
</li>
</ul>
</div>
<button id="btnBack" type="button"
class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="doAction('<?php echo $lastAction; ?>', <?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>)"
title="<?php echo _('Atrás'); ?>">
<i class="material-icons">arrow_back</i>
</button>
<button id="btnSave" form="frmRequestModify"
class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
title="<?php echo _('Enviar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

View File

@@ -21,10 +21,10 @@
<div class="field-customer label-field">
<div class="field-name"><?php echo _('Cliente'); ?></div>
<div class="field-text round5 no-link"
style="background-color: <?php echo $account['color']; ?>">
style="background-color: <?php echo $account['color']; ?>;">
<?php if (!empty($account['customer_link'])): ?>
<a href="<?php echo $account['customer_link']; ?>" target="blank"
title="<?php echo _('Buscar en Wiki'); ?><br><br><?php echo $account['customer_name']; ?>">
title="<?php echo _('Buscar en Wiki'); ?>&nbsp;<?php echo $account['customer_name']; ?>">
<?php echo $account['customer_name']; ?>
</a>
<?php else: ?>
@@ -92,7 +92,7 @@
<?php foreach ($wikiFilter as $filter): ?>
<?php if (preg_match("/^" . preg_quote($filter) . ".*/i", $account['name'])): ?>
<a href="<?php echo $wikiPageUrl, $account['name']; ?>" target="_blank">
<img src="imgs/wiki.png" title="<?php echo _('Enlace a Wiki'); ?>"/>
<i id="viewpass" class="material-icons" title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
</a>
<?php endif; ?>
<?php endforeach; ?>

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo $header; ?></h2>
<form method="post" name="frmUsers" id="frmUsers">
<form method="post" name="frmUsers" id="frmUsers" onsubmit="appMgmtSave('frmUsers'); return false;">
<table class="fancydata">
<tbody>
<tr>
@@ -197,8 +197,8 @@
<?php if (!$isView): ?>
<div id="resCheck"><span id="resFancyAccion"></span></div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmUsers');" title="<?php echo _('Guardar'); ?>">
<button form="frmUsers" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>

View File

@@ -1,7 +1,7 @@
<div id="fancyContainer" align="center">
<h2 class="midround"><?php echo _('Cambio de Clave'); ?></h2>
<form method="post" name="updUsrPass" id="frmUpdUsrPass">
<form method="post" name="updUsrPass" id="frmUpdUsrPass" onsubmit="appMgmtSave('frmUpdUsrPass'); return false;">
<table class="fancydata">
<tr>
@@ -9,8 +9,7 @@
<td class="valField">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password" required class="mdl-textfield__input fg-blue100"
maxlength="50" OnFocus="$('#passLevel').show();
$('#resFancyAccion').hide();" OnKeyUp="checkPassLevel(this.value)">
maxlength="50">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
</div>
@@ -27,8 +26,8 @@
maxlength="50">
<label class="mdl-textfield__label"
for="passv"><?php echo _('Clave (repetir)'); ?></label>
</div
<span id="passLevel" title="<?php echo _('Nivel de fortaleza de la clave'); ?>"></span>
</div>
<span class="passLevel fullround" title="<?php echo _('Nivel de fortaleza de la clave'); ?>"></span>
</td>
</tr>
</table>
@@ -41,8 +40,8 @@
<span id="resFancyAccion"></span>
</div>
<div class="action-in-box">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
OnClick="appMgmtSave('frmUpdUsrPass');" title="<?php echo _('Guardar'); ?>">
<button form="frmUpdUsrPass" class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored bg-green80"
title="<?php echo _('Guardar'); ?>">
<i class="material-icons">save</i>
</button>
</div>
@@ -54,5 +53,10 @@
$('#resFancyAccion').hide();
password(11, true, true);
});
$('#pass').focus(function() {
$('#passLevel').show();
$('#resFancyAccion').hide();
}).on('keyup', function(){checkPassLevel(this.value)});
});
</script>

View File

@@ -154,20 +154,23 @@ class SearchC extends Controller implements ActionsInterface
}
$colors = array(
'ef5350',
'ec407a',
'ab47bc',
'7e57c2',
'5c6bc0',
'42a5f5',
'29b6f6',
'26c6da',
'26a69a',
'66bb6a',
'9ccc65',
'ff7043',
'8d6e63',
'78909c'
'2196F3',
'03A9F4',
'00BCD4',
'009688',
'4CAF50',
'8BC34A',
'CDDC39',
'FFC107',
'795548',
'607D8B',
'9E9E9E',
'FF5722',
'F44336',
'E91E63',
'9C27B0',
'673AB7',
'3F51B5',
);
$this->setSortFields();