Majority are UCP related updates ... avatars should now work, aside from gallery, fixed a few other issues, updated schema/basic

git-svn-id: file:///svn/phpbb/trunk@4062 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2003-05-26 23:53:34 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2003-05-26 23:53:34 +0000
commit: e1484f522d28194c63d424bc621b93d3cf8865b9 (patch)
tree: a6c2e5b249ac9c688525f24737fc8e29d1c669e1 /phpBB/templates
parent: 4e71b1b96d21e78463a768004c1c8ed2e1d952d5 (diff)
download: forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar
forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.gz
forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.bz2
forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.xz
forums-e1484f522d28194c63d424bc621b93d3cf8865b9.zip
5 files changed, 90 insertions, 61 deletions
diff --git a/phpBB/templates/subSilver/index_body.html b/phpBB/templates/subSilver/index_body.html
index 45ae012404..4ef32bd52d 100644
--- a/phpBB/templates/subSilver/index_body.html
+++ b/phpBB/templates/subSilver/index_body.html
@@ -91,7 +91,7 @@
 	</tr>
 	<tr>
 		<td class="row1" width="46" align="center" valign="middle"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-		<td class="row1" width="100%" align="left"><span class="gensmall">{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b></span></td>
+		<td class="row1" width="100%" align="left"><span class="gensmall"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></span></td>
 	</tr>
 </table>
 <!-- ENDIF -->
diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css
index a9fe6745e8..24afc9ffa2 100644
--- a/phpBB/templates/subSilver/subSilver.css
+++ b/phpBB/templates/subSilver/subSilver.css
@@ -208,12 +208,6 @@ hr	{
 	background-color: #D1D7DC;
 }
 
-/* Protected classes used internally -DO NOT REMOVE!- */
-span.hilit {
-	color: red;
-	font-weight: bold;
-}
-
 .gen {
 	font-size: 80%;
 }
@@ -226,41 +220,41 @@ span.hilit {
 
 /* The register, login, search etc links at the top of the page */
 .mainmenu {
-	color: black;
-	font-size: 70%; 
+	color:		black;
+	font-size:	70%; 
 }
 
 /* Forum title: Text and link to the forums used in: index.php */
 .forumlink {
-	color: #006699;
-	font-size:	80%;
-	font-weight:bold;
+	color:			#006699;
+	font-size:		80%;
+	font-weight:	bold;
 }
 
 /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
 .nav {
-	color: black;
-	font-size:	65%;
-	font-weight:bold;
+	color:			black;
+	font-size:		60%;
+	font-weight:	bold;
 }
 
 /* titles for the topics: could specify viewed link colour too */
 .topictitle	{
-	color: black;
-	font-size:	65%;
-	font-weight:bold;
+	color:			black;
+	font-size:		65%;
+	font-weight:	bold;
 }
 
 /* Name of poster in viewmsg.php and viewtopic.php and other places */
 .name {
-	color: black;
-	font-size: 70%;
+	color:		black;
+	font-size:	70%;
 }
 
 /* Location, number of posts, post date etc */
 .postdetails {
-	color: black;
-	font-size: 60%;
+	color:		black;
+	font-size:	60%;
 }
 
 /* The content of the posts (body of text) */
@@ -270,17 +264,17 @@ span.hilit {
 
 /* Quote & Code blocks */
 .quote {
-	color: #444;
-	font: normal 70%/125% Verdana, Arial, Helvetica, sans-serif;
-	border: #D1D7DC solid 1px;
-	background-color: #FAFAFA; 
+	color:				#444;
+	font:				normal 70%/125% Verdana, Arial, Helvetica, sans-serif;
+	border:				#D1D7DC solid 1px;
+	background-color:	#FAFAFA; 
 }
 
 .code {
-	color:	#006600;
-	font:	normal 70% 'Courier New', monospace;
-	border: #D1D7DC 1px solid;
-	background-color: #FAFAFA;
+	color:				#006600;
+	font:				normal 70% 'Courier New', monospace;
+	border:				#D1D7DC 1px solid;
+	background-color:	#FAFAFA;
 }
 
 /* Syntax highlighning */
@@ -298,6 +292,11 @@ span.hilit {
 	letter-spacing: -1px;
 }
 
+span.hilit {
+	color: red;
+	font-weight: bold;
+}
+
 /* 
 	This is the line in the posting page which shows the rollover
 	help line. This is actually a text box, but if set to be the same
diff --git a/phpBB/templates/subSilver/ucp_profile.html b/phpBB/templates/subSilver/ucp_profile.html
index 0ff0cbc749..4b2760c96b 100644
--- a/phpBB/templates/subSilver/ucp_profile.html
+++ b/phpBB/templates/subSilver/ucp_profile.html
@@ -4,7 +4,7 @@
 	<tr> 
 		<td width="20%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
-				<th>Options</th>
+				<th>{L_OPTIONS}</th>
 			</tr>
 			<!-- BEGIN ucp_subsection -->
 			<tr>
@@ -37,16 +37,22 @@
 
 			<!-- IF S_DISPLAY_REG_DETAILS -->
 			<tr> 
-				<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td>
+				<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
 				<td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" maxlength="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td>
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
 				<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="60" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
 			</tr>
+			<!-- IF S_CHANGE_EMAIL -->
+			<tr> 
+				<td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b><br /><span class="gensmall">{L_CONFIRM_EMAIL_EXPLAIN}</span></td>
+				<td class="row2"><input type="text" class="post" name="confirm_email" size="30" maxlength="60" value="{CONFIRM_EMAIL}" /></td>
+			</tr>
+			<!-- ENDIF -->
 			<!-- IF S_CHANGE_PASSWORD -->
 			<tr> 
-				<td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td>
+				<td class="row1"><b class="genmed">{L_CHANGE_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>
 				<td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="255" value="{NEW_PASSWORD}" /></td>
 			</tr>
 			<tr> 
@@ -82,7 +88,7 @@
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_JABBER}: </b></td>
-				<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{YIM}" /></td>
+				<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_WEBSITE}: </b></td>
@@ -101,7 +107,7 @@
 				<td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td>
 			</tr>
 			<tr> 
-				<td class="row1"><b class="genmed">{L_BIRTHDAY}: </b></td>
+				<td class="row1"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td>
 				<td class="row2"><span class="gensmall">Day:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="gensmall">Month:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="gensmall">Year:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>
 			</tr>
 			<!-- ENDIF -->
@@ -204,35 +210,55 @@
 
 			<!-- IF S_DISPLAY_AVATAR -->
 			<tr> 
-				<td class="row1" colspan="2"><table width="70%" cellspacing="2" cellpadding="0" border="0" align="center">
-					<tr> 
-						<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
-						<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
-					</tr>
-				</table></td>
+				<td class="row1" width="50%"><b class="genmed">{L_CURRENT_IMAGE}: </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
+				<td class="row2" align="center">{AVATAR}<br /><input type="checkbox" name="delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
 			</tr>
 			<!-- IF S_UPLOAD_AVATAR_FILE -->
 			<tr> 
-				<td class="row1"><b class="genmed">{L_UPLOAD_AVATAR_FILE}:</b></td>
-				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="avatar" class="post" style="width:200px" /></td>
+				<td class="row1"><b class="genmed">{L_UPLOAD_AVATAR_FILE}: </b></td>
+				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="uploadfile" /></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF S_UPLOAD_AVATAR_URL -->
 			<tr> 
-				<td class="row1"><b class="genmed">{L_UPLOAD_AVATAR_URL}:</b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-				<td class="row2"><input type="text" name="avatarurl" size="40" class="post" style="width:200px" /></td>
+				<td class="row1"><b class="genmed">{L_UPLOAD_AVATAR_URL}: </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
+				<td class="row2"><input class="post" type="text" name="uploadurl" size="40" value="{AVATAR_URL}" /></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF S_LINK_AVATAR -->
 			<tr> 
-				<td class="row1"><b class="genmed">{L_LINK_REMOTE_AVATAR}:</b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-				<td class="row2"><input type="text" name="avatarremoteurl" size="40" class="post" style="width:200px" /></td>
+				<td class="row1"><b class="genmed">{L_LINK_REMOTE_AVATAR}: </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
+				<td class="row2"><input class="post" type="text" name="remotelink" size="40" value="{AVATAR_REMOTE}" /></td>
+			</tr>
+			<tr> 
+				<td class="row1"><b class="genmed">{L_LINK_REMOTE_SIZE}: </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
+				<td class="row2"><input class="post" type="text" name="width" size="3" value="{WIDTH}" /> <span class="gen">px X </span> <input class="post" type="text" name="height" size="3" value="{HEIGHT}" /> <span class="gen">px</span></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF S_GALLERY_AVATAR -->
 			<tr> 
-				<td class="row1"><b class="genmed">{L_AVATAR_GALLERY}:</b></td>
-				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" class="liteoption" /></td>
+				<th colspan="2">{L_AVATAR_GALLERY}</th>
+			</tr>
+			<tr> 
+				<td colspan="2" class="cat" height="28" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}: </span><select name="avatarcat">{S_AVATAR_CAT_OPTIONS}</select>&nbsp; <span class="genmed">{L_AVATAR_PAGE}: </span><select name="avatarpage">{S_AVATAR_PAGE_OPTIONS}</select>&nbsp;<input class="liteoption" type="submit" value="{L_GO}" name="avatargallery" /></td>
+			</tr>
+			<tr> 
+				<td class="row1" colspan="2"><table width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
+				
+					<!-- BEGIN avatar_row -->
+					<tr> 
+						<!-- BEGIN avatar_column -->
+						<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+						<!-- END avatar_column -->
+					</tr>
+					<tr>
+						<!-- BEGIN avatar_option_column -->
+						<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+						<!-- END avatar_option_column -->
+					</tr>
+					<!-- END avatar_row -->
+	
+				</table></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- ENDIF -->
diff --git a/phpBB/templates/subSilver/ucp_register.html b/phpBB/templates/subSilver/ucp_register.html
index 569b9b43ff..6d2bbfea0f 100644
--- a/phpBB/templates/subSilver/ucp_register.html
+++ b/phpBB/templates/subSilver/ucp_register.html
@@ -26,31 +26,31 @@
 	<!-- ENDIF -->
 
 	<tr> 
-		<td class="row1" width="38%"><span class="gen">{L_USERNAME}: </span></td>
+		<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" class="post" name="username" size="25" maxlength="40" value="{USERNAME}" /></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: </span></td>
+		<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
 		<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="255" value="{EMAIL}" /></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_CONFIRM_EMAIL}: </span></td>
+		<td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td>
 		<td class="row2"><input type="text" class="post" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_PASSWORD}: </span></td>
+		<td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td>
 		<td class="row2"><input type="password" class="post" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_CONFIRM_PASSWORD}:  </span></td>
+		<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td>
 		<td class="row2"><input type="password" class="post" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_LANGUAGE}: </span></td>
+		<td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td>
 		<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_TIMEZONE}: </span></td>
+		<td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td>
 		<td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td>
 	</tr>
 
@@ -65,7 +65,7 @@
 		<td class="row1" colspan="2" align="center">{CONFIRM_IMG}</td>
 	</tr>
 	<tr> 
-		<td class="row1"><span class="gen">{L_CONFIRM_CODE}:  </span><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
+		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:  </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" class="post" name="confirm_code" size="6" maxlength="6" /></td>
 	</tr>
 	<!-- ENDIF -->
diff --git a/phpBB/templates/subSilver/viewforum_body.html b/phpBB/templates/subSilver/viewforum_body.html
index 288b3c895c..9326561eea 100644
--- a/phpBB/templates/subSilver/viewforum_body.html
+++ b/phpBB/templates/subSilver/viewforum_body.html
@@ -2,13 +2,17 @@
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
-		<td colspan="2"><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF S_IS_POSTABLE --><!-- IF MODERATORS neq ''--><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --><!-- ENDIF --></td>
+		<td><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF S_IS_POSTABLE --><!-- IF MODERATORS neq ''--><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --><!-- ENDIF --></td>
 		<td class="gensmall" align="right" valign="bottom"><!-- IF S_IS_POSTABLE -->{MOD_CP}<!-- ENDIF --></td>
 	</tr>
 	<tr>
-		<td class="nav" valign="middle" nowrap="nowrap">{PAGE_NUMBER}</td>
-		<td class="gensmall" nowrap="nowrap">[ {TOTAL_TOPICS} ]&nbsp;</td>
-		<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+		<td colspan="2"><table width="100%" cellspacing="0" border="0">
+			<tr>
+				<td class="nav" valign="middle" nowrap="nowrap">{PAGE_NUMBER}</td>
+				<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_TOPICS} ]&nbsp;</td>
+				<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+			</tr>
+		</table></td>
 	</tr>
 </table>
author	Paul S. Owen <psotfx@users.sourceforge.net>	2003-05-26 23:53:34 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2003-05-26 23:53:34 +0000
commit	e1484f522d28194c63d424bc621b93d3cf8865b9 (patch)
tree	a6c2e5b249ac9c688525f24737fc8e29d1c669e1 /phpBB/templates
parent	4e71b1b96d21e78463a768004c1c8ed2e1d952d5 (diff)
download	forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.gz forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.bz2 forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.xz forums-e1484f522d28194c63d424bc621b93d3cf8865b9.zip