From 6205be1e746dd51dface756fbeb8b7fc702e1d80 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 6 May 2007 15:31:39 +0000
Subject: #9828, #10545, #10541, #10533, #10529, #10527, #10521, #10503, #10481
 - more label fixes - simpler approach to get input cursor text

git-svn-id: file:///svn/phpbb/trunk@7485 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/mcp_topic.html            |  3 ++-
 phpBB/styles/prosilver/template/memberlist_im.html        | 10 +++-------
 phpBB/styles/prosilver/template/posting_topic_review.html |  2 +-
 phpBB/styles/prosilver/template/ucp_main_front.html       |  2 +-
 phpBB/styles/prosilver/template/ucp_pm_history.html       |  2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html       |  7 ++++++-
 6 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index f828ffa72e..80886b477d 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -95,8 +95,9 @@ onload_functions.push('subPanels()');
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
+
 	<h3 id="review">
-		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'),true);">Expand view</a></span>
+		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 		{L_TOPIC_REVIEW}: {TOPIC_TITLE}
 	</h3>
 
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index cf12aa631f..7ebe1e3472 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -19,11 +19,11 @@
 	<!-- IF S_SEND_ICQ -->
 		<dl class="fields2">
 			<dt><label for="from">{L_IM_NAME}:</label></dt>
-			<dd><input class="inputbox" type="text" name="from" id="from" size="20" maxlength="40" /></dd>
+			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" maxlength="40" /></dd>
 		</dl>
 		<dl class="fields2">
 			<dt><label for="body">{L_IM_MESSAGE}:</label></dt>
-			<dd><textarea class="inputbox" name="body" id="body" rows="5" cols="45"></textarea></dd>
+			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd>
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
@@ -54,7 +54,7 @@
 	<!-- IF S_SEND_JABBER -->
 		<dl class="fields2">
 			<dt><label for="message">{L_IM_MESSAGE}:</label></dt>
-			<dd><textarea class="inputbox" name="message" id="message" rows="5" cols="45"></textarea></dd>
+			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
@@ -67,10 +67,6 @@
 			<dt>&nbsp;</dt>
 			<dd>{L_IM_NO_JABBER}</dd>
 		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_SENT_JABBER -->
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index d999d344da..19b52d3738 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -1,6 +1,6 @@
 
 <h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if  (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; return false}; if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
+	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 	{L_TOPIC_REVIEW}: {TOPIC_TITLE}
 </h3>
 
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 008f5f2b3d..d49166fe62 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -19,7 +19,7 @@
 					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
 					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
 				</dt>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
+				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
 					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index aedf488f9d..f90c75f10d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -1,6 +1,6 @@
 
 <h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if  (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; return false}; if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
+	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 	{L_MESSAGE_HISTORY}: {TITLE}
 </h3>
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index a1db3d514a..e376bf5390 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -170,7 +170,12 @@
 
 		<!-- IF not postrow.S_IGNORE_POST -->
 			<dl class="postprofile" id="profile{postrow.POST_ID}">
-			<dt><!-- IF postrow.POSTER_AVATAR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><br /><!-- ENDIF -->{postrow.POST_AUTHOR_FULL}</dt>
+			<dt>
+				<!-- IF postrow.POSTER_AVATAR -->
+					<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><!-- ELSE -->{postrow.POSTER_AVATAR}<!-- ENDIF --><br />
+				<!-- ENDIF -->
+				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
+			</dt>
 
 			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
 
-- 
cgit v1.2.1