From c0caf7652fb699ec38488df6f52f354534dd22d1 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 17 May 2007 14:59:33 +0000
Subject: Fixing some tiny bugs... - correctly close span tags within code=php

git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/index_body.html        | 4 +++-
 phpBB/styles/prosilver/template/mcp_forum.html         | 8 ++++----
 phpBB/styles/prosilver/template/mcp_queue.html         | 4 ++--
 phpBB/styles/prosilver/template/mcp_topic.html         | 4 ++--
 phpBB/styles/prosilver/template/overall_header.html    | 2 +-
 phpBB/styles/prosilver/template/posting_pm_layout.html | 2 +-
 phpBB/styles/subsilver2/template/mcp_footer.html       | 2 +-
 phpBB/styles/subsilver2/template/posting_body.html     | 2 +-
 8 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index d702e88ea4..a2888610da 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -4,7 +4,9 @@
 <!-- IF U_MCP --><p> [&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
 
 <ul class="linklist">
-	<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
+	<!-- IF S_DISPLAY_SEARCH -->
+		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
+	<!-- ENDIF -->
 	<!-- IF S_USER_LOGGED_IN and not S_IS_BOT --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
 </ul>
 
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 86889d35ea..d05f9401ff 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -10,10 +10,10 @@
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
-	<!-- IF PAGINATION or TOTAL -->
+	<!-- IF PAGINATION or TOTAL_TOPICS -->
 		<ul class="linklist">
 			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF -->
+				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
 			</li>
 		</ul>
@@ -70,10 +70,10 @@
 
 	<hr />
 
-	<!-- IF PAGINATION or TOTAL -->
+	<!-- IF PAGINATION or TOTAL_TOPICS -->
 		<ul class="linklist">
 			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF -->
+				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
 			</li>
 		</ul>
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index b762c393eb..096ed8243a 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -17,7 +17,7 @@
 	<!-- IF .postrow -->
 		<ul class="linklist">
 			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF -->
+				<!-- IF TOTAL --> {TOTAL}<!-- ENDIF -->
 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
 			</li>
 		</ul>	
@@ -72,7 +72,7 @@
 
 		<ul class="linklist">
 			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL} {L_TOPICS}<!-- ENDIF -->
+				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
 			</li>
 		</ul>		
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 256c83fb37..f27ab7f5d0 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -129,10 +129,10 @@ onload_functions.push('subPanels()');
 
 	<hr />
 
-	<!-- IF PAGINATION or TOTAL -->
+	<!-- IF PAGINATION or TOTAL_POSTS -->
 	<ul class="linklist">
 		<li class="rightside pagination">
-			<!-- IF TOTAL --> {TOTAL} {L_POSTS}<!-- ENDIF -->
+			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS}<!-- ENDIF -->
 			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
 		</li>
 	</ul>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 5404d8b4ff..bb5ca7e35b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -106,7 +106,7 @@
 				<p style="display: none;"><a href="#start_here">{L_SKIP}</a></p>
 			</div>
 
-		<!-- IF not S_IN_SEARCH -->
+		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 			<div id="search-box">
 				<form action="{U_SEARCH}" method="get" id="search">
 				<fieldset>
diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html
index a77870992b..378c632858 100644
--- a/phpBB/styles/prosilver/template/posting_pm_layout.html
+++ b/phpBB/styles/prosilver/template/posting_pm_layout.html
@@ -5,7 +5,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 		
 		<h3>{L_INFORMATION}</h3>
-		<p>{L_DRAFT_LOADED}</p>
+		<p>{L_DRAFT_LOADED_PM}</p>
 		
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html
index 790c093be6..3105c15ae4 100644
--- a/phpBB/styles/subsilver2/template/mcp_footer.html
+++ b/phpBB/styles/subsilver2/template/mcp_footer.html
@@ -7,7 +7,7 @@
 		<table width="80%" align="{S_CONTENT_FLOW_END}" cellspacing="1">
 		<tr>
 			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-			<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL} ]&nbsp;</td>
+			<td class="gensmall" nowrap="nowrap">&nbsp;[ <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ELSEIF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ELSE -->{TOTAL}<!-- ENDIF --> ]&nbsp;</td>
 			<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
 		</tr>
 		</table>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 492bd445a7..e8d6332c9f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -43,7 +43,7 @@
 		<th align="center">{L_INFORMATION}</th>
 	</tr>
 	<tr>
-		<td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td>
+		<td class="row1" align="center"><span class="gen"><!-- IF S_PRIVMSGS -->{L_DRAFT_LOADED_PM}<!-- ELSE -->{L_DRAFT_LOADED}<!-- ENDIF --></span></td>
 	</tr>
 	</table>
 
-- 
cgit v1.2.1