From 9345bc16105b63c69f9631efe52fb6d1258dae0b Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Tue, 24 Dec 2019 23:37:15 +0100 Subject: [PATCH 1/4] [ticket/16221] Fix ACP statistics layout PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 110 ++++++++++++++++++---------------- phpBB/adm/style/admin.css | 8 ++- 2 files changed, 64 insertions(+), 54 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index ce55d81375..f874d0cc22 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -98,109 +98,113 @@ - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + {% if S_TOTAL_ORPHAN %} + + + {% else %} + {% endif %} + {% if S_VERSIONCHECK %} - - + + + {% endif %}
{L_STATISTIC}{L_VALUE}{{ lang('STATISTIC}') }}{{ lang('VALUE') }}
{L_NUMBER_POSTS}{L_COLON}{TOTAL_POSTS}{{ lang('BOARD_STARTED') ~ lang('COLON') }}{{ START_DATE }}
{L_POSTS_PER_DAY}{L_COLON}{POSTS_PER_DAY}{{ lang('AVATAR_DIR_SIZE') ~ lang('COLON') }}{{ AVATAR_DIR_SIZE }}
{L_NUMBER_TOPICS}{L_COLON}{TOTAL_TOPICS}{{ lang('DATABASE_SIZE') ~ lang('COLON') }}{{ DBSIZE }}
{L_TOPICS_PER_DAY}{L_COLON}{TOPICS_PER_DAY}{{ lang('UPLOAD_DIR_SIZE') ~ lang('COLON') }}{{ UPLOAD_DIR_SIZE }}
{L_NUMBER_USERS}{L_COLON}{TOTAL_USERS}{{ lang('DATABASE_SERVER_INFO') ~ lang('COLON') }}{{ DATABASE_INFO }}
{L_USERS_PER_DAY}{L_COLON}{USERS_PER_DAY}{{ lang('GZIP_COMPRESSION') ~ lang('COLON') }}{{ GZIP_COMPRESSION }}
{L_NUMBER_FILES}{L_COLON}{TOTAL_FILES}{{ lang('PHP_VERSION') ~ lang('COLON') }}{{ PHP_VERSION_INFO }}
{L_FILES_PER_DAY}{L_COLON}{FILES_PER_DAY}{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }} + {% if TOTAL_ORPHAN > 0 %} + {{ TOTAL_ORPHAN }} + {% else %} + {{ TOTAL_ORPHAN }} + {% endif %} +
  {{ lang('BOARD_VERSION') ~ lang('COLON') }} + {{ BOARD_VERSION }} [ {{ lang('VERSIONCHECK_FORCE_UPDATE') }} ] +
+ - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + - - - + + -
{L_STATISTIC}{L_VALUE}{{ lang('STATISTIC}') }}{{ lang('VALUE') }}
{L_BOARD_STARTED}{L_COLON}{START_DATE}{{ lang('NUMBER_POSTS') ~ lang('COLON') }}{{ TOTAL_POSTS }}
{L_AVATAR_DIR_SIZE}{L_COLON}{AVATAR_DIR_SIZE}{{ lang('POSTS_PER_DAY') ~ lang('COLON') }}{{ POSTS_PER_DAY }}
{L_DATABASE_SIZE}{L_COLON}{DBSIZE}{{ lang('NUMBER_TOPICS') ~ lang('COLON') }}{{ TOTAL_TOPICS }}
{L_UPLOAD_DIR_SIZE}{L_COLON}{UPLOAD_DIR_SIZE}{{ lang('TOPICS_PER_DAY') ~ lang('COLON') }}{{ TOPICS_PER_DAY }}
{L_DATABASE_SERVER_INFO}{L_COLON}{DATABASE_INFO}{{ lang('NUMBER_USERS') ~ lang('COLON') }}{{ TOTAL_USERS }}
{L_GZIP_COMPRESSION}{L_COLON}{GZIP_COMPRESSION}{{ lang('USERS_PER_DAY') ~ lang('COLON') }}{{ USERS_PER_DAY }}
{L_PHP_VERSION}{L_COLON}{PHP_VERSION_INFO}{{ lang('NUMBER_FILES') ~ lang('COLON') }}{{ TOTAL_FILES }}
{L_NUMBER_ORPHAN}{L_COLON} - - {TOTAL_ORPHAN} - - {TOTAL_ORPHAN} - - {{ lang('FILES_PER_DAY') ~ lang('COLON') }}{{ FILES_PER_DAY }}
{L_BOARD_VERSION}{L_COLON} - style="color: #228822;" style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] -   
+
{L_STATISTIC_RESYNC_OPTIONS} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a44de6561e..9a898cdb68 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,11 +723,17 @@ td { } .table1 { - clear: both; + display: inline-block; border-spacing: 1px; border-collapse: separate; } +.lside { + display: flex; + align-items: stretch; + width: 100%; +} + .tabled { width: 25%; } From b9fccc9fcef598ae62e0fbc33f3ad0da0e36f275 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Tue, 24 Dec 2019 23:53:42 +0100 Subject: [PATCH 2/4] [ticket/16221] Fix ACP statistics layout PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index f874d0cc22..5416675200 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -98,7 +98,7 @@ - + @@ -159,7 +159,7 @@
{{ lang('STATISTIC}') }}{{ lang('STATISTIC') }} {{ lang('VALUE') }}
- + From b1596ffecb834be2d10fd08b66a2b105d5481ed4 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 25 Dec 2019 00:06:15 +0100 Subject: [PATCH 3/4] [ticket/16221] Fix ACP statistics layout Resolve conflicts PHPBB3-16221 --- phpBB/adm/style/acp_main.html | 4 ++-- phpBB/adm/style/admin.css | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 5416675200..b8d337cfd8 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -95,7 +95,7 @@
-
{{ lang('STATISTIC}') }}{{ lang('STATISTIC') }} {{ lang('VALUE') }}
+
@@ -156,7 +156,7 @@
{{ lang('STATISTIC') }}
- +
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 9a898cdb68..f857020651 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -723,6 +723,12 @@ td { } .table1 { + clear: both; + border-spacing: 1px; + border-collapse: separate; +} + +.table2 { display: inline-block; border-spacing: 1px; border-collapse: separate; From b85c7be5ac8a08a3e3856137cb65050178a85a74 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 25 Dec 2019 21:12:22 +0100 Subject: [PATCH 4/4] [ticket/16221] Fix ACP statistics layout Fix wide-screen layout PHPBB3-16221 --- phpBB/adm/style/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f857020651..3243d0eb24 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -741,7 +741,7 @@ td { } .tabled { - width: 25%; + width: 1%; } dt#color_palette_placeholder table {
{{ lang('STATISTIC') }}