diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-08-14 12:36:06 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-08-14 12:36:06 +0000 |
| commit | bbf42daf345f45349a76f39f260465d1a9055564 (patch) | |
| tree | 1f7fe23ba243a87c11a7a5e13b9ccc61bce658ec /phpBB/styles | |
| parent | b0c45b18f1bc742f419a7dbb685bcec0ff3781ad (diff) | |
| download | forums-bbf42daf345f45349a76f39f260465d1a9055564.tar forums-bbf42daf345f45349a76f39f260465d1a9055564.tar.gz forums-bbf42daf345f45349a76f39f260465d1a9055564.tar.bz2 forums-bbf42daf345f45349a76f39f260465d1a9055564.tar.xz forums-bbf42daf345f45349a76f39f260465d1a9055564.zip | |
Changes to group display #32155, #32145, #32085, #26675, #26265
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8755 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_body.html | 20 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_groups_manage.html | 36 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_groups_manage.html | 8 |
3 files changed, 43 insertions, 21 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 6846432b2e..9d138b9cae 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -72,7 +72,7 @@ <span class="corners-bottom"><span></span></span></div> </div> <!-- ENDIF --> - + <!-- IF S_LEADERS_SET --> <div class="forumbg forumbg-table"> <div class="inner"><span class="corners-top"><span></span></span> @@ -87,6 +87,7 @@ </tr> </thead> <tbody> + <!-- ENDIF --> <!-- BEGIN memberrow --> <!-- IF S_SHOW_GROUP --> <!-- IF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER --> @@ -95,12 +96,13 @@ <td colspan="<!-- IF U_SORT_ACTIVE -->5<!-- ELSE -->4<!-- ENDIF -->"> </td> </tr> <!-- ENDIF --> +<!-- IF S_LEADERS_SET --> </tbody> </table> <span class="corners-bottom"><span></span></span></div> </div> - +<!-- ENDIF --> <div class="forumbg"> <div class="inner"><span class="corners-top"><span></span></span> @@ -127,6 +129,20 @@ <!-- IF S_VIEWONLINE --><td>{memberrow.VISITED} </td><!-- ENDIF --> </tr> <!-- BEGINELSE --> + <div class="forumbg"> + <div class="inner"><span class="corners-top"><span></span></span> + + <table class="table1" cellspacing="1"> + <thead> + <tr> + <th class="name">{L_GROUP_MEMBERS}</th> + <th class="posts"> </th> + <th class="info"> </th> + <th class="joined"> </th> + <!-- IF U_SORT_ACTIVE --><th class="active"> </th><!-- ENDIF --> + </tr> + </thead> + <tbody> <tr class="bg1"> <td colspan="<!-- IF S_VIEWONLINE -->5<!-- ELSE -->4<!-- ENDIF -->">{L_NO_MEMBERS}</td> </tr> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index b64a3f63ea..47a8acb13a 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -1,6 +1,6 @@ <!-- INCLUDE ucp_header.html --> -<h2>{L_USERGROUPS}</h2> +<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{L_USERGROUPS}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h2> <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> @@ -79,6 +79,7 @@ <!-- ELSEIF S_LIST --> + <!-- IF .leader --> <table class="table1" cellspacing="1"> <thead> <tr> @@ -101,23 +102,10 @@ <!-- END leader --> </tbody> </table> + <!-- ENDIF --> - <table class="table1" cellspacing="1"> - <thead> - <tr> - <th class="name">{L_GROUP_APPROVED}</th> - <th class="info">{L_GROUP_DEFAULT}</th> - <th class="posts">{L_POSTS}</th> - <th class="joined">{L_JOINED}</th> - <th class="mark">{L_MARK}</th> - </tr> - </thead> - <tbody> <!-- BEGIN member --> <!-- IF member.S_PENDING --> - </tbody> - </table> - <table class="table1" cellspacing="1"> <thead> <tr> @@ -128,7 +116,23 @@ <th class="mark">{L_MARK}</th> </tr> </thead> - <tbody> + <tbody> + <!-- ELSEIF member.S_APPROVED --> + <!-- IF member.S_PENDING_SET --> + </tbody> + </table> + <!-- ENDIF --> + <table class="table1" cellspacing="1"> + <thead> + <tr> + <th class="name">{L_GROUP_APPROVED}</th> + <th class="info">{L_GROUP_DEFAULT}</th> + <th class="posts">{L_POSTS}</th> + <th class="joined">{L_JOINED}</th> + <th class="mark">{L_MARK}</th> + </tr> + </thead> + <tbody> <!-- ELSE --> <tr class="<!-- IF member.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> <td class="name">{member.USERNAME_FULL}</td> diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index 4a3296d153..6ae9816ca8 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -151,14 +151,16 @@ <td style="text-align: center;"></td> </tr> <!-- END leader --> - <tr> - <td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td> - </tr> + <!-- BEGIN member --> <!-- IF member.S_PENDING --> <tr> <td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td> </tr> + <!-- ELSEIF member.S_APPROVED --> + <tr> + <td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td> + </tr> <!-- ELSE --> <!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td>{member.USERNAME_FULL}</td> |