diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-25 13:15:52 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-25 13:15:52 +0100 |
| commit | 56062a2635551c29b1b983e000f0d1ee6a482fb9 (patch) | |
| tree | 7cd9a42f9fc9e9c9d57d71d21b38b4cb0686091c /phpBB/adm | |
| parent | 8e8051f41d45199a5b8417504081672fa312731d (diff) | |
| parent | 57ce891d5f2c0b7090d44fac074ab27b4f98b93b (diff) | |
| download | forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.gz forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.bz2 forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.xz forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.zip | |
Merge pull request #4009 from cunha17/ticket/14253
* cunha17-master:
[ticket/14253] Show group requests pending aproval at the ACP groups summary
[ticket/14253] Show group requests pending aproval at the ACP groups summary
fixes #4009
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 23f6e744c0..ffde27a437 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -267,11 +267,12 @@ <!-- EVENT acp_groups_manage_before --> <table class="table1"> - <col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" /> + <col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" /> <thead> <tr> <th style="width: 50%">{L_GROUP}</th> <th>{L_TOTAL_MEMBERS}</th> + <th>{L_PENDING_MEMBERS}</th> <th colspan="2">{L_OPTIONS}</th> <th>{L_ACTION}</th> </tr> @@ -281,7 +282,7 @@ <!-- IF groups.S_SPECIAL --> <!-- IF groups.S_FIRST_ROW --> <tr> - <td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td> + <td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td> </tr> <!-- ENDIF --> </tbody> @@ -302,11 +303,12 @@ <p>{L_SPECIAL_GROUPS_EXPLAIN}</p> <table class="table1"> - <col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" /> + <col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /> <thead> <tr> <th style="width: 50%">{L_GROUP}</th> <th>{L_TOTAL_MEMBERS}</th> + <th>{L_PENDING_MEMBERS}</th> <th colspan="2">{L_OPTIONS}</th> <th>{L_ACTION}</th> </tr> @@ -316,6 +318,7 @@ <tr> <td><strong>{groups.GROUP_NAME}</strong></td> <td style="text-align: center;">{groups.TOTAL_MEMBERS}</td> + <td style="text-align: center;">{groups.PENDING_MEMBERS}</td> <td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td> <td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td> <td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td> |