diff options
| author | Dominik Dröscher <dhn2@users.sourceforge.net> | 2006-09-23 11:17:03 +0000 |
|---|---|---|
| committer | Dominik Dröscher <dhn2@users.sourceforge.net> | 2006-09-23 11:17:03 +0000 |
| commit | d62e93ee30ad69f627e9ef9ba586caecf1ed7106 (patch) | |
| tree | 6486fa8c50d43bd87bedb47bbd00558e60fde351 /phpBB/styles/subSilver/template | |
| parent | 6d08ef7b3ab9e481cc56b94865bb07ade34a80ef (diff) | |
| download | forums-d62e93ee30ad69f627e9ef9ba586caecf1ed7106.tar forums-d62e93ee30ad69f627e9ef9ba586caecf1ed7106.tar.gz forums-d62e93ee30ad69f627e9ef9ba586caecf1ed7106.tar.bz2 forums-d62e93ee30ad69f627e9ef9ba586caecf1ed7106.tar.xz forums-d62e93ee30ad69f627e9ef9ba586caecf1ed7106.zip | |
Bug #3876
No need to have the forum list twice in the templates. Goodbye viewbody_subfourm, you served us well!
git-svn-id: file:///svn/phpbb/trunk@6390 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subSilver/template')
| -rw-r--r-- | phpBB/styles/subSilver/template/forumlist_body.html (renamed from phpBB/styles/subSilver/template/viewforum_subforum.html) | 38 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/index_body.html | 66 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/viewforum_body.html | 3 |
3 files changed, 22 insertions, 85 deletions
diff --git a/phpBB/styles/subSilver/template/viewforum_subforum.html b/phpBB/styles/subSilver/template/forumlist_body.html index 46f8ede834..238474c02a 100644 --- a/phpBB/styles/subSilver/template/viewforum_subforum.html +++ b/phpBB/styles/subSilver/template/forumlist_body.html @@ -1,13 +1,12 @@ - -<table class="tablebg" width="100%" cellspacing="1"> +<table class="tablebg" cellspacing="1" width="100%"> <tr> <td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a> </td> </tr> <tr> - <th colspan="2" nowrap="nowrap"> {L_FORUM} </th> - <th width="50" nowrap="nowrap"> {L_TOPICS} </th> - <th width="50" nowrap="nowrap"> {L_POSTS} </th> - <th nowrap="nowrap"> {L_LAST_POST} </th> + <th colspan="2"> {L_FORUM} </th> + <th width="50"> {L_TOPICS} </th> + <th width="50"> {L_POSTS} </th> + <th> {L_LAST_POST} </th> </tr> <!-- BEGIN forumrow --> <!-- IF forumrow.S_IS_CAT --> @@ -17,19 +16,18 @@ </tr> <!-- ELSEIF forumrow.S_IS_LINK --> <tr> - <td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> - <td class="row1"><a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br /> - <table cellspacing="5" cellpadding="0" border="0"> - <tr> - <td><span class="gensmall">{forumrow.FORUM_DESC}</span></td> - </tr> - </table> + <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> + <!-- IF forumrow.CLICKS --><td class="row1"><!-- ELSE --><td class="row1" colspan="4"><!-- ENDIF --> + <a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a> + <p class="forumdesc">{forumrow.FORUM_DESC}</p> </td> - <td class="row2" colspan="3" align="center" valign="middle"><!-- IF forumrow.CLICKS --><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td> + <!-- IF forumrow.CLICKS --> + <td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td> + <!-- ENDIF --> </tr> <!-- ELSE --> <tr> - <td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> + <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> <td class="row1" width="100%"> <a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a> <p class="forumdesc">{forumrow.FORUM_DESC}</p> @@ -47,7 +45,7 @@ <p class="topicdetails">{forumrow.LAST_POST_TIME}</p> <p class="topicdetails"> <!-- IF forumrow.U_LAST_POSTER --> - <a href="{forumrow.U_LAST_POSTER}"<!-- IF forumrow.LAST_POSTER_COLOUR --> style="color: {forumrow.LAST_POSTER_COLOUR}"<!-- ENDIF -->>{forumrow.LAST_POSTER}</a> + <a href="{forumrow.U_LAST_POSTER}"<!-- IF forumrow.LAST_POSTER_COLOUR --> style="font-weight: bold; color: {forumrow.LAST_POSTER_COLOUR}"<!-- ENDIF -->>{forumrow.LAST_POSTER}</a> <!-- ELSE --> {forumrow.LAST_POSTER} <!-- ENDIF --> @@ -59,7 +57,9 @@ </td> </tr> <!-- ENDIF --> +<!-- BEGINELSE --> + <tr> + <td class="row1" colspan="5" align="center"><p class="gensmall">{L_NO_FORUMS}</p></td> + </tr> <!-- END forumrow --> -</table> - -<br clear="all" /> +</table>
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 4374c44c3d..87788d9a07 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -8,71 +8,7 @@ <br clear="all" /><br /> <!-- ENDIF --> -<table class="tablebg" cellspacing="1" width="100%"> -<tr> - <td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a> </td> -</tr> -<tr> - <th colspan="2"> {L_FORUM} </th> - <th width="50"> {L_TOPICS} </th> - <th width="50"> {L_POSTS} </th> - <th> {L_LAST_POST} </th> -</tr> -<!-- BEGIN forumrow --> - <!-- IF forumrow.S_IS_CAT --> - <tr> - <td class="cat" colspan="2"><h4><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></h4></td> - <td class="catdiv" colspan="3"> </td> - </tr> - <!-- ELSEIF forumrow.S_IS_LINK --> - <tr> - <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> - <!-- IF forumrow.CLICKS --><td class="row1"><!-- ELSE --><td class="row1" colspan="4"><!-- ENDIF --> - <a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a> - <p class="forumdesc">{forumrow.FORUM_DESC}</p> - </td> - <!-- IF forumrow.CLICKS --> - <td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td> - <!-- ENDIF --> - </tr> - <!-- ELSE --> - <tr> - <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> - <td class="row1" width="100%"> - <a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a> - <p class="forumdesc">{forumrow.FORUM_DESC}</p> - <!-- IF forumrow.MODERATORS --> - <p class="forumdesc"><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}</p> - <!-- ENDIF --> - <!-- IF forumrow.SUBFORUMS --> - <p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}</p> - <!-- ENDIF --> - </td> - <td class="row2" align="center"><p class="topicdetails">{forumrow.TOPICS}</p></td> - <td class="row2" align="center"><p class="topicdetails">{forumrow.POSTS}</p></td> - <td class="row2" align="center" nowrap="nowrap"> - <!-- IF forumrow.LAST_POST_TIME --> - <p class="topicdetails">{forumrow.LAST_POST_TIME}</p> - <p class="topicdetails"> - <!-- IF forumrow.U_LAST_POSTER --> - <a href="{forumrow.U_LAST_POSTER}"<!-- IF forumrow.LAST_POSTER_COLOUR --> style="font-weight: bold; color: {forumrow.LAST_POSTER_COLOUR}"<!-- ENDIF -->>{forumrow.LAST_POSTER}</a> - <!-- ELSE --> - {forumrow.LAST_POSTER} - <!-- ENDIF --> - <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> - </p> - <!-- ELSE --> - <p class="topicdetails">{L_NO_POSTS}</p> - <!-- ENDIF --> - </td> - </tr> - <!-- ENDIF --> -<!-- BEGINELSE --> - <tr> - <td class="row1" colspan="5" align="center"><p class="gensmall">{L_NO_FORUMS}</p></td> - </tr> -<!-- END forumrow --> -</table> +<!-- INCLUDE forumlist_body.html --> <span class="gensmall"><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> | <a href="{U_TEAM}">{L_THE_TEAM}</a></span><br /> diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index 0042c6ac0c..28a6379629 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -88,7 +88,8 @@ <!-- ENDIF --> <!-- IF S_HAS_SUBFORUM --> - <!-- INCLUDE viewforum_subforum.html --> + <!-- INCLUDE forumlist_body.html --> + <br clear="all" /> <!-- ENDIF --> <!-- IF S_IS_POSTABLE --> |