diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php
index c4abba26..82735d10 100644
--- a/src/lang/bg_BG.lang.php
+++ b/src/lang/bg_BG.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Последна проверка',
'last_online' => 'Последно на линия',
'monitoring' => 'Мониторинг',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Имейл',
'send_email' => 'Имейл',
'sms' => 'SMS',
diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php
index ec92d86c..803c4b9b 100644
--- a/src/lang/de_DE.lang.php
+++ b/src/lang/de_DE.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Letzter Check',
'last_online' => 'Letztes mal Online',
'monitoring' => 'Monitoring',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Email',
'sms' => 'SMS',
diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php
index 972d9b80..f3b80dd3 100644
--- a/src/lang/en_US.lang.php
+++ b/src/lang/en_US.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Last check',
'last_online' => 'Last online',
'monitoring' => 'Monitoring',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Send Email',
'sms' => 'SMS',
diff --git a/src/lang/es_ES.lang.php b/src/lang/es_ES.lang.php
index 12db4b03..7a6f3ce9 100644
--- a/src/lang/es_ES.lang.php
+++ b/src/lang/es_ES.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Ultima verificación',
'last_online' => 'Última vez en línea',
'monitoring' => 'Monitoreo',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Email',
'sms' => 'SMS',
diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php
index e55871e6..7a4cfb76 100644
--- a/src/lang/fr_FR.lang.php
+++ b/src/lang/fr_FR.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Dernière vérification',
'last_online' => 'Dernière fois OK',
'monitoring' => 'Serveillé',
+ 'no_monitoring' => 'Non serveillé',
'email' => 'Email',
'send_email' => 'Envoyer un email',
'sms' => 'SMS',
diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php
index 4984e7d1..0e0edd32 100644
--- a/src/lang/it_IT.lang.php
+++ b/src/lang/it_IT.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Ultimo Controllo',
'last_online' => 'Ultima volta Online',
'monitoring' => 'Sotto Controllo',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Invia Email',
'sms' => 'SMS',
diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php
index 8a959f12..028ffea2 100644
--- a/src/lang/ko_KR.lang.php
+++ b/src/lang/ko_KR.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => '최근체크',
'last_online' => '최근접속',
'monitoring' => '확인중',
+ 'no_monitoring' => 'No monitoring',
'email' => '메일 전송',
'send_email' => '메일 전송',
'sms' => 'SMS 전송',
diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php
index 27655101..4a04d936 100644
--- a/src/lang/nl_NL.lang.php
+++ b/src/lang/nl_NL.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Laatst gecontroleerd',
'last_online' => 'Laatst online',
'monitoring' => 'Monitoring',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Stuur email',
'sms' => 'SMS',
diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php
index 645a6cc1..11de27ad 100644
--- a/src/lang/pt_BR.lang.php
+++ b/src/lang/pt_BR.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => 'Última verificação',
'last_online' => 'Última vez online',
'monitoring' => 'Monitoramento',
+ 'no_monitoring' => 'No monitoring',
'email' => 'Email',
'send_email' => 'Enviar Email',
'sms' => 'SMS',
diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php
index 86a109bd..1d5fcafe 100644
--- a/src/lang/zh_CN.lang.php
+++ b/src/lang/zh_CN.lang.php
@@ -115,6 +115,7 @@ $sm_lang = array(
'last_check' => '最后检查',
'last_online' => '最后在线',
'monitoring' => '监控中',
+ 'no_monitoring' => 'No monitoring',
'email' => '邮件',
'send_email' => '发送邮件',
'sms' => '短信',
diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php
index ef7fc2d7..4be4706a 100644
--- a/src/psm/Module/Server/Controller/ServerController.class.php
+++ b/src/psm/Module/Server/Controller/ServerController.class.php
@@ -99,9 +99,24 @@ class ServerController extends AbstractServerController {
$servers[$x]['class'] = ($x & 1) ? 'odd' : 'even';
if($servers[$x]['type'] == 'website') {
+ $servers[$x]['type_icon'] = 'icon-globe';
// add link to label
- $servers[$x]['ip'] = ''.$servers[$x]['ip'].'';
+ $servers[$x]['ip'] = ''.$servers[$x]['ip'].'';
+ } else {
+ $servers[$x]['type_icon'] = 'icon-cog';
}
+ if(($servers[$x]['active'] == 'yes')) {
+ $servers[$x]['active_icon'] = 'icon-eye-open';
+ $servers[$x]['active_title'] = psm_get_lang('servers', 'monitoring');
+ $servers[$x]['email_icon'] = ($servers[$x]['email'] == 'yes') ? 'icon-envelope' : '';
+ $servers[$x]['sms_icon'] = ($servers[$x]['sms'] == 'yes') ? 'icon-mobile' : '';
+ } else {
+ $servers[$x]['active_icon'] = 'icon-eye-close';
+ $servers[$x]['active_title'] = psm_get_lang('servers', 'no_monitoring');
+ $servers[$x]['email_icon'] = '';
+ $servers[$x]['sms_icon'] = '';
+ }
+
$servers[$x] = $this->formatServer($servers[$x]);
}
// add servers to template
diff --git a/src/templates/server/server.tpl.html b/src/templates/server/server.tpl.html
index be500cba..a072c860 100755
--- a/src/templates/server/server.tpl.html
+++ b/src/templates/server/server.tpl.html
@@ -1,17 +1,17 @@
-
+
| |
{label_label} |
{label_domain} |
- {label_port} |
- {label_type} |
+ {label_port} |
+ {label_type} |
{label_rtime} |
{label_last_online} |
{label_monitoring} |
- {label_email} |
- {label_sms} |
+ {label_email} |
+ {label_sms} |
{label_action} |
@@ -23,16 +23,18 @@
{status}
- {label} |
- {ip} |
- {port} |
- {type} |
- {rtime} s |
- {last_online} |
- {active} |
- {email} |
- {sms} |
-
+ | {label} |
+ {ip} : {port} |
+ {ip} |
+ {port} |
+ {type} |
+ {rtime} s |
+ {last_online} |
+ |
+ {active} |
+ {email} |
+ {sms} |
+
{html_actions} |
diff --git a/static/css/style.css b/static/css/style.css
index 5d9f7bb4..ecfe925c 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -84,6 +84,19 @@ fieldset {
padding: 8px 8px;
}
+/* Tables */
+.table-align-middle td {
+ vertical-align: middle;
+}
+.col-action {
+ width: 20px;
+ white-space: nowrap;
+}
+.nowrap {
+ white-space: nowrap;
+}
+
+/* Form */
legend {
margin-top: 0px;
margin-bottom: 0px;
@@ -141,6 +154,9 @@ legend {
.hidden-desktop {
display: none !important;
}
+ td.visible-desktop, th.visible-desktop {
+ display: table-cell;
+ }
}
@media (max-width: 979px) {
@@ -166,6 +182,9 @@ legend {
.visible-desktop {
display: none !important;
}
+ td.hidden-desktop, th.hidden-desktop {
+ display: table-cell;
+ }
.tab-content {
padding-left: 10px;
padding-right: 10px;
@@ -272,8 +291,91 @@ legend{
background-color:#eee;
}
-/* Tables */
-.col-action {
- width: 20px;
- white-space: nowrap;
+/* Bootstrap 2.3.2 added icons */
+.icon-hdd {
+ background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+ background-position: -24px -144px;
+}
+
+.icon-bell {
+ background-position: -48px -144px;
+}
+
+.icon-certificate {
+ background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+ background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+ background-position: -120px -144px;
+}
+
+.icon-hand-right {
+ background-position: -144px -144px;
+}
+
+.icon-hand-left {
+ background-position: -168px -144px;
+}
+
+.icon-hand-up {
+ background-position: -192px -144px;
+}
+
+.icon-hand-down {
+ background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+ background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+ background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+ background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+ background-position: -312px -144px;
+}
+
+.icon-globe {
+ background-position: -336px -144px;
+}
+
+.icon-wrench {
+ background-position: -360px -144px;
+}
+
+.icon-tasks {
+ background-position: -384px -144px;
+}
+
+.icon-filter {
+ background-position: -408px -144px;
+}
+
+.icon-briefcase {
+ background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+ background-position: -456px -144px;
+}
+
+/* personal added icons */
+.icon-chart {
+ background-position: 0px -168px;
+}
+.icon-mobile {
+ background-position: -24px -168px;
}
\ No newline at end of file
diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png
old mode 100755
new mode 100644
index a20760bf..a09b8785
Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png differ
diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png
old mode 100755
new mode 100644
index 92d4445d..f14778e2
Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png differ
diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.psd b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.psd
new file mode 100644
index 00000000..1dad1dba
Binary files /dev/null and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.psd differ