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

@@ -115,7 +115,9 @@ $sm_lang = array(
 		'last_check' => 'Последна проверка',
 		'last_online' => 'Последно на линия',
 		'monitoring' => 'Мониторинг',
+		'email' => 'Имейл',
 		'send_email' => 'Имейл',
+		'sms' => 'SMS',
 		'send_sms' => 'SMS',
 		'updated' => 'Информацията за сървъра е обновена.',
 		'inserted' => 'Сървърът е добвен успешно.',

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.',

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.',

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é.',

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' => '서버가 추가되었습니다.',

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.',

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.',

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' => '服务器已添加.',

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'),

src/templates/main.tpl.html

@@ -44,27 +44,27 @@
     <!-- /navbar -->
 
     <!-- container -->
-    <div class="container-fluid" id="main-container">
+    <div id="main-container">
-        <div class="page-header">
+		<div class="page-header">
-            <h1>{subtitle}</h1>
+			<h1>{subtitle}</h1>
-        </div>
+		</div>
-        <div class="row-fluid">
+		<div id="main-content">
 			{html_sidebar}
-			<div class="span{content_span}">
+			<div id="page-container">
 				<div id="flashmessage" class="hide">
-				<!--%tpl_repeat_messages-->
+					<!--%tpl_repeat_messages-->
-				<div class="alert alert-{shortcode}">
+					<div class="alert alert-{shortcode}">
-					<p class="pull-left span1"><i class="icon-{icon}"></i></p>
+						<p class="pull-left span1"><i class="icon-{icon}"></i></p>
-					<p>{message}</p>
+						<p>{message}</p>
-				</div>
+					</div>
-				<!--%%tpl_repeat_messages-->
+					<!--%%tpl_repeat_messages-->
-				{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

@@ -10,8 +10,8 @@
 			<th>{label_rtime}</th>
 			<th>{label_last_online}</th>
 			<th>{label_monitoring}</th>
-			<th>{label_send_email}</th>
+			<th>{label_email}</th>
-			<th>{label_send_sms}</th>
+			<th>{label_sms}</th>
 			<th>{label_action}</th>
 		</tr>
 	</thead>
@@ -32,7 +32,7 @@
 			<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>
+			<td class="col-action"><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-->

static/css/style.css

@@ -28,15 +28,43 @@ 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 {
@@ -57,6 +85,7 @@ body {
 }
 
 legend {
+	margin-top: 0px;
 	margin-bottom: 0px;
 }
 .form-horizontal .control-label {
@@ -115,6 +144,12 @@ legend {
 }
 
 @media (max-width: 979px) {
+	#sidebar-container {
+		display: table-row;
+	}
+	#page-container {
+		display: table-row;
+	}
 	.sidebar-nav .nav-list {
 		padding: 0;
 	}
@@ -138,7 +173,7 @@ legend {
 }
 
 @media (max-width: 479px) {
-	.container-fluid {
+	#main-container, .container-fluid {
 		padding-left: 10px;
 		padding-right: 10px;
 	}
@@ -235,4 +270,10 @@ legend{
 
 .oce-first{
 	background-color:#eee;
+}
+
+/* Tables */
+.col-action {
+	width: 20px;
+	white-space: nowrap;	
 }