From 2a1aa27dda2dcca6eb608444f30fe8ad37c5c3e1 Mon Sep 17 00:00:00 2001 From: jerome Date: Fri, 11 Apr 2014 21:42:57 +0200 Subject: [PATCH 01/73] Clip history page for mobiles Add shadows to tabs --- src/templates/main.tpl.html | 2 +- static/css/history.css | 4 ++++ static/css/style.css | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html index 85f556bf..b1aab84e 100755 --- a/src/templates/main.tpl.html +++ b/src/templates/main.tpl.html @@ -44,7 +44,7 @@ -
+

{subtitle}

diff --git a/static/css/history.css b/static/css/history.css index 51718506..fa9a9dfc 100644 --- a/static/css/history.css +++ b/static/css/history.css @@ -1,3 +1,7 @@ +#main-container { + overflow: hidden; +} + #history-panel { width: 100%; max-width: 1100px; diff --git a/static/css/style.css b/static/css/style.css index bbcb3b6c..c97cea19 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -40,12 +40,17 @@ body { padding-bottom: 0; } .nav-tabs { + position: relative; + top: 1px; margin-left: 10px; margin-bottom: 0; border: 0; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { - background-color: whiteSmoke; + background-color: #f5f5f5; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } .nav-tabs > li > a, .nav-tabs > li > a:hover { padding: 8px 8px; From 526ae52d650a1a9b0544c32c83e39895ea332f66 Mon Sep 17 00:00:00 2001 From: jerome Date: Sat, 12 Apr 2014 13:41:32 +0200 Subject: [PATCH 02/73] Reduction of some table header size. Changing the barside, forcing its width to avoid button titles line wrap adding 'well' style to log page tab panes. --- src/lang/bg_BG.lang.php | 2 + src/lang/de_DE.lang.php | 2 + src/lang/en_US.lang.php | 2 + src/lang/fr_FR.lang.php | 2 + src/lang/ko_KR.lang.php | 2 + src/lang/nl_NL.lang.php | 2 + src/lang/pt_BR.lang.php | 2 + src/lang/zh_CN.lang.php | 2 + .../Controller/ServerController.class.php | 2 + src/templates/main.tpl.html | 28 ++++++------ src/templates/main_sidebar.tpl.html | 2 +- src/templates/server/log.tpl.html | 2 +- src/templates/server/server.tpl.html | 6 +-- static/css/style.css | 45 ++++++++++++++++++- 14 files changed, 80 insertions(+), 21 deletions(-) diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 1d852f24..c4abba26 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Последна проверка', 'last_online' => 'Последно на линия', 'monitoring' => 'Мониторинг', + 'email' => 'Имейл', 'send_email' => 'Имейл', + 'sms' => 'SMS', 'send_sms' => 'SMS', 'updated' => 'Информацията за сървъра е обновена.', 'inserted' => 'Сървърът е добвен успешно.', diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index eb7e7599..ec92d86c 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Letzter Check', 'last_online' => 'Letztes mal Online', 'monitoring' => 'Monitoring', + 'email' => 'Email', 'send_email' => 'Email', + 'sms' => 'SMS', 'send_sms' => 'SMS', 'updated' => 'Server aktualisiert.', 'inserted' => 'Server eingetragen.', diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 36ae7d25..972d9b80 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Last check', 'last_online' => 'Last online', 'monitoring' => 'Monitoring', + 'email' => 'Email', 'send_email' => 'Send Email', + 'sms' => 'SMS', 'send_sms' => 'Send SMS', 'updated' => 'Server updated.', 'inserted' => 'Server added.', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index 719c5e19..e55871e6 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Dernière vérification', 'last_online' => 'Dernière fois OK', 'monitoring' => 'Serveillé', + 'email' => 'Email', 'send_email' => 'Envoyer un email', + 'sms' => 'SMS', 'send_sms' => 'Envoyer un SMS', 'updated' => 'Serveur mis à jour.', 'inserted' => 'Serveur ajouté.', diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index e56223bf..8a959f12 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => '최근체크', 'last_online' => '최근접속', 'monitoring' => '확인중', + 'email' => '메일 전송', 'send_email' => '메일 전송', + 'sms' => 'SMS 전송', 'send_sms' => 'SMS 전송', 'updated' => '서버가 수정되었습니다.', 'inserted' => '서버가 추가되었습니다.', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index 846db258..27655101 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Laatst gecontroleerd', 'last_online' => 'Laatst online', 'monitoring' => 'Monitoring', + 'email' => 'Email', 'send_email' => 'Stuur email', + 'sms' => 'SMS', 'send_sms' => 'Stuur SMS', 'updated' => 'Server gewijzigd.', 'inserted' => 'Server toegevoegd.', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index c625f524..645a6cc1 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => 'Última verificação', 'last_online' => 'Última vez online', 'monitoring' => 'Monitoramento', + 'email' => 'Email', 'send_email' => 'Enviar Email', + 'sms' => 'SMS', 'send_sms' => 'Enviar SMS', 'updated' => 'Servidor atualizado.', 'inserted' => 'Servidor adicionar.', diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index b37e2f79..86a109bd 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -115,7 +115,9 @@ $sm_lang = array( 'last_check' => '最后检查', 'last_online' => '最后在线', 'monitoring' => '监控中', + 'email' => '邮件', 'send_email' => '发送邮件', + 'sms' => '短信', 'send_sms' => '发送短信', 'updated' => '服务器已更新.', 'inserted' => '服务器已添加.', diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index ead0cf84..ef7fc2d7 100644 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -310,7 +310,9 @@ class ServerController extends AbstractServerController { 'label_rtime' => psm_get_lang('servers', 'latency'), 'label_last_online' => psm_get_lang('servers', 'last_online'), 'label_monitoring' => psm_get_lang('servers', 'monitoring'), + 'label_email' => psm_get_lang('servers', 'email'), 'label_send_email' => psm_get_lang('servers', 'send_email'), + 'label_sms' => psm_get_lang('servers', 'sms'), 'label_send_sms' => psm_get_lang('servers', 'send_sms'), 'label_warning_threshold' => psm_get_lang('servers', 'warning_threshold'), 'label_warning_threshold_description' => psm_get_lang('servers', 'warning_threshold_description'), diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html index b1aab84e..46bb40b3 100755 --- a/src/templates/main.tpl.html +++ b/src/templates/main.tpl.html @@ -44,27 +44,27 @@ -
-
-

{subtitle}

-
-
+
+
+

{subtitle}

+
+
{html_sidebar} -
+
- -
-

-

{message}

-
- - {messages} + +
+

+

{message}

+
+ + {messages}
{content}
{html_footer} -
+
diff --git a/src/templates/main_sidebar.tpl.html b/src/templates/main_sidebar.tpl.html index c5defbc5..db5b8f07 100755 --- a/src/templates/main_sidebar.tpl.html +++ b/src/templates/main_sidebar.tpl.html @@ -1,5 +1,5 @@ -
+