Hide icon if it's globally disabled

Closes #858.
This commit is contained in:
TimZ99 2020-02-09 20:19:08 +01:00
parent 7ca93c40a6
commit 39be47d573
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 10 additions and 11 deletions

View File

@ -97,13 +97,6 @@ class ServerController extends AbstractServerController
psm_get_lang('menu', 'server_update')
);
$icons = array(
'email' => 'icon-envelope',
'sms' => 'icon-mobile',
'pushover' => 'icon-pushover',
'telegram' => 'icon-telegram',
);
$servers = $this->getServers();
$server_count = count($servers);
@ -126,6 +119,12 @@ class ServerController extends AbstractServerController
$servers[$x] = $this->formatServer($servers[$x]);
}
$tpl_data['servers'] = $servers;
$tpl_data['config']['email'] = psm_get_conf('email_status');
$tpl_data['config']['sms'] = psm_get_conf('sms_status');
$tpl_data['config']['pushover'] = psm_get_conf('pushover_status');
$tpl_data['config']['telegram'] = psm_get_conf('telegram_status');
return $this->twig->render('module/server/server/list.tpl.html', $tpl_data);
}

View File

@ -50,19 +50,19 @@
{% else %}
<i class="fas fa-eye-slash" title="{{ server.active_title }}"></i>
{% endif %}
{% if server.email|lower == 'yes'%}
{% if server.email|lower == 'yes' and config.email|lower%}
<i class="fas fa-envelope" title="{{ label_email }}"></i>
{% endif %}
{% if server.sms|lower == 'yes'%}
{% if server.sms|lower == 'yes' and config.sms|lower%}
<i class="fas fa-sms" title="{{ label_sms }}"></i>
{% endif %}
{% if server.pushover|lower == 'yes'%}
{% if server.pushover|lower == 'yes'and config.pushover|lower %}
<span class="fa-layers">
<i class="fas fa-circle" title="{{ label_pushover }}"></i>
<span class="fa-layers-text fa-inverse" style="font-weight:400; font-size:75%">P</span>
</span>
{% endif %}
{% if server.telegram|lower == 'yes'%}
{% if server.telegram|lower == 'yes' and config.telegram|lower%}
<span class="fa-layers">
<i class="fas fa-circle" title="{{ label_telegram }}"></i>
<span class="fa-layers-text fa-inverse" style="font-weight:400; font-size:75%">T</span>