From e70cea16b90ba50a6a05aa1e1b091f04805a7c1a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 10 Apr 2007 20:50:14 +0000
Subject: checking in some fixes... also added "previous/next pm in history"
 links to prosilvers private message view; dhn, you may want to have a look at
 the placement. :)

git-svn-id: file:///svn/phpbb/trunk@7322 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/mcp_queue.html     |  2 +-
 .../prosilver/template/ucp_pm_viewfolder.html      | 32 +++++++++++-----------
 .../prosilver/template/ucp_pm_viewmessage.html     |  8 ++++++
 phpBB/styles/prosilver/template/ucp_register.html  |  4 +--
 .../styles/prosilver/template/viewforum_body.html  |  2 +-
 .../styles/prosilver/template/viewtopic_body.html  |  6 ++--
 phpBB/styles/prosilver/theme/colours.css           |  2 +-
 7 files changed, 32 insertions(+), 24 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index 0a94408379..4c82c61cd9 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -76,7 +76,7 @@
 			</li>
 		</ul>		
 	<!-- ELSE -->
-		<p class="notopics"><strong>{L_NO_POSTS}</strong></p>
+		<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></strong></p>
 	<!-- ENDIF -->
 
 	<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 889ace76d4..432a686747 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -76,15 +76,12 @@
 	<!-- ENDIF -->
 	
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box left">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box right">{L_NEXT}</a><!-- ENDIF -->
-		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label> 
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
+	<fieldset class="display-actions">
+		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
+		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
+		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>			
 	</fieldset>
-	
+
 	<hr />
 	
 	<ul class="linklist">
@@ -99,15 +96,18 @@
 	
 		<span class="corners-bottom"><span></span></span></div>	
 	</div>
-	
-	<!-- IF .messagerow -->
-		<fieldset class="display-actions">
-			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
-			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>			
-		</fieldset>
+
+	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
+	<fieldset class="display-options">
+		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box left">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box right">{L_NEXT}</a><!-- ENDIF -->
+		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label> 
+		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
+		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
+	</fieldset>
 	<!-- ENDIF -->
-	
+
 	<!-- INCLUDE ucp_pm_message_footer.html -->
 <!-- ENDIF -->
 <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 5fb6e2c573..904605485d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -5,6 +5,14 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
+<!-- IF S_DISPLAY_HISTORY -->
+	<fieldset class="display-options">
+		<a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box left">{L_VIEW_PREVIOUS_HISTORY}</a>
+		<a href="{U_VIEW_NEXT_HISTORY}" class="right-box right">{L_VIEW_NEXT_HISTORY}</a>
+	</fieldset>
+<!-- ENDIF -->
+
+
 <div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index ceade00ca6..3de28b0c43 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -35,11 +35,11 @@
 	</dl>
 	<dl>
 		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="255" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /></dd>
+		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="255" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
-		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd>
+		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index c9fb73f6d6..1049617f66 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -183,7 +183,7 @@
 
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
 	<div class="topic-actions">
-		<!-- IF S_IS_POSTABLE -->
+		<!-- IF S_IS_POSTABLE and not S_IS_BOT -->
 		<div class="buttons">
 			<div class="post-icon"><a href="{U_POST_NEW_TOPIC}"><span>{L_POST_REPLY}</span></a></div>
 		</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 39efce34cd..494686f419 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -32,7 +32,7 @@
 
 	<div class="buttons">
 	<!-- IF not S_IS_BOT -->
-		<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_VIEW_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
+		<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
 
@@ -51,7 +51,7 @@
 
 	<!-- IF PAGINATION or TOTAL_POSTS -->
 		<div class="pagination">
-			<!-- IF U_VIEW_UNREAD_POST --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
+			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
 			<!-- 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 -->
 		</div>
 	<!-- ENDIF -->
@@ -234,7 +234,7 @@
 <div class="topic-actions">
 	<div class="buttons">
 	<!-- IF not S_IS_BOT -->
-		<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_VIEW_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
+		<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 92e5cc8e36..6c19877fff 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -822,7 +822,7 @@ dl.mini dt {
 }
 
 .pmlist li.pm_marked_colour, .pm_marked_colour {
-	border-left-color: #FF6600;
+	border-color: #FF6600;
 }
 
 .pmlist li.pm_replied_colour, .pm_replied_colour {
-- 
cgit v1.2.1