From 9cd941237c6c0fa1f6af569c107f9a9192a85da4 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Wed, 4 Apr 2018 20:41:31 +0500
Subject: [PATCH 01/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 18 +++++++++---------
phpBB/adm/style/admin.css | 25 +++++++++++++++++++++++++
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 12477a4b77..3841353241 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,9 +94,9 @@
<!-- EVENT acp_main_notice_after -->
- <table class="table1 two-columns no-header" data-no-responsive-header="true">
+ <table class="table1 zebra-table no-header" data-no-responsive-header="true">
<caption>{L_FORUM_STATS}</caption>
- <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+ <!--<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />-->
<thead>
<tr>
<th>{L_STATISTIC}</th>
@@ -185,35 +185,35 @@
<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span> </span></dt>
- <dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="online" /><input class="runbutton" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_date">{L_RESET_DATE}</label><br /><span> </span></dt>
- <dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="date" /><input class="runbutton" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_stats_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="stats" /><input class="runbutton" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_user_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="user" /><input class="runbutton" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_db_track_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="db_track" /><input class="runbutton" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
</dl>
</form>
@@ -221,7 +221,7 @@
<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="purge_sessions" /><input class="runbutton" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
</dl>
</form>
<!-- ENDIF -->
@@ -229,7 +229,7 @@
<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="purge_cache" /><input class="runbutton" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
</dl>
</form>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index eb91ad59d6..0c57998604 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1716,6 +1716,17 @@ input.button2 {
border: 1px solid #666666;
}
+a.runbutton,
+input.runbutton {
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
+ font-size: 0.85em;
+ color: #000000;
+ border-radius: 4px;
+ width: auto !important;
+ padding: 1px 3px 0;
+ cursor: pointer;
+}
+
/* <a> button in the style of the form buttons */
a.button1,
a.button1:link,
@@ -1730,6 +1741,15 @@ a.button2:active {
padding: 4px 8px;
}
+a.runbutton,
+a.runbutton:link,
+a.runbutton:visited,
+a.runbutton:active {
+ text-decoration: none;
+ color: #ffffff;
+ padding: 4px 8px;
+}
+
/* Hover states */
a.button1:hover,
input.button1:hover,
@@ -1740,6 +1760,11 @@ input.button2:hover {
color: #bc2a4d;
}
+a.runbutton:hover,
+input.runbutton:hover {
+ opacity:0.75;
+}
+
input.disabled {
font-weight: normal;
color: #666666;
From a71edb0d90dca2873ce5e6075fd91efca21e1588 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Wed, 4 Apr 2018 23:53:24 +0500
Subject: [PATCH 02/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 14 +++++++-------
phpBB/adm/style/admin.css | 25 -------------------------
2 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 3841353241..d955a7fe70 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -185,35 +185,35 @@
<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span> </span></dt>
- <dd><input type="hidden" name="action" value="online" /><input class="runbutton" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_date">{L_RESET_DATE}</label><br /><span> </span></dt>
- <dd><input type="hidden" name="action" value="date" /><input class="runbutton" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_stats_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="stats" /><input class="runbutton" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_user_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="user" /><input class="runbutton" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
</dl>
</form>
<form id="action_db_track_form" method="post" action="{U_ACTION}">
<dl>
<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="db_track" /><input class="runbutton" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
</dl>
</form>
@@ -221,7 +221,7 @@
<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="purge_sessions" /><input class="runbutton" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
</dl>
</form>
<!-- ENDIF -->
@@ -229,7 +229,7 @@
<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">
<dl>
<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
- <dd><input type="hidden" name="action" value="purge_cache" /><input class="runbutton" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+ <dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
</dl>
</form>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 0c57998604..eb91ad59d6 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1716,17 +1716,6 @@ input.button2 {
border: 1px solid #666666;
}
-a.runbutton,
-input.runbutton {
- font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
- font-size: 0.85em;
- color: #000000;
- border-radius: 4px;
- width: auto !important;
- padding: 1px 3px 0;
- cursor: pointer;
-}
-
/* <a> button in the style of the form buttons */
a.button1,
a.button1:link,
@@ -1741,15 +1730,6 @@ a.button2:active {
padding: 4px 8px;
}
-a.runbutton,
-a.runbutton:link,
-a.runbutton:visited,
-a.runbutton:active {
- text-decoration: none;
- color: #ffffff;
- padding: 4px 8px;
-}
-
/* Hover states */
a.button1:hover,
input.button1:hover,
@@ -1760,11 +1740,6 @@ input.button2:hover {
color: #bc2a4d;
}
-a.runbutton:hover,
-input.runbutton:hover {
- opacity:0.75;
-}
-
input.disabled {
font-weight: normal;
color: #666666;
From 557a9b47af5ea4ee14e40e03a81546ef58c69a80 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Thu, 5 Apr 2018 21:09:41 +0500
Subject: [PATCH 03/11] [ticket/15610] Improving UI of Board Statistics
Master Improving UI of Board Statistics in ACP.
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 56 +++++++++++++++++++++++++++--------
phpBB/adm/style/admin.css | 13 +++++++-
2 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index d955a7fe70..fadb65bd1a 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -93,15 +93,14 @@
<!-- ENDIF -->
<!-- EVENT acp_main_notice_after -->
-
- <table class="table1 zebra-table no-header" data-no-responsive-header="true">
- <caption>{L_FORUM_STATS}</caption>
- <!--<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />-->
+
+ <div id = "lside">
+
+ <table class="table1 zebra-table no-header " data-no-responsive-header="true">
+
<thead>
<tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- <th>{L_STATISTIC}</th>
+ <th>Forum Statistics</th>
<th>{L_VALUE}</th>
</tr>
</thead>
@@ -109,48 +108,83 @@
<tr>
<td>{L_NUMBER_POSTS}{L_COLON} </td>
<td><strong>{TOTAL_POSTS}</strong></td>
+ </tr>
+ <tr>
<td>{L_POSTS_PER_DAY}{L_COLON} </td>
<td><strong>{POSTS_PER_DAY}</strong></td>
</tr>
<tr>
<td>{L_NUMBER_TOPICS}{L_COLON} </td>
<td><strong>{TOTAL_TOPICS}</strong></td>
+ </tr>
+ <tr>
<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
<td><strong>{TOPICS_PER_DAY}</strong></td>
</tr>
<tr>
<td>{L_NUMBER_USERS}{L_COLON} </td>
<td><strong>{TOTAL_USERS}</strong></td>
+ </tr>
+ <tr>
<td>{L_USERS_PER_DAY}{L_COLON} </td>
<td><strong>{USERS_PER_DAY}</strong></td>
</tr>
<tr>
<td>{L_NUMBER_FILES}{L_COLON} </td>
<td><strong>{TOTAL_FILES}</strong></td>
+ </tr>
+ <tr>
<td>{L_FILES_PER_DAY}{L_COLON} </td>
<td><strong>{FILES_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
</tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div id="lside" >
+ <table class="table1 zebra-table no-header" data-no-responsive-header="true" >
+
+
+ <thead>
+ <tr>
+ <th>Configuration Statistics</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
<tr>
<td>{L_BOARD_STARTED}{L_COLON} </td>
<td><strong>{START_DATE}</strong></td>
+ </tr>
+ <tr>
<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
<td><strong>{AVATAR_DIR_SIZE}</strong></td>
</tr>
<tr>
<td>{L_DATABASE_SIZE}{L_COLON} </td>
<td><strong>{DBSIZE}</strong></td>
+ </tr>
+ <tr>
<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
</tr>
<tr>
<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
<td><strong>{DATABASE_INFO}</strong></td>
+ </tr>
+ <tr>
<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
<td><strong>{GZIP_COMPRESSION}</strong></td>
</tr>
<tr>
<td>{L_PHP_VERSION}{L_COLON} </td>
<td><strong>{PHP_VERSION_INFO}</strong></td>
+ </tr>
+ <tr>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
<td>
@@ -161,8 +195,7 @@
<!-- ENDIF -->
</td>
<!-- ELSE -->
- <td> </td>
- <td> </td>
+
<!-- ENDIF -->
</tr>
<!-- IF S_VERSIONCHECK -->
@@ -171,13 +204,12 @@
<td>
<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
- <td> </td>
- <td> </td>
+
</tr>
<!-- ENDIF -->
</tbody>
</table>
-
+ </div>
<!-- IF S_ACTION_OPTIONS -->
<fieldset>
<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index eb91ad59d6..08c9685cba 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -750,11 +750,22 @@ td {
}
.table1 {
- clear: both;
border-spacing: 1px;
border-collapse: separate;
+ display:inline-block;
+
}
+#lside {
+ display: inline-block;
+ width: 40%;
+}
+
+.table1 td {
+ width: 25%;
+}
+
+
dt#color_palette_placeholder table {
width: 80px;
margin-right: 5px;
From b4535658f33b516e8841bf5465198c5d38ceef2b Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Thu, 5 Apr 2018 22:00:36 +0500
Subject: [PATCH 04/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/admin.css | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 08c9685cba..df7e906d27 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -751,9 +751,8 @@ td {
.table1 {
border-spacing: 1px;
+ display: inline-block;
border-collapse: separate;
- display:inline-block;
-
}
#lside {
From 975c63b518009242a39fbf4bc10f95dc66cf4bfb Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Thu, 5 Apr 2018 22:13:27 +0500
Subject: [PATCH 05/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html
PHPBB3-15610
---
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 df7e906d27..881fa50af8 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -750,8 +750,8 @@ td {
}
.table1 {
- border-spacing: 1px;
display: inline-block;
+ border-spacing: 1px;
border-collapse: separate;
}
From 026f3e23dbfad8f15f0c1d81a0151d91363ba8d0 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Thu, 5 Apr 2018 23:46:17 +0500
Subject: [PATCH 06/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html
PHPBB3-15610
---
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 fadb65bd1a..11fbac9b37 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -100,7 +100,7 @@
<thead>
<tr>
- <th>Forum Statistics</th>
+ <th>{L_STATISTIC}</th>
<th>{L_VALUE}</th>
</tr>
</thead>
@@ -151,7 +151,7 @@
<thead>
<tr>
- <th>Configuration Statistics</th>
+ <th>{L_STATISTIC}</th>
<th>{L_VALUE}</th>
</tr>
</thead>
From 520064d0fcb513a761cba26a75fdbd1efeba2b86 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Fri, 6 Apr 2018 09:54:59 +0500
Subject: [PATCH 07/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 76 +++++++++++++++++------------------
phpBB/adm/style/admin.css | 5 +--
2 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 11fbac9b37..8d0b64735b 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,7 +94,7 @@
<!-- EVENT acp_main_notice_after -->
- <div id = "lside">
+ <div class="lside">
<table class="table1 zebra-table no-header " data-no-responsive-header="true">
@@ -106,46 +106,46 @@
</thead>
<tbody>
<tr>
- <td>{L_NUMBER_POSTS}{L_COLON} </td>
- <td><strong>{TOTAL_POSTS}</strong></td>
+ <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
</tr>
<tr>
- <td>{L_POSTS_PER_DAY}{L_COLON} </td>
- <td><strong>{POSTS_PER_DAY}</strong></td>
+ <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
</tr>
<tr>
- <td>{L_NUMBER_TOPICS}{L_COLON} </td>
- <td><strong>{TOTAL_TOPICS}</strong></td>
+ <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
</tr>
<tr>
- <td>{L_TOPICS_PER_DAY}{L_COLON} </td>
- <td><strong>{TOPICS_PER_DAY}</strong></td>
+ <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
</tr>
<tr>
- <td>{L_NUMBER_USERS}{L_COLON} </td>
- <td><strong>{TOTAL_USERS}</strong></td>
+ <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
</tr>
<tr>
- <td>{L_USERS_PER_DAY}{L_COLON} </td>
- <td><strong>{USERS_PER_DAY}</strong></td>
+ <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
</tr>
<tr>
- <td>{L_NUMBER_FILES}{L_COLON} </td>
- <td><strong>{TOTAL_FILES}</strong></td>
+ <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
</tr>
<tr>
- <td>{L_FILES_PER_DAY}{L_COLON} </td>
- <td><strong>{FILES_PER_DAY}</strong></td>
+ <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
</tr>
<tr>
- <td> </td>
- <td> </td>
+ <td class="tabled"> </td>
+ <td class="tabled"> </td>
</tr>
</tbody>
</table>
</div>
- <div id="lside" >
+ <div class="lside" >
<table class="table1 zebra-table no-header" data-no-responsive-header="true" >
@@ -157,37 +157,37 @@
</thead>
<tbody>
<tr>
- <td>{L_BOARD_STARTED}{L_COLON} </td>
- <td><strong>{START_DATE}</strong></td>
+ <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
+ <td class="tabled"><strong>{START_DATE}</strong></td>
</tr>
<tr>
- <td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
- <td><strong>{AVATAR_DIR_SIZE}</strong></td>
+ <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
</tr>
<tr>
- <td>{L_DATABASE_SIZE}{L_COLON} </td>
- <td><strong>{DBSIZE}</strong></td>
+ <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{DBSIZE}</strong></td>
</tr>
<tr>
- <td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
- <td><strong>{UPLOAD_DIR_SIZE}</strong></td>
+ <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
</tr>
<tr>
- <td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
- <td><strong>{DATABASE_INFO}</strong></td>
+ <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+ <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
</tr>
<tr>
- <td>{L_GZIP_COMPRESSION}{L_COLON} </td>
- <td><strong>{GZIP_COMPRESSION}</strong></td>
+ <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
+ <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
</tr>
<tr>
- <td>{L_PHP_VERSION}{L_COLON} </td>
- <td><strong>{PHP_VERSION_INFO}</strong></td>
+ <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
+ <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
</tr>
<tr>
<!-- IF S_TOTAL_ORPHAN -->
- <td>{L_NUMBER_ORPHAN}{L_COLON} </td>
- <td>
+ <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
+ <td class="tabled">
<!-- IF TOTAL_ORPHAN > 0 -->
<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
<!-- ELSE -->
@@ -200,8 +200,8 @@
</tr>
<!-- IF S_VERSIONCHECK -->
<tr>
- <td>{L_BOARD_VERSION}{L_COLON} </td>
- <td>
+ <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
+ <td class="tabled">
<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 881fa50af8..0180035933 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -755,16 +755,15 @@ td {
border-collapse: separate;
}
-#lside {
+.lside {
display: inline-block;
width: 40%;
}
-.table1 td {
+.tabled {
width: 25%;
}
-
dt#color_palette_placeholder table {
width: 80px;
margin-right: 5px;
From fe160de475f8658e42274cc68963b123e2bd246c Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Fri, 6 Apr 2018 22:13:04 +0500
Subject: [PATCH 08/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 216 +++++++++++++++++-----------------
1 file changed, 108 insertions(+), 108 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 8d0b64735b..ea5c75fdeb 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -96,119 +96,119 @@
<div class="lside">
- <table class="table1 zebra-table no-header " data-no-responsive-header="true">
-
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled"> </td>
- <td class="tabled"> </td>
- </tr>
- </tbody>
- </table>
+ <table class="table1 zebra-table no-header " data-no-responsive-header="true">
+
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled"> </td>
+ <td class="tabled"> </td>
+ </tr>
+ </tbody>
+ </table>
</div>
<div class="lside" >
- <table class="table1 zebra-table no-header" data-no-responsive-header="true" >
-
+ <table class="table1 zebra-table no-header" data-no-responsive-header="true" >
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
- <td class="tabled"><strong>{START_DATE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{DBSIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
- <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
- <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
- <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
- </tr>
- <tr>
- <!-- IF S_TOTAL_ORPHAN -->
- <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
- <td class="tabled">
- <!-- IF TOTAL_ORPHAN > 0 -->
- <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
- <!-- ELSE -->
- <strong>{TOTAL_ORPHAN}</strong>
+
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
+ <td class="tabled"><strong>{START_DATE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{DBSIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+ <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
+ <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
+ <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
+ </tr>
+ <tr>
+ <!-- IF S_TOTAL_ORPHAN -->
+ <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
+ <td class="tabled">
+ <!-- IF TOTAL_ORPHAN > 0 -->
+ <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
+ <!-- ELSE -->
+ <strong>{TOTAL_ORPHAN}</strong>
+ <!-- ENDIF -->
+ </td>
+ <!-- ELSE -->
+
<!-- ENDIF -->
- </td>
- <!-- ELSE -->
-
- <!-- ENDIF -->
- </tr>
- <!-- IF S_VERSIONCHECK -->
- <tr>
- <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
- <td class="tabled">
- <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
- </td>
-
- </tr>
- <!-- ENDIF -->
- </tbody>
- </table>
+ </tr>
+ <!-- IF S_VERSIONCHECK -->
+ <tr>
+ <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
+ <td class="tabled">
+ <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
+ </td>
+
+ </tr>
+ <!-- ENDIF -->
+ </tbody>
+ </table>
</div>
<!-- IF S_ACTION_OPTIONS -->
<fieldset>
From c76f4804668f79e52d3f00b7ede249ad4876b0f0 Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Sat, 7 Apr 2018 11:05:58 +0500
Subject: [PATCH 09/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 222 +++++++++++++++++-----------------
1 file changed, 110 insertions(+), 112 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index ea5c75fdeb..69b12c6192 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,122 +94,120 @@
<!-- EVENT acp_main_notice_after -->
- <div class="lside">
+ <div class="lside">
- <table class="table1 zebra-table no-header " data-no-responsive-header="true">
+ <table class="table1 zebra-table no-header " data-no-responsive-header="true">
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled"> </td>
- <td class="tabled"> </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <div class="lside" >
- <table class="table1 zebra-table no-header" data-no-responsive-header="true" >
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled"> </td>
+ <td class="tabled"> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
-
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
- <td class="tabled"><strong>{START_DATE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{DBSIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
- <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
- <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
- <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
- </tr>
- <tr>
- <!-- IF S_TOTAL_ORPHAN -->
- <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
- <td class="tabled">
- <!-- IF TOTAL_ORPHAN > 0 -->
- <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
- <!-- ELSE -->
- <strong>{TOTAL_ORPHAN}</strong>
+ <div class="lside" >
+ <table class="table1 zebra-table no-header" data-no-responsive-header="true" >
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
+ <td class="tabled"><strong>{START_DATE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{DBSIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+ <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
+ <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
+ <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
+ </tr>
+ <tr>
+ <!-- IF S_TOTAL_ORPHAN -->
+ <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
+ <td class="tabled">
+ <!-- IF TOTAL_ORPHAN > 0 -->
+ <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
+ <!-- ELSE -->
+ <strong>{TOTAL_ORPHAN}</strong>
+ <!-- ENDIF -->
+ </td>
+ <!-- ELSE -->
+
<!-- ENDIF -->
- </td>
- <!-- ELSE -->
-
- <!-- ENDIF -->
- </tr>
- <!-- IF S_VERSIONCHECK -->
- <tr>
- <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
- <td class="tabled">
- <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
- </td>
-
- </tr>
- <!-- ENDIF -->
- </tbody>
- </table>
- </div>
+ </tr>
+ <!-- IF S_VERSIONCHECK -->
+ <tr>
+ <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
+ <td class="tabled">
+ <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
+ </td>
+
+ </tr>
+ <!-- ENDIF -->
+ </tbody>
+ </table>
+ </div>
<!-- IF S_ACTION_OPTIONS -->
<fieldset>
<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
From 00d43a12fa00c7c74d884923426bba240df6448c Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Sat, 7 Apr 2018 23:14:16 +0500
Subject: [PATCH 10/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 206 +++++++++++++++++-----------------
1 file changed, 103 insertions(+), 103 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 69b12c6192..ce8b9d5674 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -98,114 +98,114 @@
<table class="table1 zebra-table no-header " data-no-responsive-header="true">
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
- <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
- <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
- </tr>
- <tr>
- <td class="tabled"> </td>
- <td class="tabled"> </td>
- </tr>
- </tbody>
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_USERS}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
+ <td class="tabled"><strong>{TOTAL_FILES}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
+ <td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled"> </td>
+ <td class="tabled"> </td>
+ </tr>
+ </tbody>
</table>
</div>
<div class="lside" >
<table class="table1 zebra-table no-header" data-no-responsive-header="true" >
- <thead>
- <tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
- <td class="tabled"><strong>{START_DATE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{DBSIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
- <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
- <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
- <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
- </tr>
- <tr>
- <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
- <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
- </tr>
- <tr>
- <!-- IF S_TOTAL_ORPHAN -->
- <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
- <td class="tabled">
- <!-- IF TOTAL_ORPHAN > 0 -->
- <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
- <!-- ELSE -->
- <strong>{TOTAL_ORPHAN}</strong>
- <!-- ENDIF -->
- </td>
- <!-- ELSE -->
-
- <!-- ENDIF -->
- </tr>
- <!-- IF S_VERSIONCHECK -->
- <tr>
- <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
- <td class="tabled">
- <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
- </td>
-
- </tr>
- <!-- ENDIF -->
- </tbody>
+ <thead>
+ <tr>
+ <th>{L_STATISTIC}</th>
+ <th>{L_VALUE}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
+ <td class="tabled"><strong>{START_DATE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{DBSIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+ <td class="tabled"><strong>{DATABASE_INFO}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
+ <td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
+ </tr>
+ <tr>
+ <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
+ <td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
+ </tr>
+ <tr>
+ <!-- IF S_TOTAL_ORPHAN -->
+ <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
+ <td class="tabled">
+ <!-- IF TOTAL_ORPHAN > 0 -->
+ <a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
+ <!-- ELSE -->
+ <strong>{TOTAL_ORPHAN}</strong>
+ <!-- ENDIF -->
+ </td>
+ <!-- ELSE -->
+
+ <!-- ENDIF -->
+ </tr>
+ <!-- IF S_VERSIONCHECK -->
+ <tr>
+ <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
+ <td class="tabled">
+ <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
+ </td>
+
+ </tr>
+ <!-- ENDIF -->
+ </tbody>
</table>
</div>
<!-- IF S_ACTION_OPTIONS -->
From cdaf6dc0ff3c62edea55c78011b519f361cf149a Mon Sep 17 00:00:00 2001
From: amalnaeem <36226153+amalnaeem@users.noreply.github.com>
Date: Sun, 8 Apr 2018 11:38:16 +0500
Subject: [PATCH 11/11] [ticket/15610] Improving UI of Board Statistics in ACP
Master Improving UI of Board Statistics in ACP
Statistics table was divided into two in acp_main.html.
PHPBB3-15610
---
phpBB/adm/style/acp_main.html | 39 +++++++++++++++--------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index ce8b9d5674..261c41a2e7 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -95,9 +95,7 @@
<!-- EVENT acp_main_notice_after -->
<div class="lside">
-
<table class="table1 zebra-table no-header " data-no-responsive-header="true">
-
<thead>
<tr>
<th>{L_STATISTIC}</th>
@@ -106,35 +104,35 @@
</thead>
<tbody>
<tr>
- <td class="tabled">{L_NUMBER_POSTS}{L_COLON} </td>
+ <td class="tabled">{L_NUMBER_POSTS}{L_COLON}</td>
<td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_POSTS_PER_DAY}{L_COLON} </td>
+ <td class="tabled">{L_POSTS_PER_DAY}{L_COLON}</td>
<td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_NUMBER_TOPICS}{L_COLON} </td>
+ <td class="tabled">{L_NUMBER_TOPICS}{L_COLON}</td>
<td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON} </td>
+ <td class="tabled">{L_TOPICS_PER_DAY}{L_COLON}</td>
<td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_NUMBER_USERS}{L_COLON} </td>
+ <td class="tabled">{L_NUMBER_USERS}{L_COLON}</td>
<td class="tabled"><strong>{TOTAL_USERS}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_USERS_PER_DAY}{L_COLON} </td>
+ <td class="tabled">{L_USERS_PER_DAY}{L_COLON}</td>
<td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_NUMBER_FILES}{L_COLON} </td>
+ <td class="tabled">{L_NUMBER_FILES}{L_COLON}</td>
<td class="tabled"><strong>{TOTAL_FILES}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_FILES_PER_DAY}{L_COLON} </td>
+ <td class="tabled">{L_FILES_PER_DAY}{L_COLON}</td>
<td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
</tr>
<tr>
@@ -144,7 +142,6 @@
</tbody>
</table>
</div>
-
<div class="lside" >
<table class="table1 zebra-table no-header" data-no-responsive-header="true" >
<thead>
@@ -155,36 +152,36 @@
</thead>
<tbody>
<tr>
- <td class="tabled">{L_BOARD_STARTED}{L_COLON} </td>
+ <td class="tabled">{L_BOARD_STARTED}{L_COLON}</td>
<td class="tabled"><strong>{START_DATE}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON}</td>
<td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_DATABASE_SIZE}{L_COLON} </td>
+ <td class="tabled">{L_DATABASE_SIZE}{L_COLON}</td>
<td class="tabled"><strong>{DBSIZE}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+ <td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON}</td>
<td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+ <td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON}</td>
<td class="tabled"><strong>{DATABASE_INFO}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON} </td>
+ <td class="tabled">{L_GZIP_COMPRESSION}{L_COLON}</td>
<td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
</tr>
<tr>
- <td class="tabled">{L_PHP_VERSION}{L_COLON} </td>
+ <td class="tabled">{L_PHP_VERSION}{L_COLON}</td>
<td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
</tr>
<tr>
<!-- IF S_TOTAL_ORPHAN -->
- <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON} </td>
+ <td class="tabled">{L_NUMBER_ORPHAN}{L_COLON}</td>
<td class="tabled">
<!-- IF TOTAL_ORPHAN > 0 -->
<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
@@ -193,16 +190,14 @@
<!-- ENDIF -->
</td>
<!-- ELSE -->
-
<!-- ENDIF -->
</tr>
<!-- IF S_VERSIONCHECK -->
<tr>
- <td class="tabled">{L_BOARD_VERSION}{L_COLON} </td>
+ <td class="tabled">{L_BOARD_VERSION}{L_COLON}</td>
<td class="tabled">
<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
-
</tr>
<!-- ENDIF -->
</tbody>