Merge branch 'mobile' into develop

src/lang/bg_BG.lang.php

@@ -141,8 +141,8 @@ $sm_lang = array(
 	'config' => array(
 		'general' => 'Основни настройки',
 		'language' => 'Език',
-		'show_update' => 'Да проверява ли за нова версия всяка седмица?',
+		'show_update' => 'Да проверява ли за нова версия всяка седмица',
-		'email_status' => 'Да се изпращат ли имейли?',
+		'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,19 +175,25 @@ $sm_lang = array(
 		'alert_type_status' => 'Промяна на статуса',
 		'alert_type_offline' => 'Офлайн',
 		'alert_type_always' => 'Винаги',
-		'log_status' => 'Статус на логовете<br/><div class="small">Ако е отметнато, системата ще записва всяка промяна:</div>',
+		'log_status' => 'Статус на логовете',
-		'log_email' => 'Да се пази ли лог на изпратените имейли от системата?',
+		'log_status_description' => 'Ако е отметнато, системата ще записва всяка промяна.',
-		'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата?',
+		'log_email' => 'Да се пази ли лог на изпратените имейли от системата',
+		'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата',
 		'updated' => 'Настройките са обновени успешно.',
+		'tab_email' => 'Имейл',
+		'tab_sms' => 'SMS',
+		'tab_log' => 'логовете',
 		'settings_email' => 'Имейл настройки',
 		'settings_sms' => 'SMS настройки',
 		'settings_notification' => 'Настройки на известията',
 		'settings_log' => 'Настройки на логовете',
+		'auto_refresh' => 'Автоматично опресняване',
 		'auto_refresh_servers' =>
-			'Автоматично опресняване на страницата<br/>'.
+			'Автоматично опресняване на страницата.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'Времето е в секунди, ако е 0 страницата няма да се обноява.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// За нов ред в имейл съобщението, моля използвайте тага <br/>
 	'notifications' => array(

src/lang/de_DE.lang.php

@@ -175,19 +175,25 @@ $sm_lang = array(
 		'alert_type_status' => 'Status geändert',
 		'alert_type_offline' => 'Offline',
 		'alert_type_always' => 'Immer',
-		'log_status' => 'Log Status<br/><div class="small">Ist der Log Status auf TRUE (ein Hacken) gesetzt, wird jeder Status protokolliert</div>',
+		'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.',
+		'tab_email' => 'Email',
+		'tab_sms' => 'SMS',
+		'tab_log' => 'Log',
 		'settings_email' => 'Email',
 		'settings_sms' => 'SMS Nachricht',
 		'settings_notification' => 'Benachrichtigung',
 		'settings_log' => 'Log',
+		'auto_refresh' => 'Auto-refresh',
 		'auto_refresh_servers' =>
 			'Auto-refresh servers page<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'Time in seconds, if 0 the page won\'t refresh.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

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?',
+		'show_update' => 'Updates',
-		'email_status' => 'Allow sending email?',
+		'email_status' => 'Allow sending email',
 		'email_from_email' => 'Email from address',
 		'email_from_name' => 'Email from name',
 		'email_smtp' => 'Enable SMTP',
@@ -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,19 +175,25 @@ $sm_lang = array(
 		'alert_type_status' => 'Status change',
 		'alert_type_offline' => 'Offline',
 		'alert_type_always' => 'Always',
-		'log_status' => 'Log status<br/><div class="small">If log status is set to TRUE, the monitor will log the event whenever the Notification settings are passed</div>',
+		'log_status' => 'Log status',
-		'log_email' => 'Log emails sent by the script?',
+		'log_status_description' => 'If log status is set to TRUE, the monitor will log the event whenever the Notification settings are passed.',
-		'log_sms' => 'Log text messages sent by the script?',
+		'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',
 		'settings_log' => 'Log settings',
+		'auto_refresh' => 'Auto-refresh',
 		'auto_refresh_servers' =>
-			'Auto-refresh servers page<br/>'.
+			'Auto-refresh servers page.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'Time in seconds, if 0 the page won\'t refresh.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

src/lang/fr_FR.lang.php

@@ -174,19 +174,25 @@ $sm_lang = array(
 		'alert_type_status' => 'Changement d\'état',
 		'alert_type_offline' => 'Hors service',
 		'alert_type_always' => 'Toujours',
-		'log_status' => 'Etat des événements<br/><div class="small">Si l\'option est activée, un événement est enregistré chaque fois qu\'une notification a lieu</div>',
+		'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é',
+		'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',
 		'settings_log' => 'Configuration des événements',
+		'auto_refresh' => 'Auto-rachaîchissement',
 		'auto_refresh_servers' =>
-			'Auto-rachaîchissement de la page serveurs<br/>'.
+			'Auto-rachaîchissement de la page serveurs.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'Temps en secondes. Si 0, la page n\'est pas rafraîchie.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'secondes',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

src/lang/ko_KR.lang.php

@@ -173,19 +173,25 @@ $sm_lang = array(
 		'alert_type_status' => '상태 변경',
 		'alert_type_offline' => '오프라인',
 		'alert_type_always' => '항상',
-		'log_status' => '로그 상태<br/><div class="small">로그상태가 TRUE이면 알림설정이 통과할때마다 이벤트를 기록합니다.</div>',
+		'log_status' => '로그 상태',
+		'log_status_description' => '로그상태가 TRUE이면 알림설정이 통과할때마다 이벤트를 기록합니다.',
 		'log_email' => '이메일로 로그를 전송하시겠습니까?',
 		'log_sms' => 'SMS로 로그를 전송하시겠습니까?',
 		'updated' => '설정이 수정되었습니다.',
+		'tab_email' => 'Email',
+		'tab_sms' => 'SMS',
+		'tab_log' => '로그',
 		'settings_email' => 'Email 설정',
 		'settings_sms' => 'SMS 설정',
 		'settings_notification' => '알림 설정',
 		'settings_log' => '로그 설정',
+		'auto_refresh' => 'Auto-refresh',
 		'auto_refresh_servers' =>
-			'서버페이지를 자동으로 새로고침<br/>'.
+			'서버페이지를 자동으로 새로고침.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'시간은 초(sec)로 설정을 하고, 0은 새로고침을 하지 않습니다.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

src/lang/nl_NL.lang.php

@@ -174,19 +174,25 @@ $sm_lang = array(
 		'alert_type_status' => 'Status verandering',
 		'alert_type_offline' => 'Offline',
 		'alert_type_always' => 'Altijd',
-		'log_status' => 'Log status<br/><div class="small">Als de log status op TRUE staat, zal de monitor een log aanmaken elke keer dat hij door de notificatie instellingen komt</div>',
+		'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.',
+		'tab_email' => 'Email',
+		'tab_sms' => 'SMS',
+		'tab_log' => 'Log',
 		'settings_email' => 'Email instellingen',
 		'settings_sms' => 'SMS instellingen',
 		'settings_notification' => 'Notificatie instellingen',
 		'settings_log' => 'Log instellingen',
+		'auto_refresh' => 'Auto-refresh',
 		'auto_refresh_servers' =>
-			'Auto-refresh servers pagina<br/>'.
+			'Auto-refresh servers pagina.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'Tijd in seconden, als de tijd 0 is wordt de pagina niet ververst.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

src/lang/pt_BR.lang.php

@@ -175,19 +175,25 @@ $sm_lang = array(
         'alert_type_status' => 'Mudança de Status',
         'alert_type_offline' => 'Offline',
         'alert_type_always' => 'Sempre',
-        'log_status' => 'Log status<br/><div class="small">Se o status de registro é definido como TRUE, o monitor irá registrar o evento sempre que as configurações de notificação forem passadas</div>',
+        '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.',
+        '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',
         'settings_log' => 'Configuração de Logs',
+        'auto_refresh' => 'Atualizar automaticamente',
         'auto_refresh_servers' =>
-            'Atualizar automaticamente a página de servidores<br/>'.
+            'Atualizar automaticamente a página de servidores.<br/>'.
-            '<div class="small">'.
+            '<span class="small">'.
             'Tempo em segundos, Se 0 a página não será atualizada.'.
-            '</div>',
+            '</span>',
+		'seconds' => 'segundos',
     ),
     // for newlines in the email messages use <br/>
     'notifications' => array(

src/lang/zh_CN.lang.php

@@ -174,19 +174,25 @@ $sm_lang = array(
 		'alert_type_status' => '状态变化',
 		'alert_type_offline' => '离线状态',
 		'alert_type_always' => '总是提醒',
-		'log_status' => '状态记录<br/><div class="small">如果状态记录设置为开, 提醒发送时均会保存记录.</div>',
+		'log_status' => '状态记录',
+		'log_status_description' => '如果状态记录设置为开, 提醒发送时均会保存记录.',
 		'log_email' => '记录脚本所发邮件?',
 		'log_sms' => '记录脚本所发短信SMS?',
 		'updated' => '设置已更新.',
+		'tab_email' => '邮件发送设置',
+		'tab_sms' => '短信发送设置',
+		'tab_log' => '日志设置',
 		'settings_email' => '邮件发送设置',
 		'settings_sms' => '短信发送设置',
 		'settings_notification' => '提醒设置',
 		'settings_log' => '日志设置',
+		'auto_refresh' => 'Auto-refresh',
 		'auto_refresh_servers' =>
-			'自动刷新服务器页<br/>'.
+			'自动刷新服务器页.<br/>'.
-			'<div class="small">'.
+			'<span class="small">'.
 			'单位为秒, 设置为0则不自动刷新.'.
-			'</div>',
+			'</span>',
+		'seconds' => 'seconds',
 	),
 	// for newlines in the email messages use <br/>
 	'notifications' => array(

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'),
@@ -213,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'),
 			)
 		);

src/psm/Module/Server/Controller/StatusController.class.php

@@ -55,20 +55,6 @@ class StatusController extends AbstractServerController {
 		$offline = array();
 		$online = array();
 
-		$tpl_data = array(
-			'bg' => '#000000',
-			'offline_bg' => '#a00000',
-			'offline_fg' => '#f7cece',
-			'online_bg' => '#53a000',
-			'online_fg' => '#d8f7ce',
-			'warning_bg' => '#FAA732',
-			'warning_fg' => '#F3F3B1',
-			'label_last_check' => psm_get_lang('servers', 'last_check'),
-			'label_last_online' => psm_get_lang('servers', 'last_online'),
-			'label_rtime' => psm_get_lang('servers', 'latency'),
-		);
-		$this->tpl->addTemplateData($this->getTemplateId(), $tpl_data);
-
 		foreach ($servers as $server) {
 			if($server['active'] == 'no') {
 				continue;
@@ -106,6 +92,9 @@ class StatusController extends AbstractServerController {
 			$this->getTemplateId(),
 			array(
 				'subtitle' => psm_get_lang('menu', 'server_status'),
+				'label_last_check' => psm_get_lang('servers', 'last_check'),
+				'label_last_online' => psm_get_lang('servers', 'last_online'),
+				'label_rtime' => psm_get_lang('servers', 'latency'),
 			)
 		);
 

src/templates/config/config.tpl.html

@@ -1,12 +1,12 @@
 <!--%tpl_config-->
-<form class="form-horizontal well" action="index.php?mod=config&action=save" id="edit_config" method="post">
+<form class="form-horizontal" action="index.php?mod=config&action=save" id="edit_config" method="post">
     <ul class="nav nav-tabs">
       <li class="active"><a href="#config-general" data-toggle="tab">{label_general}</a></li>
-      <li><a href="#config-email" data-toggle="tab">{label_settings_email}</a></li>
+      <li><a href="#config-email" data-toggle="tab">{label_tab_email}</a></li>
-      <li><a href="#config-sms" data-toggle="tab">{label_settings_sms}</a></li>
+      <li><a href="#config-sms" data-toggle="tab">{label_tab_sms}</a></li>
-      <li><a href="#config-logging" data-toggle="tab">{label_settings_log}</a></li>
+      <li><a href="#config-logging" data-toggle="tab">{label_tab_log}</a></li>
     </ul>
-	<div class="tab-content">
+	<div class="tab-content well">
 	  <div id="config-general" class="tab-pane active">
           <fieldset>
             <legend>{label_general}</legend>
@@ -22,15 +22,15 @@
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="show_update">{label_show_update}</label>
                 <div class="controls">
-                    <input type="checkbox" id="show_update" name="show_update[]" {show_update_checked} />
+                    <label class="checkbox" for="show_update"><input type="checkbox" id="show_update" name="show_update[]" {show_update_checked} /> {label_show_update}</label>
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="auto_refresh_servers">{label_auto_refresh_servers}</label>
+                <label class="control-label" for="auto_refresh_servers">{label_auto_refresh}</label>
                 <div class="controls">
-                    <input type="text" id="auto_refresh_servers" name="auto_refresh_servers" value="{auto_refresh_servers}" maxlength="10" />&nbsp;seconds
+                    <input type="text" class="input-mini" id="auto_refresh_servers" name="auto_refresh_servers" value="{auto_refresh_server}" maxlength="10" />&nbsp;{label_seconds}
+					<p class="help-block">{label_auto_refresh_servers}</p>
                 </div>
             </div>
             <legend>{label_settings_notification}</legend>
@@ -42,9 +42,7 @@
                         <option value="offline" {alert_type_selected_offline}>{label_alert_type_offline}</option>
                         <option value="always" {alert_type_selected_always}>{label_alert_type_always}</option>
                       </select>
-                      <p class="help-block">
+                      <p class="help-block">{label_alert_type_description}</p>
-                        {label_alert_type_description}
-                      </p>
                 </div>
             </div>
             <div class="form-actions">
@@ -56,9 +54,8 @@
 		<fieldset>
             <legend>{label_settings_email}</legend>
             <div class="control-group">
-                <label class="control-label" for="email_status">{label_email_status}</label>
                 <div class="controls">
-                    <input type="checkbox" id="email_status" name="email_status[]" {email_status_checked} />
+	                <label class="checkbox" for="email_status"><input type="checkbox" id="email_status" name="email_status[]" {email_status_checked} /> {label_email_status}</label>
                 </div>
             </div>
             <div class="control-group">
@@ -74,9 +71,8 @@
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="email_smtp">{label_email_smtp}</label>
                 <div class="controls">
-                    <input type="checkbox" id="email_smtp" name="email_smtp[]" {email_smtp_checked} />
+	                <label class="checkbox" for="email_smtp"><input type="checkbox" id="email_smtp" name="email_smtp[]" {email_smtp_checked} />{label_email_smtp}</label>
                 </div>
             </div>
             <div class="control-group">
@@ -107,10 +103,9 @@
 		<fieldset>
           <legend>{label_settings_sms}</legend>
             <div class="control-group">
-                <label class="control-label" for="sms_status">{label_sms_status}</label>
                 <div class="controls">
-                    <input type="checkbox" id="sms_status" name="sms_status[]" {sms_status_checked} />
+					<label class="checkbox" for="sms_status"><input type="checkbox" id="sms_status" name="sms_status[]" {sms_status_checked} /> {label_sms_status}</label>
-                </div>
+				</div>
             </div>
             <div class="control-group">
                 <label class="control-label" for="sms_gateway">{label_sms_gateway}</label>
@@ -152,23 +147,15 @@
 		  <fieldset>
             <legend>{label_settings_log}</legend>
             <div class="control-group">
-                <label class="control-label" for="log_status">{label_log_status}</label>
+				<label class="checkbox"><input type="checkbox" id="log_status" name="log_status[]" {log_status_checked} /> {label_log_status}</label>
-                <div class="controls">
+				<p class="help-block">{label_log_status_description}</p>
-                    <input type="checkbox" id="log_status" name="log_status[]" {log_status_checked} />
+			</div>
-                </div>
-            </div>
             <div class="control-group">
-                <label class="control-label" for="log_email">{label_log_email}</label>
+				<label class="checkbox"><input type="checkbox" id="log_email" name="log_email[]" {log_email_checked} /> {label_log_email}</label>
-                <div class="controls">
+			</div>
-                    <input type="checkbox" id="log_email" name="log_email[]" {log_email_checked} />
-                </div>
-            </div>
             <div class="control-group">
-                <label class="control-label" for="log_sms">{label_log_sms}</label>
+				<label class="checkbox"><input type="checkbox" id="log_sms" name="log_sms[]" {log_sms_checked} /> {label_log_sms}</label>
-                <div class="controls">
+			</div>
-                    <input type="checkbox" id="log_sms" name="log_sms[]" {log_sms_checked} />
-                </div>
-            </div>
             <div class="form-actions">
                 <button class="btn btn-success" type="submit">{label_save}</button>
             </div>

src/templates/main.tpl.html

@@ -4,7 +4,7 @@
   <head>
     <meta charset="utf-8">
     <title>{title}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, minimum-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
 	{auto_refresh}
@@ -46,7 +46,7 @@
     <!-- container -->
     <div class="container-fluid">
         <div class="page-header">
-            <h1>{subtitle}<small>&nbsp;</small></h1>
+            <h1>{subtitle}</h1>
         </div>
         <div class="row-fluid">
 			{html_sidebar}
@@ -72,15 +72,6 @@
 
 <!--%tpl_main_menu-->
           <div class="nav-collapse">
-			<ul class="nav pull-right">
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{label_usermenu} <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="{url_profile}"><i class="icon-cog"></i>&nbsp;{label_profile}</a></li>
-                  <li><a href="{url_logout}"><i class="icon-off"></i>&nbsp;{label_logout}</a></li>
-                </ul>
-              </li>
-			</ul>
             <ul class="nav">
 				<!--%tpl_repeat_menu-->
                 <li class="{active}">
@@ -92,6 +83,18 @@
                     <a href="http://www.phpservermonitor.org/" target="_blank">{label_help}</a>
                 </li>
             </ul>
+			<ul class="nav pull-right">
+              <li class="dropdown visible-desktop">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{label_usermenu} <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="{url_profile}"><i class="icon-cog"></i>&nbsp;{label_profile}</a></li>
+                  <li><a href="{url_logout}"><i class="icon-off"></i>&nbsp;{label_logout}</a></li>
+                </ul>
+              </li>
+			  <li class="hidden-desktop divider"></li>
+			  <li class="hidden-desktop"><a href="{url_profile}">{label_profile}</a></li>
+              <li class="hidden-desktop"><a href="{url_logout}">{label_logout}</a></li>
+			</ul>
           </div>
 <!--%%tpl_main_menu-->
 
@@ -102,6 +105,6 @@
 <!--%tpl_main_footer-->
         <footer class="footer">
           <p class="pull-right"><a href="#">{label_back_to_top}</a></p>
-          <p><small>Powered by <a href="http://www.phpservermonitor.org/" target="_blank">PHP Server Monitor {version}</a>.<br/>{update_available}</small></p>
+          <p class="powered"><small>Powered by <a href="http://www.phpservermonitor.org/" target="_blank">PHP Server Monitor {version}</a>.<br/>{update_available}</small></p>
         </footer>
 <!--%%tpl_main_footer-->

src/templates/server/status.tpl.html

@@ -1,8 +1,7 @@
 <!--%tpl_server_status-->
 <style type="text/css">
 	body {
-		background: {bg};
+		background: black;
-		padding: 30px 20px;
 	}
 
 	.page-header {
@@ -18,57 +17,25 @@
 		margin-bottom: 10px;
 	}
 
-	.entity {
-		padding: 10px;
-		box-shadow: 0px 0px 5px #666;
-		border-radius: 3px;
-		margin-bottom: 20px;
-		width: 300px;
-		cursor: pointer;
-	}
-
-	.offline {
-		width: 325px;
-		float: left;
-		margin-right: 20px;
-	}
-
-	.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};
-		float: left;
-		margin-right: 20px;
-	}
 </style>
-<div class="offline">
+<div class="entity-container">
 	<!--%tpl_repeat_servers_offline-->
-	<div class="entity {class_warning}" onclick="window.location.href='{url_view}'">
+	<div class="offline">
-		<h2>{label}</h2>
+		<div class="entity {class_warning}" onclick="window.location.href='{url_view}'">
-		<p>{label_last_online}: {last_online_nice}</p>
+			<h2>{label}</h2>
-		<p>{label_last_check}: {last_checked_nice}</p>
+			<p>{label_last_online}: {last_online_nice}</p>
+			<p>{label_last_check}: {last_checked_nice}</p>
+		</div>
 	</div>
 	<!--%%tpl_repeat_servers_offline-->
 	{servers_offline}
-</div>
-<div class="online">
 	<!--%tpl_repeat_servers_online-->
-	<div class="entity" onclick="window.location.href='{url_view}'">
+	<div class="online">
-		<h2>{label}</h2>
+		<div class="entity" onclick="window.location.href='{url_view}'">
-		<p>{label_last_online}: {last_checked_nice}</p>
+			<h2>{label}</h2>
-		<p>{label_rtime}: {rtime}s</p>
+			<p>{label_last_online}: {last_checked_nice}</p>
+			<p>{label_rtime}: {rtime}s</p>
+		</div>
 	</div>
 	<!--%%tpl_repeat_servers_online-->
 	{servers_online}

static/css/style.css

@@ -1,7 +1,14 @@
 body {
-	padding-top: 70px;
+	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;
@@ -15,6 +22,93 @@ body {
 	margin: 5px 0;
 	min-width: 100px;
 }
+.navbar .nav .divider {
+	height: 1px;
+	overflow: hidden;
+	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;
+}
+
+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 {
+		display: none !important;
+	}
+}
+
 @media (max-width: 979px) {
 	.sidebar-nav .nav-list {
 		padding: 0;
@@ -26,7 +120,39 @@ body {
 		float: left;
 		margin-right: 15px;
 	}
+	.navbar .brand {
+		margin-left: -10px;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.tab-content {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
 }
+
+@media (max-width: 479px) {
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+	.form-horizontal .controls {
+		margin-left: 0px;
+	}
+	.form-horizontal .form-actions {
+		padding-left: 10px;
+		text-align: center;
+	}
+
+	.entity-container {
+		text-align: center;
+	}
+	.entity {
+		margin: 0 10px 20px 10px;
+	}
+}
+
 body.install{
     padding-top:20px;
 }