aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornomind60s <nomind60s@users.noreply.github.com>2017-02-19 11:49:07 -0700
committernomind60s <nomind60s@users.noreply.github.com>2017-02-19 11:49:07 -0700
commitf677376b8ca4451e3a0c415f603ad1513ed24ef7 (patch)
treee41b536034d98e952c15a65a83483183c34f2299
parent16dbc4195af2244405c201b49de7be8f25085eb2 (diff)
downloadforums-f677376b8ca4451e3a0c415f603ad1513ed24ef7.tar
forums-f677376b8ca4451e3a0c415f603ad1513ed24ef7.tar.gz
forums-f677376b8ca4451e3a0c415f603ad1513ed24ef7.tar.bz2
forums-f677376b8ca4451e3a0c415f603ad1513ed24ef7.tar.xz
forums-f677376b8ca4451e3a0c415f603ad1513ed24ef7.zip
[ticket/15097] New 'Installed software' lead section
Created a new lead section showing the installed software (phpBB, PHP and Database server) and their versions. Implementation is inspired by MediaWiki's Special:Version page. Removed those items from Board statistics section. PHPBB3-15097
-rw-r--r--phpBB/adm/style/acp_main.html59
-rw-r--r--phpBB/language/en/acp/common.php8
2 files changed, 41 insertions, 26 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 5f8040b57e..e306ce78e9 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,15 +94,45 @@
<!-- EVENT acp_main_notice_after -->
+ <table class="table1 no-header" style="width: auto;" data-no-responsive-header="true">
+ <caption>{L_SOFTWARE_HEADING}</caption>
+ <col class="col1" /><col class="col2" />
+ <thead>
+ <tr>
+ <th>{L_SOFTWARE_PRODUCT}</th>
+ <th>{L_SOFTWARE_VERSION}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{L_BOARD_VERSION}</td>
+ <!-- IF S_VERSIONCHECK -->
+ <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> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+ </td>
+ <!-- ELSE -->
+ <td><strong>{BOARD_VERSION}</strong></td>
+ <!-- ENDIF -->
+ </tr>
+ <tr>
+ <td>{L_PHP_VERSION}</td>
+ <td><strong>{PHP_VERSION_INFO}</strong></td>
+ </tr>
+ <tr>
+ <td>{L_DATABASE_SERVER_INFO}</td>
+ <td><strong>{DATABASE_INFO}</strong></td>
+ </tr>
+ </tbody>
+ </table>
+
<table class="table1 two-columns no-header" data-no-responsive-header="true">
<caption>{L_FORUM_STATS}</caption>
<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
<thead>
<tr>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
- <th>{L_STATISTIC}</th>
- <th>{L_VALUE}</th>
+ <th style="width: 25%">{L_STATISTIC}</th>
+ <th style="width: 25%">{L_VALUE}</th>
+ <th style="width: 25%">{L_STATISTIC}</th>
+ <th style="width: 25%">{L_VALUE}</th>
</tr>
</thead>
<tbody>
@@ -130,8 +160,6 @@
<td>{L_FILES_PER_DAY}{L_COLON} </td>
<td><strong>{FILES_PER_DAY}</strong></td>
</tr>
-
-
<tr>
<td>{L_BOARD_STARTED}{L_COLON} </td>
<td><strong>{START_DATE}</strong></td>
@@ -145,33 +173,16 @@
<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
</tr>
<tr>
- <td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
- <td><strong>{DATABASE_INFO}</strong></td>
<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
<td><strong>{GZIP_COMPRESSION}</strong></td>
- </tr>
- <!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
- <tr>
- <!-- IF S_VERSIONCHECK -->
- <td>{L_BOARD_VERSION}{L_COLON} </td>
- <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> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
- </td>
- <!-- ENDIF -->
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
<td><strong>{TOTAL_ORPHAN}</strong></td>
- <!-- ENDIF -->
- <!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
+ <!-- ELSE -->
<td>&nbsp;</td>
<td>&nbsp;</td>
<!-- ENDIF -->
</tr>
- <tr>
- <td>{L_PHP_VERSION}{L_COLON} </td>
- <td><strong>{PHP_VERSION_INFO}</strong></td>
- </tr>
- <!-- ENDIF -->
</tbody>
</table>
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5c9e31f028..f67aba162c 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -345,7 +345,7 @@ $lang = array_merge($lang, array(
'AVATAR_DIR_SIZE' => 'Avatar directory size',
'BOARD_STARTED' => 'Board started',
- 'BOARD_VERSION' => 'Board version',
+ 'BOARD_VERSION' => 'phpBB',
'DATABASE_SERVER_INFO' => 'Database server',
'DATABASE_SIZE' => 'Database size',
@@ -373,7 +373,7 @@ $lang = array_merge($lang, array(
'NUMBER_USERS' => 'Number of users',
'NUMBER_ORPHAN' => 'Orphan attachments',
- 'PHP_VERSION' => 'PHP version',
+ 'PHP_VERSION' => 'PHP',
'PHP_VERSION_OLD' => 'The version of PHP on this server (%1$s) will no longer be supported by future versions of phpBB. The minimum required version will be PHP %2$s. %3$sDetails%4$s',
'POSTS_PER_DAY' => 'Posts per day',
@@ -408,6 +408,10 @@ $lang = array_merge($lang, array(
'RESYNC_STATS_SUCCESS' => 'Resynchronised statistics',
'RUN' => 'Run now',
+ 'SOFTWARE_HEADING' => 'Installed software',
+ 'SOFTWARE_PRODUCT' => 'Product',
+ 'SOFTWARE_VERSION' => 'Version',
+
'STATISTIC' => 'Statistic',
'STATISTIC_RESYNC_OPTIONS' => 'Resynchronise or reset statistics',