Merge branch '3446-Imagen-grupos-no-se-muestra-None' into 'develop'
Don't show image for groups without icon - #3446 See merge request artica/pandorafms!2145 Former-commit-id: 6bdfdcc0b84e7dcb228faf98470ea062f850c613
This commit is contained in:
Alejandro Fraguas
commit
39d0bf0d0a
|
|
@ -11,7 +11,6 @@
|
|||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
ui_require_css_file('tree');
|
||||
ui_require_css_file('fixed-bottom-box');
|
||||
|
||||
|
|
@ -539,6 +538,7 @@ if ($tab == 'tree') {
|
|||
$url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'];
|
||||
$table->data[$key][0] = $group['id_grupo'];
|
||||
$table->data[$key][1] = "<a href='$url'>".$group['nombre'].'</a>';
|
||||
if ($group['icon'] != '') {
|
||||
$table->data[$key][2] = html_print_image(
|
||||
'images/groups_small/'.$group['icon'].'.png',
|
||||
true,
|
||||
|
|
@ -550,6 +550,10 @@ if ($tab == 'tree') {
|
|||
false, false, false, true
|
||||
]
|
||||
);
|
||||
} else {
|
||||
$table->data[$key][2] = '';
|
||||
}
|
||||
|
||||
|
||||
// reporting_get_group_stats
|
||||
$table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
/*
|
||||
* ---------------------------------------------------------------------
|
||||
* - CLUSTER VIEW -
|
||||
|
|
@ -90,7 +89,7 @@
|
|||
#cluster_status_button {
|
||||
float: left;
|
||||
width: 10%;
|
||||
margin-left:5%;;
|
||||
margin-left: 5%;
|
||||
}
|
||||
|
||||
#last_contact_content {
|
||||
|
|
@ -121,7 +120,6 @@
|
|||
font-size: 14pt;
|
||||
}
|
||||
|
||||
|
||||
.balanced_module_item {
|
||||
float: left;
|
||||
margin-top: 11.5px;
|
||||
|
|
|
|||
|
|
@ -34,14 +34,21 @@ div.database_debug_title {
|
|||
width: 95%;
|
||||
}
|
||||
|
||||
|
||||
/* Common useful styles */
|
||||
.invisible {
|
||||
display: none;
|
||||
}
|
||||
.left { clear: left; float: left;}
|
||||
.right { clear: right; float: right;}
|
||||
.clear { clear:both; }
|
||||
.left {
|
||||
clear: left;
|
||||
float: left;
|
||||
}
|
||||
.right {
|
||||
clear: right;
|
||||
float: right;
|
||||
}
|
||||
.clear {
|
||||
clear: both;
|
||||
}
|
||||
.top {
|
||||
vertical-align: top;
|
||||
margin-top: 0;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ td.scwWeek {
|
|||
/* Today selector */
|
||||
td.scwFootDisabled {
|
||||
background-color: #000;
|
||||
color: #FFFFFF;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
tfoot.scwFoot {
|
||||
|
|
@ -31,7 +31,7 @@ tfoot.scwFoot {
|
|||
}
|
||||
|
||||
.scwFoot :hover {
|
||||
color: #3F3F3F !important;
|
||||
color: #3f3f3f !important;
|
||||
}
|
||||
|
||||
table.scwCells {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
@import url(calendar.css);
|
||||
|
||||
/* --- JQUERY-UI --- */
|
||||
|
|
@ -13,24 +12,26 @@
|
|||
.ui-button-text-only .ui-button-text {
|
||||
font-family: nunito;
|
||||
font-size: 9pt;
|
||||
color: #82B92E
|
||||
color: #82b92e;
|
||||
}
|
||||
.ui-datepicker .ui-datepicker-title *, .ui-datepicker th * {
|
||||
.ui-datepicker .ui-datepicker-title *,
|
||||
.ui-datepicker th * {
|
||||
color: white;
|
||||
}
|
||||
.ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title option {
|
||||
.ui-datepicker .ui-datepicker-title select,
|
||||
.ui-datepicker .ui-datepicker-title option {
|
||||
color: #111 !important;
|
||||
}
|
||||
.ui-dialog .ui-dialog-titlebar {
|
||||
display: inherit;
|
||||
text-align: center;
|
||||
padding: .4em 1em;
|
||||
padding: 0.4em 1em;
|
||||
height: 30px;
|
||||
position: relative;
|
||||
}
|
||||
.ui-dialog .ui-dialog-title {
|
||||
font-family: Nunito, sans-serif;
|
||||
margin: .1em 0 !important;
|
||||
margin: 0.1em 0 !important;
|
||||
white-space: nowrap !important;
|
||||
width: 100% !important;
|
||||
overflow: hidden !important;
|
||||
|
|
@ -53,7 +54,7 @@
|
|||
.ui-dialog .ui-dialog-content {
|
||||
position: relative !important;
|
||||
border: 0;
|
||||
padding: .5em 1em !important;
|
||||
padding: 0.5em 1em !important;
|
||||
background: none !important;
|
||||
overflow: auto !important;
|
||||
margin-bottom: 1em;
|
||||
|
|
@ -62,14 +63,14 @@
|
|||
text-align: left;
|
||||
border-width: 1px 0 0 0;
|
||||
background-image: none;
|
||||
margin-top: .5em;
|
||||
padding: .3em 1em .5em .4em;
|
||||
margin-top: 0.5em;
|
||||
padding: 0.3em 1em 0.5em 0.4em;
|
||||
}
|
||||
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
|
||||
float: right;
|
||||
}
|
||||
.ui-dialog .ui-dialog-buttonpane button {
|
||||
margin: .5em 1em .5em 0 !important;
|
||||
margin: 0.5em 1em 0.5em 0 !important;
|
||||
cursor: pointer !important;
|
||||
background: white !important;
|
||||
background-color: white !important;
|
||||
|
|
@ -80,11 +81,13 @@
|
|||
.ui-widget-header .ui-icon {
|
||||
background-image: url(../images/ui-icons_444444_256x240.png) !important;
|
||||
}
|
||||
.ui-icon, .ui-widget-content .ui-icon {
|
||||
.ui-icon,
|
||||
.ui-widget-content .ui-icon {
|
||||
background-image: url(../images/ui-icons_444444_256x240.png) !important;
|
||||
}
|
||||
.ui-widget-content {
|
||||
background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
|
||||
background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
|
||||
repeat-x;
|
||||
}
|
||||
.ui-state-default,
|
||||
.ui-widget-content .ui-state-default,
|
||||
|
|
@ -92,7 +95,8 @@
|
|||
margin-top: 3px;
|
||||
border: 1px solid #d3d3d3 !important;
|
||||
border-bottom: 0 !important;
|
||||
background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x !important;
|
||||
background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
|
||||
repeat-x !important;
|
||||
font-weight: normal !important;
|
||||
color: #555555 !important;
|
||||
}
|
||||
|
|
@ -121,15 +125,15 @@
|
|||
border-bottom-right-radius: 0 !important;
|
||||
}
|
||||
#ui-datepicker-div {
|
||||
border-color: #B1B1B1;
|
||||
border-color: #b1b1b1;
|
||||
background: #ffffff;
|
||||
}
|
||||
.ui-widget-header {
|
||||
background: #B1B1B1 !important;
|
||||
background: #b1b1b1 !important;
|
||||
color: #ffffff !important;
|
||||
}
|
||||
.ui-datepicker-calendar th {
|
||||
background-color: #3F3F3F;
|
||||
background-color: #3f3f3f;
|
||||
}
|
||||
.ui-dialog .ui-widget-header {
|
||||
background-color: #82b92e;
|
||||
|
|
@ -138,7 +142,7 @@
|
|||
.ui_tpicker_minute,
|
||||
.ui_tpicker_second,
|
||||
.ui-slider-handle {
|
||||
border: 1px solid #AAAAAA !important;
|
||||
border: 1px solid #aaaaaa !important;
|
||||
}
|
||||
.ui-timepicker-div dd {
|
||||
margin: 0px 15px 0px 15px;
|
||||
|
|
@ -147,7 +151,7 @@
|
|||
color: white;
|
||||
}
|
||||
.ui-datepicker-buttonpane button {
|
||||
border-color: #B1B1B1 !important;
|
||||
border-color: #b1b1b1 !important;
|
||||
}
|
||||
.ui-datepicker-buttonpane .ui-datepicker-current {
|
||||
margin-left: 0.2em !important;
|
||||
|
|
@ -184,29 +188,39 @@
|
|||
font-family: Verdana, Arial, sans-serif !important;
|
||||
}
|
||||
|
||||
a.ui-button:active, .ui-button:active,
|
||||
a.ui-button:active,
|
||||
.ui-button:active,
|
||||
.ui-button.ui-state-active:hover,
|
||||
.ui-state-focus .ui-widget-content,
|
||||
.ui-state-focus .ui-widget-header,
|
||||
.ui-state-focus .ui-button:hover, .ui-button:focus{
|
||||
.ui-state-focus .ui-button:hover,
|
||||
.ui-button:focus {
|
||||
background: transparent !important;
|
||||
border: none !important;
|
||||
}
|
||||
|
||||
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover{
|
||||
.ui-state-hover,
|
||||
.ui-widget-content .ui-state-hover,
|
||||
.ui-widget-header .ui-state-hover {
|
||||
border: 1px solid #999999 !important;
|
||||
border-bottom: 0 !important;
|
||||
background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x !important;
|
||||
background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
|
||||
repeat-x !important;
|
||||
}
|
||||
|
||||
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{
|
||||
.ui-state-active,
|
||||
.ui-widget-content .ui-state-active,
|
||||
.ui-widget-header .ui-state-active {
|
||||
border: 1px solid #aaaaaa !important;
|
||||
border-bottom: 0 !important;
|
||||
background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x !important;
|
||||
background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
|
||||
repeat-x !important;
|
||||
font-weight: normal !important;
|
||||
color: #212121 !important;
|
||||
}
|
||||
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited{
|
||||
.ui-state-active a,
|
||||
.ui-state-active a:link,
|
||||
.ui-state-active a:visited {
|
||||
color: #212121 !important;
|
||||
}
|
||||
|
||||
|
|
@ -236,8 +250,8 @@ ul.ui-front li a.ui-menu-item-wrapper:hover{
|
|||
text-decoration: none !important;
|
||||
}
|
||||
|
||||
input[type=submit].ui-button-dialog{
|
||||
margin: .5em 1em .5em 0 !important;
|
||||
input[type="submit"].ui-button-dialog {
|
||||
margin: 0.5em 1em 0.5em 0 !important;
|
||||
cursor: pointer !important;
|
||||
background: white !important;
|
||||
background-color: white !important;
|
||||
|
|
@ -247,8 +261,3 @@ input[type=submit].ui-button-dialog{
|
|||
height: 30px !important;
|
||||
width: 90px !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
display: inline-block;
|
||||
position: absolute;
|
||||
list-style-type: none;
|
||||
border: 1px solid #DDD;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
background: #EEE;
|
||||
background: #eee;
|
||||
|
||||
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
.context-menu-item {
|
||||
padding: 0px 2px 0px 24px;
|
||||
background-color: #EEE;
|
||||
background-color: #eee;
|
||||
position: relative;
|
||||
border-radius: 4px;
|
||||
-webkit-user-select: none;
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
.context-menu-separator {
|
||||
padding-bottom: 0;
|
||||
border-bottom: 1px solid #DDD;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.context-menu-item > label > input,
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
.context-menu-input.hover,
|
||||
.context-menu-item.disabled.hover {
|
||||
cursor: default;
|
||||
background-color: #EEE;
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.context-menu-submenu:after {
|
||||
|
|
@ -101,29 +101,73 @@
|
|||
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
|
||||
.context-menu-item.icon:before {}
|
||||
*/
|
||||
.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
|
||||
.context-menu-item.icon-edit { background-image: url(../../images/page_white_edit.png); }
|
||||
.context-menu-item.icon-cut { background-image: url(../../images/cut.png); }
|
||||
.context-menu-item.icon-copy { background-image: url(../../images/page_white_copy.png); }
|
||||
.context-menu-item.icon-paste { background-image: url(../../images/page_white_paste.png); }
|
||||
.context-menu-item.icon-delete { background-image: url(../../images/delete.png); }
|
||||
.context-menu-item.icon-add { background-image: url(../../images/page_white_add.png); }
|
||||
.context-menu-item.icon-quit { background-image: url(../../images/door.png); }
|
||||
.context-menu-item.icon-refresh { background-image: url(../../images/refresh.png); }
|
||||
.context-menu-item.icon-center { background-image: url(../../images/set_center.png); }
|
||||
.context-menu-item.icon-details { background-image: url(../../images/show_details.png); }
|
||||
.context-menu-item.icon-children { background-image: url(../../images/children.png); }
|
||||
.context-menu-item.icon-cancel_set_parent { background-image: url(../../images/link_delete.png); }
|
||||
.context-menu-item.icon-set_parent { background-image: url(../../images/father.png); }
|
||||
.context-menu-item.icon-add_node { background-image: url(../../images/add.png); }
|
||||
.context-menu-item.icon-refresh_holding_area { background-image: url(../../images/refresh_holding_area.png); }
|
||||
.context-menu-item.icon-restart_map { background-image: url(../../images/reset.png); }
|
||||
.context-menu-item.icon-interface_link_children { background-image: url(../../images/icono_link_hijo.png); }
|
||||
.context-menu-item.icon-interface_link_parent { background-image: url(../../images/icono_link_padre.png); }
|
||||
.context-menu-item.icon-interface_link_cancel { background-image: url(../../images/link_abortar.png); }
|
||||
.context-menu-item.icon {
|
||||
min-height: 18px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 4px 2px;
|
||||
}
|
||||
.context-menu-item.icon-edit {
|
||||
background-image: url(../../images/page_white_edit.png);
|
||||
}
|
||||
.context-menu-item.icon-cut {
|
||||
background-image: url(../../images/cut.png);
|
||||
}
|
||||
.context-menu-item.icon-copy {
|
||||
background-image: url(../../images/page_white_copy.png);
|
||||
}
|
||||
.context-menu-item.icon-paste {
|
||||
background-image: url(../../images/page_white_paste.png);
|
||||
}
|
||||
.context-menu-item.icon-delete {
|
||||
background-image: url(../../images/delete.png);
|
||||
}
|
||||
.context-menu-item.icon-add {
|
||||
background-image: url(../../images/page_white_add.png);
|
||||
}
|
||||
.context-menu-item.icon-quit {
|
||||
background-image: url(../../images/door.png);
|
||||
}
|
||||
.context-menu-item.icon-refresh {
|
||||
background-image: url(../../images/refresh.png);
|
||||
}
|
||||
.context-menu-item.icon-center {
|
||||
background-image: url(../../images/set_center.png);
|
||||
}
|
||||
.context-menu-item.icon-details {
|
||||
background-image: url(../../images/show_details.png);
|
||||
}
|
||||
.context-menu-item.icon-children {
|
||||
background-image: url(../../images/children.png);
|
||||
}
|
||||
.context-menu-item.icon-cancel_set_parent {
|
||||
background-image: url(../../images/link_delete.png);
|
||||
}
|
||||
.context-menu-item.icon-set_parent {
|
||||
background-image: url(../../images/father.png);
|
||||
}
|
||||
.context-menu-item.icon-add_node {
|
||||
background-image: url(../../images/add.png);
|
||||
}
|
||||
.context-menu-item.icon-refresh_holding_area {
|
||||
background-image: url(../../images/refresh_holding_area.png);
|
||||
}
|
||||
.context-menu-item.icon-restart_map {
|
||||
background-image: url(../../images/reset.png);
|
||||
}
|
||||
.context-menu-item.icon-interface_link_children {
|
||||
background-image: url(../../images/icono_link_hijo.png);
|
||||
}
|
||||
.context-menu-item.icon-interface_link_parent {
|
||||
background-image: url(../../images/icono_link_padre.png);
|
||||
}
|
||||
.context-menu-item.icon-interface_link_cancel {
|
||||
background-image: url(../../images/link_abortar.png);
|
||||
}
|
||||
|
||||
/* vertically align inside labels */
|
||||
.context-menu-input > label > * { vertical-align: top; }
|
||||
.context-menu-input > label > * {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
/* position checkboxes and radios as icons */
|
||||
.context-menu-input > label > input[type="checkbox"],
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
h1#log_title {
|
||||
font-size: 18px;
|
||||
margin-bottom: 0px;
|
||||
color: #FFF !important;
|
||||
color: #fff !important;
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ div#error_buttons a{
|
|||
}*/
|
||||
|
||||
p.log_in {
|
||||
color: #FFF !important;
|
||||
color: #fff !important;
|
||||
padding: 0px 10px;
|
||||
width: 300px;
|
||||
}
|
||||
|
|
@ -104,13 +104,10 @@ div#login_f {
|
|||
width: 100%;
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
color: #FFF;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------------
|
||||
* - LOGIN PAGE -
|
||||
|
|
@ -189,7 +186,7 @@ div.login_pass {
|
|||
margin: 0 auto;
|
||||
width: 70%;
|
||||
height: 40px;
|
||||
background-color: rgba(255, 255, 255, 0.20) !important;
|
||||
background-color: rgba(255, 255, 255, 0.2) !important;
|
||||
margin-bottom: 25px;
|
||||
min-width: 260px;
|
||||
}
|
||||
|
|
@ -202,7 +199,7 @@ div.login_pass img{
|
|||
|
||||
div.login_nick input,
|
||||
div.login_pass input {
|
||||
background-color: rgba(255, 255, 255, 0.00) !important;
|
||||
background-color: rgba(255, 255, 255, 0) !important;
|
||||
border: 0px !important;
|
||||
color: white !important;
|
||||
border-radius: 0px;
|
||||
|
|
@ -288,13 +285,13 @@ div.text_banner_login span{
|
|||
|
||||
span.span1 {
|
||||
font-size: 3vw;
|
||||
font-family: 'lato-thin';
|
||||
font-family: "lato-thin";
|
||||
color: white;
|
||||
}
|
||||
|
||||
span.span2 {
|
||||
font-size: 3vw;
|
||||
font-family: 'lato-bolder';
|
||||
font-family: "lato-bolder";
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
|
@ -319,7 +316,6 @@ div.img_banner_login img{
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* --- Login page - modal windows --- */
|
||||
div.content_alert {
|
||||
width: 98%;
|
||||
|
|
@ -330,7 +326,6 @@ div.icon_message_alert{
|
|||
float: left;
|
||||
width: 25%;
|
||||
text-align: center;
|
||||
|
||||
}
|
||||
|
||||
div.icon_message_alert img {
|
||||
|
|
@ -338,7 +333,6 @@ div.icon_message_alert img{
|
|||
}
|
||||
|
||||
div.content_message_alert {
|
||||
|
||||
width: 75%;
|
||||
float: right;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
}
|
||||
|
||||
.menu li a {
|
||||
color: #FFFFFF;
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
|
@ -258,8 +258,6 @@ ul li a:hover {
|
|||
} /* Hover Styles */
|
||||
/*li ul li a { padding: 2px 5px; } Sub Menu Styles */
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------------
|
||||
* - MAIN LEFT MENU and SUBMENU -
|
||||
|
|
@ -346,7 +344,7 @@ ul li a:hover {
|
|||
}
|
||||
|
||||
.menu li.selected {
|
||||
box-shadow: inset 4px 0 #80BA27;
|
||||
box-shadow: inset 4px 0 #80ba27;
|
||||
}
|
||||
/* creo que no se usan
|
||||
.is_submenu2 li {
|
||||
|
|
@ -368,7 +366,8 @@ ul li a:hover {
|
|||
background-color: #585858 !important;
|
||||
}
|
||||
|
||||
.menu li, .menu .li.not_selected {
|
||||
.menu li,
|
||||
.menu .li.not_selected {
|
||||
border-radius: 0px 0px 0px 0px;
|
||||
display: block;
|
||||
min-height: 35px;
|
||||
|
|
@ -376,7 +375,8 @@ ul li a:hover {
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.godmode, .menu_icon ul li{
|
||||
.godmode,
|
||||
.menu_icon ul li {
|
||||
background-color: #222;
|
||||
}
|
||||
.operation .menu_icon ul li {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -11,7 +11,6 @@
|
|||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
ui_require_css_file('tree');
|
||||
ui_require_css_file('fixed-bottom-box');
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue