again, a lot of bug fixes

git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2007-07-19 20:38:38 +00:00
parent 870991c060
commit 75a5162945
54 changed files with 307 additions and 138 deletions
--- a/phpBB/styles/subsilver2/template/mcp_approve.html
+++ b/phpBB/styles/subsilver2/template/mcp_approve.html
@@ -11,7 +11,7 @@
 	<tr>
 		<td class="row1" align="center">
 			<!-- IF ADDITIONAL_MSG -->
-				<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
+				<span class="gen error">{ADDITIONAL_MSG}</span><br />
 			<!-- ENDIF -->
 			<!-- IF S_NOTIFY_POSTER -->
 				<input type="checkbox" class="radio" name="notify_poster" checked="checked" /><span class="gen"><!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></span><br />
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ b/phpBB/styles/subsilver2/template/mcp_move.html
@@ -11,7 +11,7 @@
 	<tr>
 		<td class="row1" align="center">
 			<!-- IF ADDITIONAL_MSG -->
-				<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
+				<span class="gen error">{ADDITIONAL_MSG}</span><br />
 			<!-- ENDIF -->
 			<!-- IF S_FORUM_SELECT -->
 				<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -138,10 +138,12 @@
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}: </td>
 				<td><!-- IF LOCATION --><b class="genmed">{LOCATION}</b><!-- ENDIF --></td>
 			</tr>
+			<!-- IF AGE -->
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}: </td>
-				<td><!-- IF AGE --><b class="genmed">{AGE}</b><!-- ENDIF --></td>
+				<td><b class="genmed"><!-- IF AGE -->{AGE}<!-- ELSE --> - <!-- ENDIF --></b></td>
 			</tr>
+			<!-- ENDIF -->
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_OCCUPATION}: </td>
 				<td><!-- IF OCCUPATION --><b class="genmed">{OCCUPATION}</b><!-- ENDIF --></td>
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -7,10 +7,10 @@
 <!-- IF S_FORUM_RULES -->
 	<div class="forumrules">
 		<!-- IF U_FORUM_RULES -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
 		<!-- ELSE -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			{FORUM_RULES}
 		<!-- ENDIF -->
 	</div>
@@ -110,7 +110,7 @@

 <!-- IF ERROR -->
 	<tr>
-		<td class="row2" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td>
+		<td class="row2" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->

--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -97,7 +97,7 @@
 		<!-- IF S_DISPLAY_GALLERY -->
 			<tr>
 				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td>
-				<td class="row2"><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>
+				<td class="row2"><input class="btnmain" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>
 			</tr>
 		<!-- ENDIF -->
 	<!-- ELSE -->
@@ -107,7 +107,7 @@
 		</tr>
 		<tr>
 			<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td>
-			<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></td>
+			<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="btnmain" type="submit" value="{L_GO}" name="display_gallery" /></td>
 		</tr>
 		<tr>
 			<td class="row1" width="35%">
@@ -126,14 +126,14 @@
 				<!-- END avatar_row -->
 				</table>
 			</td>
-			<td class="row2"><input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /></td>
+			<td class="row2"><input class="btnmain" type="submit" name="cancel" value="{L_CANCEL}" /></td>
 		</tr>

 	<!-- ENDIF -->

 	<tr>
-		<td class="cat" colspan="2" align="center"><input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
+		<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="btnmain" type="reset" id="reset" name="reset" value="{L_RESET}" /></td>
 	</tr>
 	</table>

@@ -187,7 +187,7 @@
 		</tr>
 	<!-- END member -->
 	<tr>
-		<td class="cat" colspan="5" align="center"><div style="float: {S_CONTENT_FLOW_END};"><span class="small"><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></span></div><div style="float: {S_CONTENT_FLOW_BEGIN};"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /></div></td>
+		<td class="cat" colspan="5" align="center"><div style="float: {S_CONTENT_FLOW_END};"><span class="small"><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></span></div><div style="float: {S_CONTENT_FLOW_BEGIN};"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" /></div></td>
 	</tr>
 	</table>

@@ -219,7 +219,7 @@
 		<td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="2" align="center"><input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /></td>
+		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="addusers" value="{L_SUBMIT}" /></td>
 	</tr>
 	</table>

--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
@@ -10,7 +10,7 @@

 <!-- IF ERROR -->
 	<tr>
-		<td class="row1" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td>
+		<td class="row1" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->

--- a/phpBB/styles/subsilver2/template/ucp_pm_options.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html
@@ -4,8 +4,8 @@
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	<tr>
 		<td class="row3" align="center">
-			<!-- IF ERROR_MESSAGE --><span class="genmed" style="color:red">{ERROR_MESSAGE}</span><!-- ENDIF -->
-			<!-- IF NOTIFICATION_MESSAGE --><span class="genmed" style="color:red">{NOTIFICATION_MESSAGE}</span><!-- ENDIF -->
+			<!-- IF ERROR_MESSAGE --><span class="genmed error">{ERROR_MESSAGE}</span><!-- ENDIF -->
+			<!-- IF NOTIFICATION_MESSAGE --><span class="genmed error">{NOTIFICATION_MESSAGE}</span><!-- ENDIF -->
 		</td>
 	</tr>
 	</table>
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
@@ -80,7 +80,7 @@
 				<!-- ENDIF -->

 				<!-- IF S_DISPLAY_NOTICE -->
-					<span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span>
+					<span class="gensmall error"><br /><br />{L_DOWNLOAD_NOTICE}</span>
 				<!-- ENDIF -->
 				<!-- IF SIGNATURE -->
 					<span class="postbody"><br />_________________<br />{SIGNATURE}</span>
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -24,7 +24,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr> 
--- a/phpBB/styles/subsilver2/template/ucp_prefs_post.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_post.html
@@ -6,7 +6,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr>
--- a/phpBB/styles/subsilver2/template/ucp_prefs_view.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_view.html
@@ -6,7 +6,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr>
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -6,7 +6,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr> 
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -6,7 +6,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr> 
@@ -48,10 +48,12 @@
 	<td class="row1" width="35%"><b class="genmed">{L_INTERESTS}: </b></td>
 	<td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td>
 </tr>
-<tr> 
-	<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td>
-	<td class="row2"><span class="genmed">{L_DAY}:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>
-</tr>
+<!-- IF S_BIRTHDAYS_ENABLED -->
+	<tr> 
+		<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td>
+		<td class="row2"><span class="genmed">{L_DAY}:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>
+	</tr>
+<!-- ENDIF -->
 <!-- BEGIN profile_fields -->
 	<tr> 
 		<td class="row1" width="35%">
@@ -59,7 +61,7 @@
 			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->
 			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
 		</td>
-		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall" style="color:red">{profile_fields.ERROR}</span><!-- ENDIF --></td>
+		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td>
 	</tr>
 <!-- END profile_fields -->
 <tr>
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
@@ -11,7 +11,7 @@
 <!-- ENDIF -->
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr>
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -22,7 +22,7 @@

 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</td>
 	</tr>
 <!-- ENDIF -->

@@ -72,7 +72,7 @@
 			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->
 			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
 		</td>
-		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall" style="color:red">{profile_fields.ERROR}</span><!-- ENDIF --></td>
+		<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td>
 	</tr>
 <!-- END profile_fields -->

--- a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
+++ b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
@@ -9,7 +9,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr>
--- a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
+++ b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
@@ -9,7 +9,7 @@
 </tr>
 <!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 <tr>
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -3,10 +3,10 @@
 <!-- IF S_FORUM_RULES -->
 	<div class="forumrules">
 		<!-- IF U_FORUM_RULES -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
 		<!-- ELSE -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			{FORUM_RULES}
 		<!-- ENDIF -->
 	</div>
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -3,10 +3,10 @@
 <!-- IF S_FORUM_RULES -->
 	<div class="forumrules">
 		<!-- IF U_FORUM_RULES -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
 		<!-- ELSE -->
-			<h3 style="color:red">{L_FORUM_RULES}</h3><br />
+			<h3>{L_FORUM_RULES}</h3><br />
 			{FORUM_RULES}
 		<!-- ENDIF -->
 	</div>
@@ -230,7 +230,7 @@
 					<!-- ENDIF -->

 					<!-- IF postrow.S_DISPLAY_NOTICE -->
-						<span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span>
+						<span class="gensmall error"><br /><br />{L_DOWNLOAD_NOTICE}</span>
 					<!-- ENDIF -->
 					<!-- IF postrow.SIGNATURE -->
 						<span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span>
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -94,6 +94,10 @@ body {
 	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
 }

+.forumrules h3 {
+	color: red;
+}
+
 #pageheader { }
 #pagecontent { }
 #pagefooter { }