diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 15:13:41 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 15:13:41 +0100 |
| commit | 13eb0ec5b990fa3197214a9d4b0d7659062e26f3 (patch) | |
| tree | 0171ccbc193051fec6680c6626dc04194b33ccc9 /phpBB/adm | |
| parent | 4de099d969f5fbe84b77c9cfe1cddcc368647773 (diff) | |
| parent | 5197e5afe387e331a80c39db4fa524562f615b97 (diff) | |
| download | forums-13eb0ec5b990fa3197214a9d4b0d7659062e26f3.tar forums-13eb0ec5b990fa3197214a9d4b0d7659062e26f3.tar.gz forums-13eb0ec5b990fa3197214a9d4b0d7659062e26f3.tar.bz2 forums-13eb0ec5b990fa3197214a9d4b0d7659062e26f3.tar.xz forums-13eb0ec5b990fa3197214a9d4b0d7659062e26f3.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
Conflicts:
phpBB/adm/style/acp_users_overview.html
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 1caa6e5e13..013be80465 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -30,7 +30,20 @@ </dl> <dl> <dt><label>{L_POSTS}{L_COLON}</label></dt> - <dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd> + <dd> + <strong> + <!-- IF USER_HAS_POSTS and U_SEARCH_USER --> + <a href="{U_SEARCH_USER}">{USER_POSTS}</a> + <!-- ELSE --> + {USER_POSTS} + <!-- ENDIF --> + </strong> + <!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> + (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>) + <!-- ELSEIF POSTS_IN_QUEUE --> + ({L_POSTS_IN_QUEUE}) + <!-- ENDIF --> + </dd> </dl> <dl> <dt><label>{L_WARNINGS}{L_COLON}</label></dt> |