Merge branch 'mobile' into develop

src/lang/bg_BG.lang.php

@@ -120,7 +120,10 @@ $sm_lang = array(
 		'last_check' => 'Последна проверка',
 		'last_online' => 'Последно на линия',
 		'monitoring' => 'Мониторинг',
+		'no_monitoring' => 'No monitoring',
+		'email' => 'Имейл',
 		'send_email' => 'Имейл',
+		'sms' => 'SMS',
 		'send_sms' => 'SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/de_DE.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/en_US.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'Send SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/es_ES.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/fr_FR.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'Envoyer un SMS',
 		'delete_title' => 'Supprimer un serveur',
 		'delete_message' => 'Êtes-vous sûr de vouloir supprimer le serveur \'%1\' ?',

src/lang/it_IT.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'Invia SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/ko_KR.lang.php

@@ -120,7 +120,10 @@ $sm_lang = array(
 		'last_check' => '최근체크',
 		'last_online' => '최근접속',
 		'monitoring' => '확인중',
+		'no_monitoring' => 'No monitoring',
+		'email' => '메일 전송',
 		'send_email' => '메일 전송',
+		'sms' => 'SMS 전송',
 		'send_sms' => 'SMS 전송',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/nl_NL.lang.php

@@ -120,7 +120,10 @@ $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',
 		'send_sms' => 'Stuur SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/pt_BR.lang.php

@@ -120,7 +120,10 @@ $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',
         'send_sms' => 'Enviar SMS',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

src/lang/zh_CN.lang.php

@@ -120,7 +120,10 @@ $sm_lang = array(
 		'last_check' => '最后检查',
 		'last_online' => '最后在线',
 		'monitoring' => '监控中',
+		'no_monitoring' => 'No monitoring',
+		'email' => '邮件',
 		'send_email' => '发送邮件',
+		'sms' => '短信',
 		'send_sms' => '发送短信',
 		'delete_title' => 'Delete Server',
 		'delete_message' => 'Are you sure you want to delete server \'%1\'?',

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

@@ -105,9 +105,26 @@ 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'] = '<a href="'.$servers[$x]['ip'].'" target="_blank">'.$servers[$x]['ip'].'</a>';
+				$servers[$x]['ip_short'] = $servers[$x]['ip'];
+			} else {
+				$servers[$x]['type_icon'] = 'icon-cog';
+				$servers[$x]['ip_short'] = $servers[$x]['ip'] . ' : ' . $servers[$x]['port'];
 			}
+			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
@@ -328,7 +345,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'),

src/templates/main.tpl.html

@@ -41,27 +41,27 @@
 
 	{html_modal}
     <!-- container -->
-    <div class="container-fluid">
-        <div class="page-header">
-            <h1>{subtitle}</h1>
-        </div>
-        <div class="row-fluid">
+    <div id="main-container">
+		<div class="page-header">
+			<h1>{subtitle}</h1>
+		</div>
+		<div id="main-content">
 			{html_sidebar}
-			<div class="span{content_span}">
+			<div id="page-container">
 				<div id="flashmessage" class="hide">
-				<!--%tpl_repeat_messages-->
-				<div class="alert alert-{shortcode}">
-					<p class="pull-left span1"><i class="icon-{icon}"></i></p>
-					<p>{message}</p>
-				</div>
-				<!--%%tpl_repeat_messages-->
-				{messages}
+					<!--%tpl_repeat_messages-->
+					<div class="alert alert-{shortcode}">
+						<p class="pull-left span1"><i class="icon-{icon}"></i></p>
+						<p>{message}</p>
+					</div>
+					<!--%%tpl_repeat_messages-->
+					{messages}
 				</div>
 				{content}
 			</div>
 		</div>
 		{html_footer}
-    </div>
+	</div>
     <!-- /container -->
     </body>
 </html>

src/templates/main_sidebar.tpl.html

@@ -1,5 +1,5 @@
 <!--%tpl_main_sidebar_container-->
-<div class="span2">
+<div id="sidebar-container">
 	<div class="sidebar-nav">
 		<ul class="nav nav-list">
 			<li class="nav-header">{subtitle}</li>

src/templates/server/log.tpl.html

@@ -5,7 +5,7 @@
 		<li><a href="#log_email_content" data-toggle="tab">{label_email}</a></li>
 		<li><a href="#log_sms_content" data-toggle="tab">{label_sms}</a></li>
 	</ul>
-	<div class="tab-content">
+	<div class="tab-content well">
 		<div class="tab-pane active" id="log_status_content">
 			{content_status}
 		</div>

src/templates/server/server.tpl.html

@@ -1,39 +1,65 @@
 <!--%tpl_server_list-->
-<table class="table table-bordered table-striped">
+<table class="table table-bordered table-striped table-align-middle">
 	<thead>
 		<tr>
-			<th>&nbsp;</th>
+			<th class="hidden-phone">&nbsp;</th>
 			<th>{label_label}</th>
-			<th>{label_domain}</th>
-			<th>{label_port}</th>
-			<th>{label_type}</th>
-			<th>{label_rtime}</th>
-			<th>{label_last_online}</th>
-			<th>{label_monitoring}</th>
-			<th>{label_send_email}</th>
-			<th>{label_send_sms}</th>
-			<th>{label_action}</th>
+			<th class="hidden-phone">{label_domain}</th>
+			<th class="visible-desktop">{label_port}</th>
+			<th class="visible-desktop">{label_type}</th>
+			<th class="hidden-phone">{label_rtime}</th>
+			<th class="hidden-phone">{label_last_online}</th>
+			<th class="hidden-phone">{label_monitoring}</th>
+			<th class="visible-desktop">{label_email}</th>
+			<th class="visible-desktop">{label_sms}</th>
+			<th class="hidden-phone">{label_action}</th>
 		</tr>
 	</thead>
 	<tbody>
 		<!--%tpl_repeat_servers-->
 		<tr>
-			<td>
-				<span class="label label-status-{status}">
-					<a href="{url_view}" title="{error}">{status}</a>
-				</span>
+			<td class="hidden-phone">
+				<span class="label label-status-{status}"><a href="{url_view}" title="{error}">{status}</a></span>
+			</td>
+			<td class="hidden-phone"><a href="{url_view}">{label}</a></td>
+			<td class="nowrap visible-tablet"><i class="{type_icon}" title="{type}"></i> {ip_short}</td>
+			<td class="nowrap visible-desktop">{ip}</td>
+			<td class="nowrap visible-desktop">{port}</td>
+			<td class="nowrap visible-desktop">{type}</td>
+			<td class="nowrap hidden-phone">{rtime} s</td>
+			<td class="nowrap hidden-phone">{last_online}</td>
+			<td class="tight visible-tablet"><i class="{active_icon}" title="{active_title}"></i> <i class="{email_icon}" title="{label_email}"></i> <i class="{sms_icon}" title="{label_sms}"></i></td>
+			<td class="tight visible-desktop">{active}</td>
+			<td class="tight visible-desktop">{email}</td>
+			<td class="tight visible-desktop">{sms}</td>
+			<td class="tight hidden-phone">
+				<a class="btn btn-small" href="index.php?mod=server&amp;action=view&amp;id={server_id}"><i class="icon-chart"></i></a>
+				{html_actions}
+			</td>
+			<td class="visible-phone">
+				<div class="table-body">
+					<div class="table-cell-title">
+						<span class="label label-status-{status}"><a href="{url_view}" title="{error}">{status}</a></span>
+						<a href="{url_view}">{label}</a>
+					</div>
+					<div class="table-cell tight">
+						&nbsp;<a class="btn btn-small" href="index.php?mod=server&amp;action=view&amp;id={server_id}"><i class="icon-chart"></i></a>
+						{html_actions}
+					</div>
+				</div>
+				<div class="table-body">
+					<div class="table-row">
+						<div class="table-cell"><i class="{type_icon}" title="{type}"></i> {ip_short}</div>
+						<div class="table-cell tight">
+							<i class="{active_icon}" title="{active_title}"></i> <i class="{email_icon}" title="{label_email}"></i> <i class="{sms_icon}" title="{label_sms}"></i>
+						</div>
+					</div>
+				</div>
+				<div class="table-body">
+					<div class="table-row"><div class="table-cell-details tight">{label_rtime}: &nbsp;</div><div class="table-cell-details">{rtime} s</div></div>
+					<div class="table-row"><div class="table-cell-details tight">{label_last_online}: &nbsp;</div><div class="table-cell-details">{last_online}</div></div>
+				</div>
 			</td>
-			<td><a href="{url_view}">{label}</a></td>
-			<td>{ip}</td>
-			<td>{port}</td>
-			<td>{type}</td>
-			<td>{rtime} s</td>
-			<td>{last_online}</td>
-			<td>{active}</td>
-			<td>{email}</td>
-			<td>{sms}</td>
-			<td><a class="btn btn-small" href="index.php?mod=server&amp;action=view&amp;id={server_id}"><i class="icon-eye-open"></i></a>
-				{html_actions}</td>
 		</tr>
 		<!--%%tpl_repeat_servers-->
 		{servers}

src/templates/server/view.tpl.html

@@ -60,11 +60,11 @@
 			<td>{active}</td>
 		</tr>
 		<tr>
-			<td>{label_send_email}:</td>
+			<td>{label_email}:</td>
 			<td>{email}</td>
 		</tr>
 		<tr>
-			<td>{label_send_sms}:</td>
+			<td>{label_sms}:</td>
 			<td>{sms}</td>
 		</tr>
 		{html_actions}
@@ -75,8 +75,8 @@
 
 <!--%tpl_server_view_admin_actions-->
 <tr>
-	<td>&nbsp;</td>
-	<td>
+	<td class="hidden-small">&nbsp;</td>
+	<td class="action-small" colspan="2">
 		<a class="btn btn-success" href="{url_edit}">
 			<i class="icon-edit icon-white"></i>&nbsp;{label_edit}
 		</a>

static/css/history.css

@@ -1,3 +1,7 @@
+#main-container {
+	overflow: hidden;
+}
+
 #history-panel {
 	width: 100%;
 	max-width: 1100px;

static/css/style.css

@@ -28,30 +28,106 @@ body {
 	background-color: #444;
 }
 
+#main-container {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+#main-content {
+	display: table;
+	width: 100%;
+}
+
+#sidebar-container {
+	display: table-cell;
+	vertical-align: top;
+	width: 1px;
+	white-space: nowrap;
+}
+
+#page-container {
+	display: table-cell;
+	vertical-align: top;
+}
+
 .powered {
 	display: inline-block;
 	white-space: nowrap;
 }
 
+table {
+  background-color: white;
+}
+fieldset {
+	display: inline-block;
+}
 .tab-content {
 	display: block;
 	width: auto;
-	padding-top: 10px;
+	padding-top: 19px;
 	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;
 }
 
+/* Tables */
+.table-align-middle td {
+	vertical-align: middle;
+}
+.tight {
+	width: 10px;
+	white-space: nowrap;	
+}
+.nowrap {
+	white-space: nowrap;
+}
+
+.table-body {
+	display: table;
+	width: 100%;
+}
+.table-row {
+	display: table-row
+}
+.table-cell {
+	display: table-cell;
+	vertical-align: top;
+}
+.table-cell-title {
+	display: table-cell;
+	vertical-align: middle;
+	height: 32px;
+	font-size: 1.1em;
+	font-weight: bold;
+}
+.table-cell-title .label {
+	position: relative;
+	top: -2px;
+}
+.table-cell-details {
+	display: table-cell;
+	font-size: 11px;
+	font-style: italic;
+	line-height: 13px;
+}
+
+/* Form */
 legend {
+	margin-top: 0px;
 	margin-bottom: 0px;
 }
 .form-horizontal .control-label {
@@ -102,14 +178,29 @@ legend {
 	border: 2px solid #d8f7ce;
 }
 
+td.visible-desktop, th.visible-desktop,
+td.hidden-phone, th.hidden-phone,
+td.hidden-tablet, th.hidden-tablet {
+	display: table-cell;
+}
 
+td.visible-phone, th.visible-phone,
+td.visible-tablet, th.visible-tablet,
+td.hidden-desktop, th.hidden-desktop {
+	display: none;
+}
 @media (min-width: 980px) {
 	.hidden-desktop {
 		display: none !important;
 	}
 }
-
 @media (max-width: 979px) {
+	#sidebar-container {
+		display: table-row;
+	}
+	#page-container {
+		display: table-row;
+	}
 	.sidebar-nav .nav-list {
 		padding: 0;
 	}
@@ -131,9 +222,28 @@ legend {
 		padding-right: 10px;
 	}
 }
-
+@media (max-width: 767px) {
+	td.visible-phone, th.visible-phone,
+	td.hidden-desktop, th.hidden-desktop {
+		display: table-cell;
+	}
+	td.hidden-phone, th.hidden-phone,
+	td.visible-desktop, th.visible-desktop {
+		display: none;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	td.visible-tablet, th.visible-tablet,
+	td.hidden-desktop, th.hidden-desktop {
+		display: table-cell;
+	}
+	td.hidden-tablet, th.hidden-tablet,
+	td.visible-desktop, th.visible-desktop {
+		display: none;
+	}
+}
 @media (max-width: 479px) {
-	.container-fluid {
+	#main-container, .container-fluid {
 		padding-left: 10px;
 		padding-right: 10px;
 	}
@@ -151,18 +261,28 @@ legend {
 	.entity {
 		margin: 0 10px 20px 10px;
 	}
+	.hidden-small {
+		display: none !important;
+	}
+	.action-small {
+		text-align: center !important;
+		background-color: white;
+	}
 }
 
 body.install{
     padding-top:20px;
 }
-.label-status-on{
+.label-status-on, .label-status-off, .label-status-warning {
+	vertical-align: baseline;
+}
+.label-status-on {
     background-color: #468847;
 }
-.label-status-off{
+.label-status-off {
    background-color: #B94A48;
 }
-.label-status-warning{
+.label-status-warning {
    background-color: #FAA732;
 }
 .label a{
@@ -230,4 +350,93 @@ legend{
 
 .oce-first{
 	background-color:#eee;
+}
+
+/* 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;
 }