X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=templates%2Fforum.tmpl;h=394264d884e013e99f558708a9360df27b0eb0da;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=f2b7585c979e85369827c213c646442b3fb58b01;hpb=01063993f1551b550d0f7d606bc0adab4bd85ed7;p=ndwebbie.git

diff --git a/templates/forum.tmpl b/templates/forum.tmpl
index f2b7585..394264d 100644
--- a/templates/forum.tmpl
+++ b/templates/forum.tmpl
@@ -1,16 +1,16 @@
-<h2><TMPL_VAR NAME=Title></h2>
-<h3>
+<TMPL_IF Title><h2><TMPL_VAR ESCAPE=NONE NAME=Title></h2></TMPL_IF>
 <TMPL_IF Category>
+<h3>
 <a href="/<TMPL_VAR NAME=Page>"><TMPL_VAR NAME=Category></a>
-</TMPL_IF>
 <TMPL_IF FBID>
 - <a href="/<TMPL_VAR NAME=Page>?b=<TMPL_VAR NAME=FBID>"><TMPL_VAR NAME=Board></a>
 </TMPL_IF>
 </h3>
+</TMPL_IF>
 <TMPL_IF Thread>
 
 <TMPL_IF Moderate><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=FTID>;cmd=<TMPL_VAR NAME=Sticky>">Make this thread <TMPL_VAR NAME=Sticky></a></TMPL_IF>
-<TMPL_VAR Thread>
+<TMPL_VAR ESCAPE=NONE Thread>
 </TMPL_IF>
 <TMPL_IF ViewBoard>
 <p><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></p>
@@ -21,14 +21,18 @@
 	<th>Unread</th>
 	<th>Total</th>
 	<th>Subject</th>
+	<th>Posted</th>
+	<th>Creator</th>
 	<th>Last post</th>
 </tr>
 <TMPL_LOOP Threads>
-	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td align="center"><TMPL_VAR NAME=Unread></td>
 		<td align="center"><TMPL_VAR NAME=Posts></td>
-		<td <TMPL_IF Sticky>class="sticky"</TMPL_IF>><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
-		<td align="center"><TMPL_VAR NAME=Last_post></td>
+		<td <TMPL_IF Sticky>class="sticky"</TMPL_IF>><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR ESCAPE=NONE NAME=Subject>&nbsp;</a></td>
+		<td align="left"><TMPL_VAR NAME=Posting_date></td>
+		<td align="center"><TMPL_VAR NAME=Username></td>
+		<td align="left"><TMPL_VAR NAME=Last_post></td>
 		<TMPL_IF Moderate><td><input type="checkbox" name="t:<TMPL_VAR NAME=Id>"/></td></TMPL_IF>
 	</tr>
 </TMPL_LOOP>
@@ -54,6 +58,7 @@ Move checked threads to: <select name="board">
 	<input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
 	<br/>
 	<input type="submit" name="cmd" value="Submit"/>
+	<input type="submit" name="cmd" value="Preview"/>
 </fieldset></form>
 </TMPL_IF>
 </TMPL_IF>
@@ -67,7 +72,7 @@ Move checked threads to: <select name="board">
 <TMPL_LOOP Categories>
 	<tr><th colspan="2"><TMPL_VAR NAME=Category></th></tr>
 	<TMPL_LOOP Boards>
-	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td align="center"><TMPL_VAR NAME=Unread></td>
 		<td><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></td>
 		<td align="center"><TMPL_VAR NAME=Last_post></td>
@@ -83,6 +88,8 @@ Move checked threads to: <select name="board">
 	<th>Unread</th>
 	<th>Total</th>
 	<th>Subject</th>
+	<th>Posted</th>
+	<th>Creator</th>
 	<th>Last post</th>
 </tr>
 <TMPL_LOOP Categories>
@@ -91,14 +98,16 @@ Move checked threads to: <select name="board">
 	<tr>
 		<th></th>
 		<th colspan="2"><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></th>
-		<th><a href="/<TMPL_VAR NAME=PAGE>/allUnread?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></th>
+		<th colspan="2"><a href="/<TMPL_VAR NAME=PAGE>/allUnread?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></th>
 	</tr>
 		<TMPL_LOOP Threads>
-	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td align="center"><TMPL_VAR NAME=Unread></td>
 		<td align="center"><TMPL_VAR NAME=Posts></td>
-		<td<TMPL_IF Sticky>class="sticky"</TMPL_IF>><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
-		<td align="center"><TMPL_VAR NAME=Last_post></td>
+		<td<TMPL_IF Sticky> class="sticky"</TMPL_IF>><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR ESCAPE=NONE NAME=Subject>&nbsp;</a></td>
+		<td align="left"><TMPL_VAR NAME=Posting_date></td>
+		<td align="center"><TMPL_VAR NAME=Username></td>
+		<td align="left"><TMPL_VAR NAME=Last_post></td>
 	</tr>
 		</TMPL_LOOP>
 	</TMPL_LOOP>