* [MOD] Minor UI tweaks

This commit is contained in:
nuxsmin
2015-07-30 11:25:13 +02:00
committed by nuxsmin
parent 1663c790f7
commit 85f956d5d5
7 changed files with 87 additions and 69 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -14,7 +14,7 @@
height="395.32526"
id="svg2985"
version="1.1"
inkscape:version="0.48.5 r10040"
inkscape:version="0.91 r13725"
sodipodi:docname="logo.svg">
<defs
id="defs2987">
@@ -435,16 +435,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="24.119479"
inkscape:cy="161.20187"
inkscape:zoom="0.82910156"
inkscape:cx="-98.934263"
inkscape:cy="125.4469"
inkscape:current-layer="layer2"
inkscape:document-units="px"
showgrid="false"
inkscape:window-width="1440"
inkscape:window-height="852"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-width="1618"
inkscape:window-height="1028"
inkscape:window-x="54"
inkscape:window-y="-8"
inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true"
@@ -497,7 +497,7 @@
y="396.5" /></text>
</g>
<rect
style="fill:#3f51b5;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4485-6)"
style="fill:#3f51b5;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4485-6);opacity:0.5"
id="rect3079"
width="298"
height="380"

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -1,4 +1,4 @@
<div id="title" class="midroundup <?php echo $title['class']; ?>">
<div id="title" class="midroundup titleBlue">
<?php echo $title['name']; ?>
<?php if ($gotData && $accountIsHistory): ?>
<i id="history-icon" class="material-icons" title="<?php echo _('Histórico'); ?>"><?php echo $title['icon']; ?></i>
@@ -29,7 +29,7 @@
<td class="descField"><?php echo _('Cliente'); ?></td>
<td class="valField">
<?php if ($showform): ?>
<select id="selCustomer" name="customerId" class="select-box" required>
<select id="selCustomer" name="customerId" class="select-box sel-chosen-customer" required>
<option value="0"></option>
<?php foreach ($customers as $id => $name): ?>
<option
@@ -50,7 +50,7 @@
<td class="descField"><?php echo _('Categoría'); ?></td>
<td class="valField">
<?php if ($showform): ?>
<select id="selCategory" name="categoryId" class="select-box" required>
<select id="selCategory" name="categoryId" class="select-box sel-chosen-category" required>
<option value="0"></option>
<?php foreach ($categories as $id => $name): ?>
<option
@@ -418,16 +418,6 @@
<?php if ($showform): ?>
<script>
$(function(){
$("#selCustomer").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Cliente'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>"
});
$("#selCategory").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Categoría'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>"
});
$("#selGroups").chosen({
placeholder_text_multiple: "<?php echo _('Seleccionar grupos secundarios'); ?>"
});

View File

@@ -12,23 +12,23 @@ This file is generated by `grunt build`, do not edit it by hand.
/* @group Results */
.chosen-container .chosen-results li.highlighted {
background-color: #448AFF;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #66a1ff), color-stop(90%, #448AFF));
background-image: -webkit-linear-gradient(#66a1ff 20%, #448AFF 90%);
background-image: -moz-linear-gradient(#66a1ff 20%, #448AFF 90%);
background-image: -o-linear-gradient(#66a1ff 20%, #448AFF 90%);
background-image: linear-gradient(#66a1ff 20%, #448AFF 90%);
background-color: #536DFE;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #879bff), color-stop(90%, #536DFE));
background-image: -webkit-linear-gradient(#879bff 20%, #536DFE 90%);
background-image: -moz-linear-gradient(#879bff 20%, #536DFE 90%);
background-image: -o-linear-gradient(#879bff 20%, #536DFE 90%);
background-image: linear-gradient(#879bff 20%, #536DFE 90%);
color: #fff;
}
/* @end */
/* @group Active */
.chosen-container-active .chosen-single {
border: 1px solid rgba(68, 138, 255, .8);
border: 1px solid rgba(83, 109, 254, .8);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
}
.chosen-container-active .chosen-choices {
border: 1px solid rgba(68, 138, 255, .8);
border: 1px solid rgba(83, 109, 254, .8);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
}
/* @end */

View File

@@ -7,7 +7,7 @@ html, body {
padding: 0;
text-align: left;
background-color: #f5f5f5;
color: #000000;
color: #555;
font-size: 12px;
font-weight: normal;
}
@@ -270,7 +270,7 @@ a:hover, a:active, a:focus {
#container #content {
width: 95%;
min-height: 500px;
margin: 14em auto 5em auto;
margin: 10em auto 5em auto;
}
#content td.descField, #fancyContainer td.descField {
@@ -367,10 +367,7 @@ a:hover, a:active, a:focus {
text-align: center;
}
#content #title.titleBlue,
#content #title.titleGreen,
#content #title.titleOrange,
#content #title.titleRed {
#content #title.titleBlue {
background-color: #536dfe;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #536dfe), color-stop(90%, #536dfe));
background-image: -webkit-linear-gradient(#536dfe 20%, #536dfe 90%);
@@ -383,11 +380,11 @@ a:hover, a:active, a:focus {
#content #title.titleNormal {
background-color: rgb(96, 125, 139);
color: #fff;
font-weight: bold;
/*font-weight: bold;*/
}
#content .data {
width: 80%;
width: 75%;
padding: 10px;
border: 1px solid #c9c9c9;
margin: auto;
@@ -657,6 +654,7 @@ a:hover, a:active, a:focus {
padding: 1em 0;
text-align: center;
background-color: #fcfcfc;
width: 15em;
}
#content .data-rows li.cell-actions:hover {
@@ -1262,14 +1260,8 @@ footer img {
}
.header-grey {
background-color: #536dfe;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #536dfe), color-stop(90%, #536dfe));
background-image: -webkit-linear-gradient(#536dfe 20%, #536dfe 90%);
background-image: -moz-linear-gradient(#536dfe 20%, #536dfe 90%);
background-image: -o-linear-gradient(#536dfe 20%, #536dfe 90%);
background-image: linear-gradient(#536dfe 20%, #536dfe 90%);
background-color: rgb(96, 125, 139);
color: #fff;
background: #536dfe url("../inc/themes/material-blue/css/images/ui-bg_highlight-hard_100_536DFE_1x100.png") repeat-x scroll 50% 50%;
height: 30px;
text-align: center;
}
@@ -1279,7 +1271,7 @@ footer img {
}
.action {
max-width: 80%;
max-width: 75%;
height: 4em;
margin: 0.7em auto;
text-align: right;
@@ -1731,4 +1723,33 @@ fieldset.warning a {
.no-title .ui-dialog-titlebar {
display: none;
}
@media all and (max-width: 1024px) {
#container #actionsBar {
text-align: right;
}
#container #content {
width: 95%;
min-height: 500px;
margin: 15em auto 5em auto;
}
#content .data {
width: 95%;
padding: 10px;
margin: auto;
}
#content #tabs .ui-tabs-nav {
left: 0;
width: 100%;
}
.action {
max-width: 95%;
height: 4em;
margin: 0.7em auto;
}
}

View File

@@ -2,31 +2,39 @@
$(function () {
$(".sel-chosen-ns").chosen({disable_search: true, width: "250px"});
$(".sel-chosen-usergroup").each(function(){
$(this).chosen({
placeholder_text_single: "<?php echo _('Seleccionar Grupo'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-usergroup").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Grupo'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-user").each(function(){
$(this).chosen({
placeholder_text_single: "<?php echo _('Seleccionar Usuario'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-user").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Usuario'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-profile").each(function(){
$(this).chosen({
placeholder_text_single: "<?php echo _('Seleccionar Perfil'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-profile").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Perfil'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-customer").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Cliente'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".sel-chosen-category").chosen({
placeholder_text_single: "<?php echo _('Seleccionar Categoría'); ?>",
disable_search_threshold: 10,
no_results_text: "<?php echo _('Sin resultados'); ?>",
width: "250px"
});
$(".download").button({

View File

@@ -30,7 +30,6 @@
</div>
<div class="data-rows">
<?php $numActions = count($tab['props']["actions"]); ?>
<?php foreach ($tab['query'] as $item): ?>
<?php $i = 0; ?>
<?php $itemId = $item->$tab['props']['tblRowSrcId']; ?>
@@ -56,7 +55,7 @@
<?php endif; ?>
<?php endforeach; ?>
<li class="cell-actions round" style="width: <?php echo($numActions * 5 + 2); ?>%;">
<li class="cell-actions round">
<?php foreach ($tab['props']['actions'] as $actionName => $action): ?>
<?php if (isset($action['skip']) || ($action['id'] == \SP\Controller\ActionsInterface::ACTION_USR_USERS_EDITPASS && isset($action_check['user_isLdap']))): continue; endif; ?>
<?php