From 5d81d560e6ef275f8a2cadb297a89c17f341d124 Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Tue, 21 May 2019 21:02:19 +0200 Subject: [PATCH] Improved table readability Fixes #736. --- .../Server/Controller/ServerController.php | 2 +- .../Module/User/Controller/UserController.php | 4 +++- .../default/module/server/log.tpl.html | 6 +++--- .../default/module/server/server/list.tpl.html | 4 ++-- .../module/server/status/index.tpl.html | 4 ++-- .../default/module/user/user/list.tpl.html | 18 +++++++++--------- static/css/style.min.css | 2 +- static/css/style.min.css.map | 2 +- static/scss/style.scss | 14 ++++++++++++-- 9 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php index e5c8af06..974bf201 100644 --- a/src/psm/Module/Server/Controller/ServerController.php +++ b/src/psm/Module/Server/Controller/ServerController.php @@ -412,7 +412,7 @@ class ServerController extends AbstractServerController { $this->setSidebar($sidebar); // check which module the user came from, and add a link accordingly - $back_to = isset($_GET['back_to']) && $_GET['back_to'] == 'server_status' ? $_GET['back_to'] : 'server'; + $back_to = isset($_GET['back_to']) && ($_GET['back_to'] == 'server_status' || $_GET['back_to'] == 'user') ? $_GET['back_to'] : 'server'; $sidebar->addButton( 'go_back', psm_get_lang('system', 'go_back'), diff --git a/src/psm/Module/User/Controller/UserController.php b/src/psm/Module/User/Controller/UserController.php index 62e01820..a2819a93 100644 --- a/src/psm/Module/User/Controller/UserController.php +++ b/src/psm/Module/User/Controller/UserController.php @@ -109,7 +109,8 @@ class UserController extends AbstractController { continue; } $user['emp_servers'][] = array( - 'label' => $servers_labels[$server_id] + 'label' => $servers_labels[$server_id], + 'url' => psm_build_url(array('mod' => 'server', 'action' => 'view', 'id' => $server_id, 'back_to' => 'user')) ); } sort($user['emp_servers']); @@ -180,6 +181,7 @@ class UserController extends AbstractController { } } } + die(var_dump($this->servers)); $tpl_data = array( 'titlemode' => $title, 'placeholder_password' => $placeholder_password, diff --git a/src/templates/default/module/server/log.tpl.html b/src/templates/default/module/server/log.tpl.html index cae2c5a4..cfc732ae 100644 --- a/src/templates/default/module/server/log.tpl.html +++ b/src/templates/default/module/server/log.tpl.html @@ -23,20 +23,20 @@ {% for entry in tab.entries %} {% if entry.server %} - {{ entry.server }} {{ entry.ip }} + {{ entry.server }} {% endif %} {% if entry.server %} {% else %} {% endif %} - {{ entry.message|raw }} + {{ entry.message|raw }} {% if tab.has_users %}{{ entry.user_list|raw }}{% endif %} {% endfor %} {% if tab.no_logs %} - {{ label_no_logs }} + {{ label_no_logs }} {% endif %} diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html index c64b62b2..f76de904 100644 --- a/src/templates/default/module/server/server/list.tpl.html +++ b/src/templates/default/module/server/server/list.tpl.html @@ -5,7 +5,7 @@ - {{ label_label }} + {{ label_label }} {{ label_domain }} {{ label_port }} {{ label_type }} @@ -24,7 +24,7 @@ {% for server in servers %} - + {% if server.status|lower == 'on' %}   {% elseif server.status|lower == 'warning' %} diff --git a/src/templates/default/module/server/status/index.tpl.html b/src/templates/default/module/server/status/index.tpl.html index 43bc6c41..2b8a959e 100644 --- a/src/templates/default/module/server/status/index.tpl.html +++ b/src/templates/default/module/server/status/index.tpl.html @@ -57,7 +57,7 @@ {% for server in servers_offline %} - {{ server.label }} ({{ label_offline }}) + {{ server.label }} ({{ label_offline }}) {{ server.last_online_nice }} {{ server.last_checked_nice }} @@ -77,7 +77,7 @@ {% for server in servers_online %} - {{ server.label }} ({{ label_online }}) + {{ server.label }} ({{ label_online }}) {{ server.last_online_nice }} {{ server.last_offline_nice }} {{ server.last_offline_duration_nice }} {{ server.rtime }}s diff --git a/src/templates/default/module/user/user/list.tpl.html b/src/templates/default/module/user/user/list.tpl.html index 2d5aed66..e7ab9d2a 100644 --- a/src/templates/default/module/user/user/list.tpl.html +++ b/src/templates/default/module/user/user/list.tpl.html @@ -5,11 +5,9 @@ {{ label_user }} - {{ label_name }} - {{ label_level }} {{ label_email }} {{ label_mobile }} - {{ label_servers }} + {{ label_servers }} @@ -18,16 +16,18 @@ {% if user.level == '10' %} -   +   {% elseif user.level == '20' %} -   +   {% endif %} - {{ user.user_name }} ({{ user.name }}) - {{ user.name }} - {{ user.level_text }} + {{ user.user_name }} ({{ user.name }}) {{ user.email }} {{ user.mobile }} - {% for server in user.emp_servers %} {{ server.label }}
{% endfor %} + + {% for server in user.emp_servers %} + {{ server.label }}
+ {% endfor %} +