From 046fd62878b05a2cc750b58c37d3183be2f6eaa6 Mon Sep 17 00:00:00 2001 From: jerome Date: Wed, 9 Apr 2014 02:19:09 +0200 Subject: [PATCH] Configuration page - mobile compatibility improvement. --- src/lang/bg_BG.lang.php | 3 ++ src/lang/de_DE.lang.php | 3 ++ src/lang/en_US.lang.php | 7 ++- src/lang/fr_FR.lang.php | 5 +- src/lang/ko_KR.lang.php | 3 ++ src/lang/nl_NL.lang.php | 3 ++ src/lang/pt_BR.lang.php | 3 ++ src/lang/zh_CN.lang.php | 3 ++ .../Controller/ConfigController.class.php | 3 ++ src/templates/config/config.tpl.html | 49 +++++++------------ static/css/style.css | 43 ++++++++++++++++ 11 files changed, 91 insertions(+), 34 deletions(-) diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 62aa1745..53a30856 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -179,6 +179,9 @@ $sm_lang = array( 'log_email' => 'Да се пази ли лог на изпратените имейли от системата?', 'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата?', 'updated' => 'Настройките са обновени успешно.', + 'tab_email' => 'Имейл', + 'tab_sms' => 'SMS', + 'tab_log' => 'логовете', 'settings_email' => 'Имейл настройки', 'settings_sms' => 'SMS настройки', 'settings_notification' => 'Настройки на известията', diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index 76525c8b..aadb1843 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -179,6 +179,9 @@ $sm_lang = array( 'log_email' => 'Email Log per Script senden?', 'log_sms' => 'SMS Log per Script senden?', 'updated' => 'Die Einstellungen wurden gespeichert.', + 'tab_email' => 'Email', + 'tab_sms' => 'SMS', + 'tab_log' => 'Log', 'settings_email' => 'Email', 'settings_sms' => 'SMS Nachricht', 'settings_notification' => 'Benachrichtigung', diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index a5d11fac..ce8e14f1 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -141,8 +141,8 @@ $sm_lang = array( 'config' => array( 'general' => 'General', 'language' => 'Language', - 'show_update' => 'Check for new updates weekly?', - 'email_status' => 'Allow sending email?', + 'show_update' => 'Updates', + 'email_status' => 'Allow sending email', 'email_from_email' => 'Email from address', 'email_from_name' => 'Email from name', 'email_smtp' => 'Enable SMTP', @@ -179,6 +179,9 @@ $sm_lang = array( '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', + 'tab_log' => 'Log', 'settings_email' => 'Email settings', 'settings_sms' => 'Text message settings', 'settings_notification' => 'Notification settings', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index 644d303f..d0277e97 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -176,8 +176,11 @@ $sm_lang = array( '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_email' => 'Enregistrer tout les emails envoyés', - 'log_sms' => 'Enregistrer tout les SMS envoyé', + 'log_sms' => 'Enregistrer tout les SMS envoyés', 'updated' => 'La configuration a été mise à jour.', + 'tab_email' => 'Email', + 'tab_sms' => 'SMS', + 'tab_log' => 'Événements', 'settings_email' => 'Configuration email', 'settings_sms' => 'Configuration SMS', 'settings_notification' => 'Configuration des notifications', diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index 19347ade..59cbd498 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -177,6 +177,9 @@ $sm_lang = array( 'log_email' => '이메일로 로그를 전송하시겠습니까?', 'log_sms' => 'SMS로 로그를 전송하시겠습니까?', 'updated' => '설정이 수정되었습니다.', + 'tab_email' => 'Email', + 'tab_sms' => 'SMS', + 'tab_log' => '로그', 'settings_email' => 'Email 설정', 'settings_sms' => 'SMS 설정', 'settings_notification' => '알림 설정', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index 6b4c288a..b2b082c7 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -178,6 +178,9 @@ $sm_lang = array( 'log_email' => 'Log emails verstuurd bij het script?', 'log_sms' => 'Log sms berichten verstuurd bij het script?', 'updated' => 'De configuratie is gewijzigd.', + 'tab_email' => 'Email', + 'tab_sms' => 'SMS', + 'tab_log' => 'Log', 'settings_email' => 'Email instellingen', 'settings_sms' => 'SMS instellingen', 'settings_notification' => 'Notificatie instellingen', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index 2a5e0ff5..7097b90a 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -179,6 +179,9 @@ $sm_lang = array( '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.', + 'tab_email' => 'Email', + 'tab_sms' => 'Texto', + 'tab_log' => 'Logs', 'settings_email' => 'Configuração de email', 'settings_sms' => 'Configuração de mensagens de texto', 'settings_notification' => 'Configuração de notificações', diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index 20e8dc32..ccbfdbcf 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -178,6 +178,9 @@ $sm_lang = array( 'log_email' => '记录脚本所发邮件?', 'log_sms' => '记录脚本所发短信SMS?', 'updated' => '设置已更新.', + 'tab_email' => '邮件发送设置', + 'tab_sms' => '短信发送设置', + 'tab_log' => '日志设置', 'settings_email' => '邮件发送设置', 'settings_sms' => '短信发送设置', 'settings_notification' => '提醒设置', diff --git a/src/psm/Module/Config/Controller/ConfigController.class.php b/src/psm/Module/Config/Controller/ConfigController.class.php index 086c3602..79fb00d4 100644 --- a/src/psm/Module/Config/Controller/ConfigController.class.php +++ b/src/psm/Module/Config/Controller/ConfigController.class.php @@ -180,6 +180,9 @@ class ConfigController extends AbstractController { $this->getTemplateId(), array( 'subtitle' => psm_get_lang('menu', 'config'), + 'label_tab_email' => psm_get_lang('config', 'tab_email'), + 'label_tab_sms' => psm_get_lang('config', 'tab_sms'), + 'label_tab_log' => psm_get_lang('config', 'tab_log'), 'label_settings_email' => psm_get_lang('config', 'settings_email'), 'label_settings_sms' => psm_get_lang('config', 'settings_sms'), 'label_settings_notification' => psm_get_lang('config', 'settings_notification'), diff --git a/src/templates/config/config.tpl.html b/src/templates/config/config.tpl.html index 1fe4be28..d31494d1 100755 --- a/src/templates/config/config.tpl.html +++ b/src/templates/config/config.tpl.html @@ -1,12 +1,12 @@ -
+ -
+
{label_general} @@ -22,15 +22,14 @@
-
- +
-  seconds +  seconds
{label_settings_notification} @@ -56,9 +55,8 @@
{label_settings_email}
-
- +
@@ -74,16 +72,15 @@
-
- +
- +
@@ -107,10 +104,9 @@
{label_settings_sms}
-
- -
+ +
@@ -152,23 +148,14 @@
{label_settings_log}
- -
- -
-
+ +
- -
- -
-
+ +
- -
- -
-
+ +
diff --git a/static/css/style.css b/static/css/style.css index fb8e3e41..5ebfc315 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -2,6 +2,13 @@ body { padding-top: 40px; padding-left: 0px; padding-right: 0px; + -webkit-text-size-adjust: none; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: moz-none; + -ms-user-select: none; + user-select: none; } .navbar-fixed-top { position: fixed; @@ -21,6 +28,36 @@ body { background-color: #444; } +.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; +} + +legend { + margin-bottom: 0px; +} + +.form-horizontal .control-label { + width: 180px; +} + +.form-horizontal .controls { + margin-left: 190px; +} + +.form-horizontal .form-actions { + padding-left: 190px; +} + @media (min-width: 980px) { .hidden-desktop { display: none !important; @@ -51,6 +88,12 @@ body { padding-left: 10px; padding-right: 10px; } + .form-horizontal .controls { + margin-left: 0px; + } + .form-horizontal .form-actions { + padding-left: 10px; + } } body.install{