diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 53a30856..1d852f24 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -141,8 +141,8 @@ $sm_lang = array( 'config' => array( 'general' => 'Основни настройки', 'language' => 'Език', - 'show_update' => 'Да проверява ли за нова версия всяка седмица?', - 'email_status' => 'Да се изпращат ли имейли?', + 'show_update' => 'Да проверява ли за нова версия всяка седмица', + 'email_status' => 'Да се изпращат ли имейли', 'email_from_email' => 'Имейл, от който да се изпращат съобщенията', 'email_from_name' => 'Име на изпращача', 'email_smtp' => 'Активиране на SMTP', @@ -151,7 +151,7 @@ $sm_lang = array( 'email_smtp_username' => 'SMTP потребителско име', 'email_smtp_password' => 'SMTP парола', 'email_smtp_noauth' => 'Оставете празно за "без аутентикация"', - 'sms_status' => 'Да се изпращат ли SMS-и?', + 'sms_status' => 'Да се изпращат ли SMS-и', 'sms_gateway' => 'Портал за изпращане на SMS-и', 'sms_gateway_mosms' => 'Mosms', 'sms_gateway_mollie' => 'Mollie', @@ -175,9 +175,10 @@ $sm_lang = array( 'alert_type_status' => 'Промяна на статуса', 'alert_type_offline' => 'Офлайн', 'alert_type_always' => 'Винаги', - 'log_status' => 'Статус на логовете
Ако е отметнато, системата ще записва всяка промяна:
', - 'log_email' => 'Да се пази ли лог на изпратените имейли от системата?', - 'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата?', + 'log_status' => 'Статус на логовете', + 'log_status_description' => 'Ако е отметнато, системата ще записва всяка промяна.', + 'log_email' => 'Да се пази ли лог на изпратените имейли от системата', + 'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата', 'updated' => 'Настройките са обновени успешно.', 'tab_email' => 'Имейл', 'tab_sms' => 'SMS', @@ -186,11 +187,13 @@ $sm_lang = array( 'settings_sms' => 'SMS настройки', 'settings_notification' => 'Настройки на известията', 'settings_log' => 'Настройки на логовете', + 'auto_refresh' => 'Автоматично опресняване', 'auto_refresh_servers' => - 'Автоматично опресняване на страницата
'. - '
'. + 'Автоматично опресняване на страницата.
'. + ''. 'Времето е в секунди, ако е 0 страницата няма да се обноява.'. - '
', + '', + 'seconds' => 'seconds', ), // За нов ред в имейл съобщението, моля използвайте тага
'notifications' => array( diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index aadb1843..eb7e7599 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -175,7 +175,8 @@ $sm_lang = array( 'alert_type_status' => 'Status geändert', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Immer', - 'log_status' => 'Log Status
Ist der Log Status auf TRUE (ein Hacken) gesetzt, wird jeder Status protokolliert
', + 'log_status' => 'Log Status', + 'log_status_description' => 'Ist der Log Status auf TRUE (ein Hacken) gesetzt, wird jeder Status protokolliert.', 'log_email' => 'Email Log per Script senden?', 'log_sms' => 'SMS Log per Script senden?', 'updated' => 'Die Einstellungen wurden gespeichert.', @@ -186,11 +187,13 @@ $sm_lang = array( 'settings_sms' => 'SMS Nachricht', 'settings_notification' => 'Benachrichtigung', 'settings_log' => 'Log', + 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => 'Auto-refresh servers page
'. - '
'. + ''. 'Time in seconds, if 0 the page won\'t refresh.'. - '
', + '', + 'seconds' => 'seconds', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index ce8e14f1..36ae7d25 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -151,7 +151,7 @@ $sm_lang = array( 'email_smtp_username' => 'SMTP username', 'email_smtp_password' => 'SMTP password', 'email_smtp_noauth' => 'Leave blank for no authentication', - 'sms_status' => 'Allow sending text messages?', + 'sms_status' => 'Allow sending text messages', 'sms_gateway' => 'Gateway to use for sending messages', 'sms_gateway_mosms' => 'Mosms', 'sms_gateway_mollie' => 'Mollie', @@ -175,9 +175,10 @@ $sm_lang = array( 'alert_type_status' => 'Status change', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Always', - 'log_status' => 'Log status
If log status is set to TRUE, the monitor will log the event whenever the Notification settings are passed
', - 'log_email' => 'Log emails sent by the script?', - 'log_sms' => 'Log text messages sent by the script?', + 'log_status' => 'Log status', + 'log_status_description' => 'If log status is set to TRUE, the monitor will log the event whenever the Notification settings are passed.', + 'log_email' => 'Log emails sent by the script', + 'log_sms' => 'Log text messages sent by the script', 'updated' => 'The configuration has been updated.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', @@ -186,11 +187,13 @@ $sm_lang = array( 'settings_sms' => 'Text message settings', 'settings_notification' => 'Notification settings', 'settings_log' => 'Log settings', + 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => - 'Auto-refresh servers page
'. - '
'. + 'Auto-refresh servers page.
'. + ''. 'Time in seconds, if 0 the page won\'t refresh.'. - '
', + '', + 'seconds' => 'seconds', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index d0277e97..719c5e19 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -174,7 +174,8 @@ $sm_lang = array( 'alert_type_status' => 'Changement d\'état', 'alert_type_offline' => 'Hors service', 'alert_type_always' => 'Toujours', - 'log_status' => 'Etat des événements
Si l\'option est activée, un événement est enregistré chaque fois qu\'une notification a lieu
', + 'log_status' => 'Etat des événements', + 'log_status_description' => 'Si l\'option est activée, un événement est enregistré chaque fois qu\'une notification a lieu.', 'log_email' => 'Enregistrer tout les emails envoyés', 'log_sms' => 'Enregistrer tout les SMS envoyés', 'updated' => 'La configuration a été mise à jour.', @@ -185,11 +186,13 @@ $sm_lang = array( 'settings_sms' => 'Configuration SMS', 'settings_notification' => 'Configuration des notifications', 'settings_log' => 'Configuration des événements', + 'auto_refresh' => 'Auto-rachaîchissement', 'auto_refresh_servers' => - 'Auto-rachaîchissement de la page serveurs
'. - '
'. + 'Auto-rachaîchissement de la page serveurs.
'. + ''. 'Temps en secondes. Si 0, la page n\'est pas rafraîchie.'. - '
', + '', + 'seconds' => 'secondes', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index 59cbd498..e56223bf 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -173,7 +173,8 @@ $sm_lang = array( 'alert_type_status' => '상태 변경', 'alert_type_offline' => '오프라인', 'alert_type_always' => '항상', - 'log_status' => '로그 상태
로그상태가 TRUE이면 알림설정이 통과할때마다 이벤트를 기록합니다.
', + 'log_status' => '로그 상태', + 'log_status_description' => '로그상태가 TRUE이면 알림설정이 통과할때마다 이벤트를 기록합니다.', 'log_email' => '이메일로 로그를 전송하시겠습니까?', 'log_sms' => 'SMS로 로그를 전송하시겠습니까?', 'updated' => '설정이 수정되었습니다.', @@ -184,11 +185,13 @@ $sm_lang = array( 'settings_sms' => 'SMS 설정', 'settings_notification' => '알림 설정', 'settings_log' => '로그 설정', + 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => - '서버페이지를 자동으로 새로고침
'. - '
'. + '서버페이지를 자동으로 새로고침.
'. + ''. '시간은 초(sec)로 설정을 하고, 0은 새로고침을 하지 않습니다.'. - '
', + '', + 'seconds' => 'seconds', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index b2b082c7..e5b83b7a 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -174,7 +174,8 @@ $sm_lang = array( 'alert_type_status' => 'Status verandering', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Altijd', - 'log_status' => 'Log status
Als de log status op TRUE staat, zal de monitor een log aanmaken elke keer dat hij door de notificatie instellingen komt
', + 'log_status' => 'Log status', + 'log_status_description' => 'Als de log status op TRUE staat, zal de monitor een log aanmaken elke keer dat hij door de notificatie instellingen komt.', 'log_email' => 'Log emails verstuurd bij het script?', 'log_sms' => 'Log sms berichten verstuurd bij het script?', 'updated' => 'De configuratie is gewijzigd.', @@ -185,11 +186,13 @@ $sm_lang = array( 'settings_sms' => 'SMS instellingen', 'settings_notification' => 'Notificatie instellingen', 'settings_log' => 'Log instellingen', + 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => - 'Auto-refresh servers pagina
'. - '
'. + 'Auto-refresh servers pagina.
'. + ''. 'Tijd in seconden, als de tijd 0 is wordt de pagina niet ververst.'. - '
', + '', + 'seconds' => 'seconds', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index 7097b90a..c625f524 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -175,7 +175,8 @@ $sm_lang = array( 'alert_type_status' => 'Mudança de Status', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Sempre', - 'log_status' => 'Log status
Se o status de registro é definido como TRUE, o monitor irá registrar o evento sempre que as configurações de notificação forem passadas
', + 'log_status' => 'Log status', + 'log_status_description' => 'Se o status de registro é definido como TRUE, o monitor irá registrar o evento sempre que as configurações de notificação forem passadas.', 'log_email' => 'Registrar no Log os envios de email feitos pelo script?', 'log_sms' => 'Registrar no Log os envios de mensagens de texto feitos pelo script?', 'updated' => 'A configuração foi atualizada.', @@ -186,11 +187,13 @@ $sm_lang = array( 'settings_sms' => 'Configuração de mensagens de texto', 'settings_notification' => 'Configuração de notificações', 'settings_log' => 'Configuração de Logs', + 'auto_refresh' => 'Atualizar automaticamente', 'auto_refresh_servers' => - 'Atualizar automaticamente a página de servidores
'. - '
'. + 'Atualizar automaticamente a página de servidores.
'. + ''. 'Tempo em segundos, Se 0 a página não será atualizada.'. - '
', + '', + 'seconds' => 'segundos', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index ccbfdbcf..eaababcb 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -174,7 +174,8 @@ $sm_lang = array( 'alert_type_status' => '状态变化', 'alert_type_offline' => '离线状态', 'alert_type_always' => '总是提醒', - 'log_status' => '状态记录
如果状态记录设置为开, 提醒发送时均会保存记录.
', + 'log_status' => '状态记录', + 'log_status_description' => '如果状态记录设置为开, 提醒发送时均会保存记录.', 'log_email' => '记录脚本所发邮件?', 'log_sms' => '记录脚本所发短信SMS?', 'updated' => '设置已更新.', @@ -185,11 +186,13 @@ $sm_lang = array( 'settings_sms' => '短信发送设置', 'settings_notification' => '提醒设置', 'settings_log' => '日志设置', + 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => - '自动刷新服务器页
'. - '
'. + '自动刷新服务器页.
'. + ''. '单位为秒, 设置为0则不自动刷新.'. - '
', + '', + 'seconds' => 'seconds', ), // for newlines in the email messages use
'notifications' => array( diff --git a/src/psm/Module/Config/Controller/ConfigController.class.php b/src/psm/Module/Config/Controller/ConfigController.class.php index 79fb00d4..34544cc2 100644 --- a/src/psm/Module/Config/Controller/ConfigController.class.php +++ b/src/psm/Module/Config/Controller/ConfigController.class.php @@ -216,9 +216,12 @@ class ConfigController extends AbstractController { 'label_alert_type_offline' => psm_get_lang('config', 'alert_type_offline'), 'label_alert_type_always' => psm_get_lang('config', 'alert_type_always'), 'label_log_status' => psm_get_lang('config', 'log_status'), + 'label_log_status_description' => psm_get_lang('config', 'log_status_description'), 'label_log_email' => psm_get_lang('config', 'log_email'), 'label_log_sms' => psm_get_lang('config', 'log_sms'), + 'label_auto_refresh' => psm_get_lang('config', 'auto_refresh'), 'label_auto_refresh_servers' => psm_get_lang('config', 'auto_refresh_servers'), + 'label_seconds' => psm_get_lang('config', 'seconds'), 'label_save' => psm_get_lang('system', 'save'), ) ); diff --git a/src/templates/config/config.tpl.html b/src/templates/config/config.tpl.html index d31494d1..556411d2 100755 --- a/src/templates/config/config.tpl.html +++ b/src/templates/config/config.tpl.html @@ -27,9 +27,10 @@
- +
-  seconds +  {label_seconds} +

{label_auto_refresh_servers}

{label_settings_notification} @@ -41,9 +42,7 @@ -

- {label_alert_type_description} -

+

{label_alert_type_description}

@@ -80,7 +79,7 @@
- +
@@ -149,6 +148,7 @@ {label_settings_log}
+

{label_log_status_description}

diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html index 4d7c1533..85f556bf 100755 --- a/src/templates/main.tpl.html +++ b/src/templates/main.tpl.html @@ -105,6 +105,6 @@ diff --git a/src/templates/server/status.tpl.html b/src/templates/server/status.tpl.html index 69627280..07d44b73 100755 --- a/src/templates/server/status.tpl.html +++ b/src/templates/server/status.tpl.html @@ -17,46 +17,10 @@ margin-bottom: 10px; } - .offline, .online { - width: 100%; - } - - .entity-container { - float: left; - width: 100%; - max-width: 320px; - } - - .entity { - padding: 10px; - box-shadow: 0px 0px 5px #666; - border-radius: 3px; - margin-right: 20px; - margin-bottom: 20px; - cursor: pointer; - } - - .offline .entity { - background: {offline_bg}; - color: {offline_fg}; - border: 2px solid {offline_fg}; - } - - .offline .entity.warning { - background: {warning_bg}; - color: {warning_fg}; - border: 2px solid {warning_fg}; - } - - .online .entity { - background: {online_bg}; - color: {online_fg}; - border: 2px solid {online_fg}; - } -
+
-
+

{label}

{label_last_online}: {last_online_nice}

@@ -65,10 +29,8 @@
{servers_offline} -
-
-
+

{label}

{label_last_online}: {last_checked_nice}

diff --git a/static/css/style.css b/static/css/style.css index 5ebfc315..bbcb3b6c 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -28,16 +28,25 @@ body { background-color: #444; } +.powered { + display: inline-block; + white-space: nowrap; +} + +.tab-content { + display: block; + width: auto; + padding-top: 10px; + padding-bottom: 0; +} .nav-tabs { margin-left: 10px; margin-bottom: 0; border: 0; } - .nav-tabs > .active > a, .nav-tabs > .active > a:hover { background-color: whiteSmoke; } - .nav-tabs > li > a, .nav-tabs > li > a:hover { padding: 8px 8px; } @@ -45,18 +54,54 @@ body { legend { margin-bottom: 0px; } - .form-horizontal .control-label { width: 180px; } - .form-horizontal .controls { margin-left: 190px; } - .form-horizontal .form-actions { padding-left: 190px; + margin-bottom: 0; } +.form-horizontal label { + font-weight: bold; +} +.help-block { + font-style: italic; + color: #666; +} + +.offline, .online { + display: inline-block; + width: 100%; + max-width: 320px; +} +.entity { + text-align: left; + padding: 10px; + box-shadow: 0px 0px 5px #666; + border-radius: 3px; + margin-right: 20px; + margin-bottom: 20px; + cursor: pointer; +} +.offline .entity { + background: #a00000; + color: #f7cece; + border: 2px solid #f7cece; +} +.offline .entity.warning { + background: #FAA732; + color: #F3F3B1; + border: 2px solid #F3F3B1; +} +.online .entity { + background: #53a000; + color: #d8f7ce; + border: 2px solid #d8f7ce; +} + @media (min-width: 980px) { .hidden-desktop { @@ -81,6 +126,10 @@ legend { .visible-desktop { display: none !important; } + .tab-content { + padding-left: 10px; + padding-right: 10px; + } } @media (max-width: 479px) { @@ -93,6 +142,14 @@ legend { } .form-horizontal .form-actions { padding-left: 10px; + text-align: center; + } + + .entity-container { + text-align: center; + } + .entity { + margin: 0 10px 20px 10px; } }