diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:14:56 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:14:56 +0200 |
| commit | 4cbf619fd597bedb8b61291928869ec6bad353f3 (patch) | |
| tree | 59199bc99df71dbb2031e0707d2c8976ca165a51 /phpBB | |
| parent | 2b233452c7355026cb55a715711506cd3c1985ef (diff) | |
| parent | f677376b8ca4451e3a0c415f603ad1513ed24ef7 (diff) | |
| download | forums-4cbf619fd597bedb8b61291928869ec6bad353f3.tar forums-4cbf619fd597bedb8b61291928869ec6bad353f3.tar.gz forums-4cbf619fd597bedb8b61291928869ec6bad353f3.tar.bz2 forums-4cbf619fd597bedb8b61291928869ec6bad353f3.tar.xz forums-4cbf619fd597bedb8b61291928869ec6bad353f3.zip | |
Merge pull request #4705 from nomind60s/ticket/15097
[ticket/15097] Add PHP version to Board statistics
* github.com:phpbb/phpbb:
[ticket/15097] New 'Installed software' lead section
[ticket/15097] Resolve travis-ci error
[ticket/15097] Resolve travis-ci error
[ticket/15097] Add PHP version to Board statistics
[ticket/15097] Add PHP version to Board statistics
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 55 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 7 |
3 files changed, 42 insertions, 21 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 1bdb7b8d2a..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> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ] + </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,29 +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> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ] - </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> </td> <td> </td> <!-- ENDIF --> </tr> - <!-- ENDIF --> </tbody> </table> diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index bb85d080ce..9b1a248923 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -577,6 +577,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), + 'PHP_VERSION_INFO' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index ac2c9da84d..9be3cc9676 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -367,7 +367,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', @@ -395,6 +395,7 @@ $lang = array_merge($lang, array( 'NUMBER_USERS' => 'Number of users', 'NUMBER_ORPHAN' => 'Orphan attachments', + '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', @@ -429,6 +430,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', |