mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-13 20:44:43 +01:00
Code Issues Releases Wiki Activity

Bug #3876

Browse Source 
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
This commit is contained in:
Dominik Dröscher 2006-09-23 11:17:03 +00:00
parent 6d08ef7b3a
commit d62e93ee30
3 changed files with 22 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/styles/subSilver/template/viewforum_subforum.html → phpBB/styles/subSilver/template/forumlist_body.html
View File

@ -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>&nbsp;</td>
</tr>
<tr>
<th colspan="2" nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th>
<th width="50" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="50" nowrap="nowrap">&nbsp;{L_POSTS}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
<th>&nbsp;{L_LAST_POST}&nbsp;</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>

66
phpBB/styles/subSilver/template/index_body.html
View File

@ -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>&nbsp;</td>
</tr>
<tr>
<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
<th>&nbsp;{L_LAST_POST}&nbsp;</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">&nbsp;</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 />

3
phpBB/styles/subSilver/template/viewforum_body.html
View File

@ -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 -->