diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 8db424e7..f647bb00 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Статус', 'email' => 'Имейл', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Сървър', diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index b783d273..c06646ef 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Server', diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 2a504f53..6f6c825b 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Server', diff --git a/src/lang/es_ES.lang.php b/src/lang/es_ES.lang.php index 3ad5cae1..4af5f488 100644 --- a/src/lang/es_ES.lang.php +++ b/src/lang/es_ES.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Estado', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Servidores', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index d9a9e91d..8cf9a243 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'État', 'email' => 'email', 'sms' => 'SMS', + 'no_logs' => 'Aucun événement', ), 'servers' => array( 'server' => 'Serveur', diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php index 23c0f38f..a7f475eb 100644 --- a/src/lang/it_IT.lang.php +++ b/src/lang/it_IT.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Stato', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Server', diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index 29e05191..9f1b8647 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => '상태', 'email' => 'email', 'sms' => 'sms', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => '서버', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index 23639fba..7d8893f1 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Server', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index a9268e5e..2f30da20 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => 'Servidor', diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index ff53d93e..92d4a8a9 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -105,6 +105,7 @@ $sm_lang = array( 'status' => '状态', 'email' => '邮件', 'sms' => '短信', + 'no_logs' => 'No logs', ), 'servers' => array( 'server' => '服务器', diff --git a/src/psm/Module/AbstractController.class.php b/src/psm/Module/AbstractController.class.php index c74d4b96..57253363 100644 --- a/src/psm/Module/AbstractController.class.php +++ b/src/psm/Module/AbstractController.class.php @@ -194,9 +194,6 @@ abstract class AbstractController implements ControllerInterface { // add sidebar to page? if($this->sidebar !== null) { $tpl_data['html_sidebar'] = $this->sidebar->createHTML(); - $tpl_data['content_span'] = '10'; - } else { - $tpl_data['content_span'] = '12'; } // add footer to page? if($this->add_footer) { diff --git a/src/psm/Module/Server/Controller/LogController.class.php b/src/psm/Module/Server/Controller/LogController.class.php index b727b0b7..61683541 100644 --- a/src/psm/Module/Server/Controller/LogController.class.php +++ b/src/psm/Module/Server/Controller/LogController.class.php @@ -63,19 +63,32 @@ class LogController extends AbstractServerController { $log_count = count($records); for ($x = 0; $x < $log_count; $x++) { - $records[$x]['class'] = ($x & 1) ? 'odd' : 'even'; - $records[$x]['users'] = ''; - $records[$x]['server'] = $records[$x]['label'] . ' (' . $records[$x]['label_adv'] . ')'; - $records[$x]['datetime_format'] = psm_date($records[$x]['datetime']); + $record = &$records[$x]; + $record['class'] = ($x & 1) ? 'odd' : 'even'; + $record['users'] = ''; + $record['server'] = $record['label']; + $record['type_icon'] = ($record['server_type'] == 'website') ? 'icon-globe' : 'icon-cog'; + $record['type_title'] = psm_get_lang('servers', 'type_' . $record['server_type']); + $ip = '(' . $record['ip']; + if(!empty($record['port']) && (($record['server_type'] != 'website') || ($record['port'] != 80))) { + $ip .= ':' . $record['port']; + } + $ip .= ')'; + $record['ip'] = $ip; + $record['datetime_format'] = psm_date($record['datetime']); // fix up user list - if($records[$x]['user_id'] == '') continue; - - $users = explode(',', $records[$x]['user_id']); - foreach($users as $user_id) { - if((int) $user_id == 0 || !isset($users_labels[$user_id])) continue; - - $records[$x]['users'] .= '
'.$users_labels[$user_id]; + if(!empty($record['user_id'])) { + $names = array(); + $users = explode(',', $record['user_id']); + foreach($users as $user_id) { + if(isset($users_labels[$user_id])) { + $names[] = $users_labels[$user_id]; + } + } + sort($names); + $record['users'] = implode('
', $names); + $record['user_list'] = implode(' • ', $names); } } @@ -87,6 +100,7 @@ class LogController extends AbstractServerController { array( 'logtitle' => $key, '?has_users' => ($key == 'status') ? false : true, + '?no_logs' => ($log_count == 0) ? true : false, ) ); $this->tpl->addTemplateData( @@ -116,11 +130,9 @@ class LogController extends AbstractServerController { $entries = $this->db->query( 'SELECT '. '`servers`.`label`, '. - 'CONCAT_WS('. - '\':\','. - '`servers`.`ip`, '. - '`servers`.`port`'. - ') AS `label_adv`, '. + '`servers`.`ip`, '. + '`servers`.`port`, '. + '`servers`.`type` AS server_type, '. '`log`.`type`, '. '`log`.`message`, '. '`log`.`datetime`, '. @@ -150,6 +162,7 @@ class LogController extends AbstractServerController { 'label_message' => psm_get_lang('system', 'message'), 'label_date' => psm_get_lang('system', 'date'), 'label_users' => ucfirst(psm_get_lang('menu', 'user')), + 'label_no_logs' => psm_get_lang('log', 'no_logs'), ) ); diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index 3d892869..2b39f89f 100755 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -107,8 +107,12 @@ class ServerController extends AbstractServerController { if($servers[$x]['type'] == 'website') { $servers[$x]['type_icon'] = 'icon-globe'; // add link to label - $servers[$x]['ip'] = ''.$servers[$x]['ip'].''; - $servers[$x]['ip_short'] = $servers[$x]['ip']; + $ip = $servers[$x]['ip']; + if(!empty($servers[$x]['port']) && ($servers[$x]['port'] != 80)) { + $ip .= ' : ' . $servers[$x]['port']; + } + $servers[$x]['ip'] = ''.$ip.''; + $servers[$x]['ip_short'] = $ip; } else { $servers[$x]['type_icon'] = 'icon-cog'; $servers[$x]['ip_short'] = $servers[$x]['ip'] . ' : ' . $servers[$x]['port']; diff --git a/src/templates/server/log.tpl.html b/src/templates/server/log.tpl.html index 94b744e8..af14b59c 100755 --- a/src/templates/server/log.tpl.html +++ b/src/templates/server/log.tpl.html @@ -22,30 +22,50 @@ - - - - - - - - - - + + + + - - - - - - - - - {entries} + + + + + + + + + {entries} + + + + +
{label_server}{label_message}{label_date}{label_users}{label_server}{label_message}{label_date}{label_users}
{server}{message}{datetime_format}{users}
+
+
+
+  {datetime_format} +
+ {server} {ip} +
+
+
+
+
+
{message}
+
+
+
+
+
+
{label_users}: {user_list}
+
+
+ 		{message}{datetime_format}{users}
{label_no_logs}
\ No newline at end of file diff --git a/static/css/style.css b/static/css/style.css index d5a78a7f..f779ff13 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -117,8 +117,18 @@ fieldset { top: -2px; } +.table-separator { + margin: 4px 0; + border-top: 1px solid #EEE; + border-bottom: 1px solid #FFF; +} + +td.cell-center { + text-align: center; +} + @media (max-width: 767px) { - .table-cell-title .title { + .table-cell .title, .table-cell-title .title { font-size: 1.1em; font-weight: bold; }