Mark given set of forums marked, show "Mark forums read" link on subforum display

git-svn-id: file:///svn/phpbb/trunk@4757 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-08-12 03:34:04 +02:00 · 2004-01-12 15:00:09 +00:00
parent 38c0873243
commit bc79bf9652
7 changed files with 152 additions and 167 deletions
--- a/phpBB/styles/subSilver/template/index_body.html
+++ b/phpBB/styles/subSilver/template/index_body.html
@@ -4,7 +4,7 @@

 	<table class="tablebg" cellspacing="1">
 		<tr>
-			<td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_READ}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>
+			<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>
--- a/phpBB/styles/subSilver/template/viewforum_body.html
+++ b/phpBB/styles/subSilver/template/viewforum_body.html
@@ -56,7 +56,7 @@
 				<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><table width="100%" cellspacing="0">
 					<tr class="nav">
 						<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM -->{S_WATCH_FORUM}<!-- ENDIF --></td>
-						<td align="right" valign="middle"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a>&nbsp;</td>
+						<td align="right" valign="middle"><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a>&nbsp;</td>
 					</tr>
 				</table></td>
 			</tr>
--- a/phpBB/styles/subSilver/template/viewforum_subforum.html
+++ b/phpBB/styles/subSilver/template/viewforum_subforum.html
@@ -1,43 +1,48 @@

-<table class="tablebg" width="100%" cellspacing="1">
-	<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>
-	</tr>
-	<!-- BEGIN forumrow -->
-	<!-- IF forumrow.S_IS_CAT -->
-	<tr>
-		<td class="cat" colspan="2"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
-		<td class="catdiv" colspan="3" align="right">&nbsp;</td>
-	</tr>
-	<!-- ELSEIF forumrow.S_IS_LINK -->
-	<tr>
-		<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-		<td class="row1" height="50"><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>
-		<td class="row2" colspan="3" align="center" valign="middle" height="50"><!-- IF forumrow.CLICKS --><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td>
-	</tr>
-	<!-- ELSE -->
-	<tr>
-		<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-		<td class="row1" width="100%" height="50" valign="top"><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><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
-		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- END forumrow -->
-</table>
+	<!-- $Id$ -->

-<br clear="all" />
+	<table class="tablebg" width="100%" cellspacing="1">
+		<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>
+		</tr>
+		<!-- BEGIN forumrow -->
+		<!-- IF forumrow.S_IS_CAT -->
+		<tr>
+			<td class="cat" colspan="2"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td>
+			<td class="catdiv" colspan="3" align="right">&nbsp;</td>
+		</tr>
+		<!-- ELSEIF forumrow.S_IS_LINK -->
+		<tr>
+			<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
+			<td class="row1" height="50"><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>
+			<td class="row2" colspan="3" align="center" valign="middle" height="50"><!-- IF forumrow.CLICKS --><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td>
+		</tr>
+		<!-- ELSE -->
+		<tr>
+			<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
+			<td class="row1" width="100%" height="50" valign="top"><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><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
+			<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
+			<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
+			<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
+		</tr>
+		<!-- ENDIF -->
+		<!-- END forumrow -->
+	</table>
+
+	<br clear="all" />