From e593bcf3d7ff2636b9e0ea578cbd7b795e135a38 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 5 Sep 2004 15:45:50 +0000
Subject: - re-enable polls (user is now able to decide if users are able to
 change votes if this feature is enabled within the given forum)

git-svn-id: file:///svn/phpbb/trunk@4981 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../subSilver/template/posting_poll_body.html      | 11 ++++++++---
 .../styles/subSilver/template/posting_preview.html | 22 +++++++++++++++++-----
 .../subSilver/template/ucp_pm_viewmessage.html     |  2 +-
 .../styles/subSilver/template/viewtopic_body.html  |  8 +++++++-
 4 files changed, 33 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subSilver/template/posting_poll_body.html b/phpBB/styles/subSilver/template/posting_poll_body.html
index d3073557d5..146d2780b3 100644
--- a/phpBB/styles/subSilver/template/posting_poll_body.html
+++ b/phpBB/styles/subSilver/template/posting_poll_body.html
@@ -7,21 +7,26 @@
 		<td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="genmed">{L_POLL_QUESTION}</b></td>
+		<td class="row1"><b class="genmed">{L_POLL_QUESTION}:</b></td>
 		<td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="genmed">{L_POLL_OPTIONS}</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>
+		<td class="row1"><b class="genmed">{L_POLL_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>
 		<td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
+		<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
 		<td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_POLL_FOR}</b></td>
 		<td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>
 	</tr>
+	<!-- IF S_POLL_VOTE_CHANGE -->
+	<tr>
+		<td class="row1"><b class="genmed">{L_POLL_VOTE_CHANGE}:</b><br /><span class="gensmall">{L_POLL_VOTE_CHANGE_EXPLAIN}</span></td>
+		<td class="row2"><input type="checkbox" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /></td>
+	<!-- ENDIF -->
 	<!-- IF S_POLL_DELETE -->
     <tr>
 		<td class="row1"><b class="genmed">{L_POLL_DELETE}</b></td>
diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html
index d8270dbd25..813ba21875 100644
--- a/phpBB/styles/subSilver/template/posting_preview.html
+++ b/phpBB/styles/subSilver/template/posting_preview.html
@@ -12,19 +12,31 @@
 		<td class="row2" colspan="2"><br clear="all" />
 			<table cellspacing="0" cellpadding="4" border="0" align="center">
 			<tr>
-				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td>
+				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
 			</tr>
 			<tr>
-				<td align="center"><table cellspacing="0" cellpadding="2" border="0">
+				<td align="center">
+					<table cellspacing="0" cellpadding="2" border="0">
 					<!-- BEGIN poll_option -->
 					<tr>
-						<td><input type="radio" name="vote_id" value="" />&nbsp;</td>
+						<td>
+							<!-- IF S_IS_MULTI_CHOICE -->
+								<input type="checkbox" name="vote_id" value="" />
+							<!-- ELSE -->
+								<input type="radio" name="vote_id" value="" />
+							<!-- ENDIF -->
+						</td>
 						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
 					</tr>
 					<!-- END poll_option -->
-				</table></td>
+					</table>
+				</td>
 			</tr>
-		</table></td>
+			<tr>
+				<td align="center"><span class="gensmall">{L_MAX_VOTES}</span></td>
+			</tr>
+			</table>
+		</td>
 	</tr>
 	<!-- ENDIF -->
 	<tr> 
diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html
index ba82081e04..5b22975b9b 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html
@@ -143,7 +143,7 @@
 
 					<table width="100%" cellspacing="0">
 						<tr valign="middle">
-							<td class="gensmall" align="right"><!-- IF U_REPORT --><a href="{U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> <!-- IF U_IP --><a href="{U_IP}">{IP_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
+							<td class="gensmall" align="right"><!-- IF U_REPORT --><a href="{U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
 						</tr>
 					</table>
 
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index 993e887d46..9c383feae7 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -69,7 +69,13 @@
 								<!-- BEGIN poll_option -->
 								<tr>
 									<!-- IF S_CAN_VOTE -->
-									<td><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF -->/><!-- ELSE --><input type="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF -->&nbsp;</td>
+									<td>
+										<!-- IF S_IS_MULTI_CHOICE -->
+											<input type="checkbox" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> />
+										<!-- ELSE -->
+											<input type="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> />
+										<!-- ENDIF -->
+									</td>
 									<!-- ENDIF -->
 									<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
 									<!-- IF S_DISPLAY_RESULTS -->
-- 
cgit v1.2.1