aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-10 13:14:25 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-10 13:14:25 +0000
commit3abfd1dd879b0b2929cf5dd42bd831194e1a2f10 (patch)
tree7e6cc5248864c677e403d119a7e9995cc06eba37
parentd9fef8013f0b31f3baba287c92c82261a0e7b7a2 (diff)
downloadforums-3abfd1dd879b0b2929cf5dd42bd831194e1a2f10.tar
forums-3abfd1dd879b0b2929cf5dd42bd831194e1a2f10.tar.gz
forums-3abfd1dd879b0b2929cf5dd42bd831194e1a2f10.tar.bz2
forums-3abfd1dd879b0b2929cf5dd42bd831194e1a2f10.tar.xz
forums-3abfd1dd879b0b2929cf5dd42bd831194e1a2f10.zip
More udates
git-svn-id: file:///svn/phpbb/trunk@1540 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/templates/Euclid/agreement.tpl2
-rw-r--r--phpBB/templates/Euclid/bbcode.tpl28
-rw-r--r--phpBB/templates/Euclid/confirm_body.tpl9
-rw-r--r--phpBB/templates/Euclid/error_body.tpl9
-rw-r--r--phpBB/templates/Euclid/faq_body.tpl34
-rw-r--r--phpBB/templates/Euclid/groupcp_info_body.tpl235
-rw-r--r--phpBB/templates/Euclid/groupcp_pending_info.tpl63
-rw-r--r--phpBB/templates/Euclid/groupcp_user_body.tpl43
-rw-r--r--phpBB/templates/Euclid/login_body.tpl43
9 files changed, 252 insertions, 214 deletions
diff --git a/phpBB/templates/Euclid/agreement.tpl b/phpBB/templates/Euclid/agreement.tpl
index d3b8176b75..6e0166df77 100644
--- a/phpBB/templates/Euclid/agreement.tpl
+++ b/phpBB/templates/Euclid/agreement.tpl
@@ -8,7 +8,7 @@
<tr>
<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
<tr>
- <td class="cat" width="100%" align="center"><span class="cattitle"><b>{SITENAME} - Forums Registration Agreement<b></span></td>
+ <td class="cat" width="100%" height="30" align="center"><span class="cattitle"><b>{SITENAME} - Forums Registration Agreement<b></span></td>
</tr>
<tr>
<td class="row1" width="100%"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/templates/Euclid/bbcode.tpl b/phpBB/templates/Euclid/bbcode.tpl
index 7161121525..448f5fb4e8 100644
--- a/phpBB/templates/Euclid/bbcode.tpl
+++ b/phpBB/templates/Euclid/bbcode.tpl
@@ -29,10 +29,7 @@
<td><span class="gensmall"><b>{USERNAME} {L_WROTE}:</b></span></td>
</tr>
<tr>
- <td bgcolor="#000000"><img src="images/spacer.gif" height="1" /></td>
- </tr>
- <tr>
- <td><span class="gensmall"><!-- END quote_username_open -->
+ <td><hr /><span class="gensmall"><!-- END quote_username_open -->
<!-- BEGIN quote_open -->
</span>
@@ -42,15 +39,9 @@
<td><span class="gensmall"><b>{L_QUOTE}:</b></span></td>
</tr>
<tr>
- <td bgcolor="#000000"><img src="images/spacer.gif" height="1" /></td>
- </tr>
- <tr>
- <td><span class="gensmall"><!-- END quote_open -->
+ <td><hr /><span class="gensmall"><!-- END quote_open -->
-<!-- BEGIN quote_close --></span><br /></td>
- </tr>
- <tr>
- <td bgcolor="#000000"><img src="images/spacer.gif" height="1" /></td>
+<!-- BEGIN quote_close --></span><hr /></td>
</tr>
</table>
@@ -65,12 +56,13 @@
<td><span class="gensmall"><b>{L_CODE}:</b></span></td>
</tr>
<tr>
- <td><pre><!-- END code_open -->
+ <td><hr /><span class="courier"><!-- END code_open -->
-<!-- BEGIN code_close --></pre></td>
+<!-- BEGIN code_close --></span><hr /></td>
</tr>
</table>
-<span class="postbody">
+
+<span class="gen">
<!-- END code_close -->
@@ -119,15 +111,15 @@
<!-- END size_close -->
<!-- BEGIN img -->
-<img src="{URL}" border="0" />
+<img src="{URL}" border="0" alt="" />
<!-- END img -->
<!-- BEGIN url -->
-<a href="{URL}" target="_blank" class="postlink">{DESCRIPTION}</a>
+<a href="{URL}" target="_blank">{DESCRIPTION}</a>
<!-- END url -->
<!-- BEGIN email -->
-<a href="mailto:{EMAIL}">{EMAIL}</A>
+<a href="mailto:{EMAIL}">{EMAIL}</a>
<!-- END email -->
diff --git a/phpBB/templates/Euclid/confirm_body.tpl b/phpBB/templates/Euclid/confirm_body.tpl
index e99585f1d9..8e384f1e15 100644
--- a/phpBB/templates/Euclid/confirm_body.tpl
+++ b/phpBB/templates/Euclid/confirm_body.tpl
@@ -1,12 +1,13 @@
-<form action="{S_CONFIRM_ACTION}" method="POST"><table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
+
+<form action="{S_CONFIRM_ACTION}" method="post"><table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
- <th class="secondary"><b>{MESSAGE_TITLE}</b></th>
+ <th class="secondary" height="25"><b>{MESSAGE_TITLE}</b></th>
</tr>
<tr>
- <td class="row2" width="100%" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" /><br /><br /></td>
+ <td class="row2" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br />{S_HIDDEN_FIELDS}<input class="liteoptiontable" type="submit" name="confirm" value="{L_YES}" />&nbsp;&nbsp;<input class="liteoptiontable" type="submit" name="cancel" value="{L_NO}" /><br /><br /></td>
</tr>
</table></td>
</tr>
-</table>
+</table></form>
diff --git a/phpBB/templates/Euclid/error_body.tpl b/phpBB/templates/Euclid/error_body.tpl
index d57d581876..ec56bd666f 100644
--- a/phpBB/templates/Euclid/error_body.tpl
+++ b/phpBB/templates/Euclid/error_body.tpl
@@ -1,9 +1,10 @@
-<div align="center"><table width="98%" cellpadding="0" cellspacing="1" border="0">
+
+<table width="98%" cellpadding="0" cellspacing="1" border="0" align="center">
<tr>
- <td bgcolor="{T_TH_COLOR1}"><table width="100%" cellpadding="5" cellspacing="1" border="0">
+ <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
- <td width="100%" bgcolor="{T_TD_COLOR1}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{ERROR_MESSAGE}<b></font></td>
+ <td class="row1" width="100%" align="center"><span class="gen">{ERROR_MESSAGE}</span></td>
</tr>
</table></td>
</tr>
-</table> \ No newline at end of file
+</table>
diff --git a/phpBB/templates/Euclid/faq_body.tpl b/phpBB/templates/Euclid/faq_body.tpl
index 2b27acc371..8a415d1a1c 100644
--- a/phpBB/templates/Euclid/faq_body.tpl
+++ b/phpBB/templates/Euclid/faq_body.tpl
@@ -1,7 +1,7 @@
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
- <td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
+ <td align="left" valign="bottom"><span class="gensmall"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
@@ -9,7 +9,7 @@
<tr>
<td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
- <td class="cat" align="center"><span class="cattitle">{L_FAQ}</span></td>
+ <td class="cat" height="30" align="center"><span class="cattitle">{L_FAQ}</span></td>
</tr>
<tr>
<td align="left" valign="top" class="row1"><table cellspacing="3" cellpadding="0" border="0">
@@ -17,6 +17,9 @@
<td>&nbsp;</td>
</tr>
<!-- BEGIN faq_block_link -->
+ <tr>
+ <td><span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span></td>
+ </tr>
<!-- BEGIN faq_row_link -->
<tr>
<td><span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}">{faq_block_link.faq_row_link.FAQ_LINK}</a></span></td>
@@ -28,28 +31,43 @@
<!-- END faq_block_link -->
</table></td>
</tr>
+ </table></td>
+ </tr>
<tr>
<td height="2" class="cat"><img src="images/spacer.gif" height="2" /></td>
</tr>
- <!-- BEGIN faq_block -->
+</table>
+
+<br clear="all" />
+
+<!-- BEGIN faq_block -->
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
+ <tr>
+ <td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+ <tr>
+ <td class="cat" height="30"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
+ </tr>
<!-- BEGIN faq_row -->
<tr>
<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="gen"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><br /><span class="gensmall">{faq_block.faq_row.FAQ_ANSWER}</span></td>
</tr>
<!-- END faq_row -->
- <tr>
- <td class="cat" height="25"><span class="gen">{faq_block.BLOCK_TITLE}</span></td>
- </tr>
- <!-- END faq_block -->
</table></td>
</tr>
+ <tr>
+ <td height="2" class="cat"><img src="images/spacer.gif" height="2" /></td>
+ </tr>
</table>
<br clear="all" />
+<!-- END faq_block -->
+
+<br clear="all" />
+
<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td><span class="gensmall"><b>{S_TIMEZONE}</b></td>
+ <td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></td>
<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{JUMPBOX}</span></td>
</tr>
</table>
diff --git a/phpBB/templates/Euclid/groupcp_info_body.tpl b/phpBB/templates/Euclid/groupcp_info_body.tpl
index 99b0997765..ccf89f1360 100644
--- a/phpBB/templates/Euclid/groupcp_info_body.tpl
+++ b/phpBB/templates/Euclid/groupcp_info_body.tpl
@@ -1,129 +1,146 @@
-<form method="POST" action="{S_GROUP_INFO_ACTION}">
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
- <tr>
- <td align="left"><span class="gensmall"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
- </tr>
-</table>
-
- <table width="100%" cellpadding="4" cellspacing="1" border="0">
- <tr>
- <th colspan="7" class="thHead" height="25"><span class="cattitle">{L_GROUP_INFORMATION}</span></th>
- </tr>
- <tr>
- <td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td>
- <td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td>
- </tr>
- <tr>
- <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td>
- <td class="row2"><span class="gen">{GROUP_DESC}</span></td>
- </tr>
- <tr>
- <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
- <td class="row2"><span class="gen">{GROUP_DETAILS} &nbsp;&nbsp;
- <!-- BEGIN switch_subscribe_group_input -->
- <input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" />
- <!-- END switch_subscribe_group_input -->
- <!-- BEGIN switch_unsubscribe_group_input -->
- <input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" />
- <!-- END switch_unsubscribe_group_input -->
- </span></td>
- </tr>
- <!-- BEGIN switch_mod_option -->
- <tr>
- <td class="row1" width="20%"><span class="gen">{L_GROUP_STATUS}:</span></td>
- <td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
- </tr>
- <!-- END switch_mod_option -->
- </table>
-{S_HIDDEN_FIELDS}
-</form>
-
-<form action="{S_PENDING_ACTION}" method="post" name="post">
-<table width="100%" cellpadding="4" cellspacing="1" border="0">
- <tr>
- <th class="thCornerL" height="25">{L_PM}</th>
- <th class="thTop">{L_USERNAME}</th>
- <th class="thTop">{L_POSTS}</th>
- <th class="thTop">{L_FROM}</th>
- <th class="thTop">{L_EMAIL}</th>
- <th class="thTop">{L_WEBSITE}</th>
- <th class="thCornerR">{L_SELECT}</th>
- </tr>
-
- <tr>
- <td colspan="8" height="28"><span class="cattitle">{L_GROUP_MODERATOR}</span></td>
- </tr>
+<form action="{S_GROUP_INFO_ACTION}" method="post">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
- <td class="row1" align="center"> {MOD_PM_IMG} </td>
- <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}" class="gen">{MOD_USERNAME}</a></span></td>
- <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td>
- <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
- <td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td>
- <td class="row1" align="center">{MOD_WWW_IMG}</td>
- <td class="row1" align="center"> &nbsp; </td>
- </tr>
-
- <tr>
- <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MEMBERS}</span></td>
+ <td align="left"><span class="gensmall"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
+</table>
- <!-- BEGIN member_row -->
- <tr>
- <td class="{member_row.ROW_CLASS}" align="center"> {member_row.PM_IMG} </td>
- <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"><a href="{member_row.U_VIEWPROFILE}" class="gen">{member_row.USERNAME}</a></span></td>
- <td class="{member_row.ROW_CLASS}" align="center"><span class="gen">{member_row.POSTS}</span></td>
- <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"> {member_row.FROM}
- </span></td>
- <td class="{member_row.ROW_CLASS}" align="center" valign="middle"><span class="gen">{member_row.EMAIL_IMG}</span></td>
- <td class="{member_row.ROW_CLASS}" align="center"> {member_row.WWW_IMG}</td>
- <td class="{member_row.ROW_CLASS}" align="center">
- <!-- BEGIN switch_mod_option -->
- <input type="checkbox" name="members[]" value="{member_row.USER_ID}" />
- <!-- END switch_mod_option -->
- </td>
- </tr>
- <!-- END member_row -->
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
+ <tr>
+ <td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+ <tr>
+ <td class="cat" colspan="7" height="30"><span class="cattitle">{L_GROUP_INFORMATION}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td>
+ <td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td>
+ </tr>
+ <tr>
+ <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td>
+ <td class="row2"><span class="gen">{GROUP_DESC}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
+ <td class="row2"><span class="gen">{GROUP_DETAILS} &nbsp;&nbsp;
+ <!-- BEGIN switch_subscribe_group_input -->
+ <input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" />
+ <!-- END switch_subscribe_group_input -->
+ <!-- BEGIN switch_unsubscribe_group_input -->
+ <input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" />
+ <!-- END switch_unsubscribe_group_input -->
+ </span></td>
+ </tr>
+ <!-- BEGIN switch_mod_option -->
+ <tr>
+ <td class="row1" width="20%"><span class="gen">{L_GROUP_TYPE}:</span></td>
+ <td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="liteoptiontable" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
+ </tr>
+ <!-- END switch_mod_option -->
+ </table></td>
+ </tr>
+</table>
- <!-- BEGIN switch_no_members -->
- <tr>
- <td class="row1" colspan="7" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
- </tr>
- <!-- END switch_no_members -->
+{S_HIDDEN_FIELDS}
- <!-- BEGIN switch_hidden_group -->
- <tr>
- <td class="row1" colspan="7" align="center"><span class="gen">{L_HIDDEN_MEMBERS}</span></td>
- </tr>
- <!-- END switch_hidden_group -->
+</form>
- <!-- BEGIN switch_mod_option -->
+<form action="{S_PENDING_ACTION}" method="post" name="post">
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td class="cat" colspan="8" align="right"><span class="cattitle">
- <input type="submit" name="remove" value="{L_REMOVE_SELECTED}" class="mainoption" />
- </td>
+ <td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+ <tr>
+ <th height="25">{L_PM}</th>
+ <th height="25">{L_USERNAME}</th>
+ <th height="25">{L_POSTS}</th>
+ <th height="25">{L_FROM}</th>
+ <th height="25">{L_EMAIL}</th>
+ <th height="25">{L_WEBSITE}</th>
+ <th height="25">{L_SELECT}</th>
+ </tr>
+ <tr>
+ <td class="cat" colspan="8" height="30"><span class="cattitle">{L_GROUP_MODERATOR}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" align="center"> {MOD_PM_IMG} </td>
+ <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}" class="gen">{MOD_USERNAME}</a></span></td>
+ <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td>
+ <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
+ <td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td>
+ <td class="row1" align="center">{MOD_WWW_IMG}</td>
+ <td class="row1" align="center"> &nbsp; </td>
+ </tr>
+ <tr>
+ <td class="cat" colspan="8" height="30"><span class="cattitle">{L_GROUP_MEMBERS}</span></td>
+ </tr>
+ <!-- BEGIN member_row -->
+ <tr>
+ <td class="{member_row.ROW_CLASS}" align="center">{member_row.PM_IMG}</td>
+ <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"><a href="{member_row.U_VIEWPROFILE}" class="gen">{member_row.USERNAME}</a></span></td>
+ <td class="{member_row.ROW_CLASS}" align="center"><span class="gen">{member_row.POSTS}</span></td>
+ <td class="{member_row.ROW_CLASS}" align="center"><span class="gen">{member_row.FROM}</span></td>
+ <td class="{member_row.ROW_CLASS}" align="center" valign="middle"><span class="gen">{member_row.EMAIL_IMG}</span></td>
+ <td class="{member_row.ROW_CLASS}" align="center">{member_row.WWW_IMG}</td>
+ <td class="{member_row.ROW_CLASS}" align="center">
+ <!-- BEGIN switch_mod_option -->
+ <input type="checkbox" name="members[]" value="{member_row.USER_ID}" />
+ <!-- END switch_mod_option -->
+ </td>
+ </tr>
+ <!-- END member_row -->
+ <!-- BEGIN switch_no_members -->
+ <tr>
+ <td class="row1" colspan="7" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
+ </tr>
+ <!-- END switch_no_members -->
+ <!-- BEGIN switch_hidden_group -->
+ <tr>
+ <td class="row1" colspan="7" align="center"><span class="gen">{L_HIDDEN_MEMBERS}</span></td>
+ </tr>
+ <!-- END switch_hidden_group -->
+ <tr>
+ <td class="cat" colspan="8" height="30"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td><span class="gensmall">{PAGE_NUMBER}</span></td>
+ <td align="right"><table cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td align="right"><span class="gensmall">{PAGINATION}</span></td>
+ <!-- BEGIN switch_mod_option -->
+ <td>&nbsp;&nbsp;</td>
+ <td align="right"><span class="cattitle"><input class="liteoptiontable" type="submit" name="remove" value="{L_REMOVE_SELECTED}" /></td>
+ <!-- END switch_mod_option -->
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </table></td>
</tr>
- <!-- END switch_mod_option -->
</table>
-<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td align="left" valign="top">
- <!-- BEGIN switch_mod_option -->
- <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span>
- <!-- END switch_mod_option -->
- </td>
- <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+ <td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+ <tr>
+ <td align="left" valign="top">
+ <!-- BEGIN switch_mod_option -->
+ <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input class="outsidetable" type="submit" name="add" value="{L_ADD_MEMBER}" /> <input class="outsidetable" type="submit" name="usersubmit" value="{L_FIND_USERNAME}" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span>
+ <!-- END switch_mod_option -->
+ </td>
+ </tr>
+ </table></td>
</tr>
</table>
{PENDING_USER_BOX}
-{S_HIDDEN_FIELDS}</form>
+{S_HIDDEN_FIELDS}
+
+</form>
-<table width="100%" cellspacing="2" border="0" align="center">
- <tr>
- <td valign="top" align="right">{JUMPBOX}</td>
- </tr>
+<table width="98%" cellspacing="2" border="0" align="center">
+ <tr>
+ <td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+ <td valign="top" align="right">{JUMPBOX}</td>
+ </tr>
</table>
diff --git a/phpBB/templates/Euclid/groupcp_pending_info.tpl b/phpBB/templates/Euclid/groupcp_pending_info.tpl
index 41d47d0487..867a9285e1 100644
--- a/phpBB/templates/Euclid/groupcp_pending_info.tpl
+++ b/phpBB/templates/Euclid/groupcp_pending_info.tpl
@@ -1,36 +1,37 @@
<br clear="all" />
-<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
- <tr>
- <th class="thCornerL" height="25">{L_PM}</th>
- <th class="thTop">{L_USERNAME}</th>
- <th class="thTop">{L_POSTS}</th>
- <th class="thTop">{L_FROM}</th>
- <th class="thTop">{L_EMAIL}</th>
- <th class="thTop">{L_WEBSITE}</th>
- <th class="thCornerR">{L_SELECT}</th>
- </tr>
- <tr>
- <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_PENDING_MEMBERS}</span></td>
- </tr>
- <!-- BEGIN pending_members_row -->
- <tr>
- <td class="{pending_members_row.ROW_CLASS}" align="center"> {pending_members_row.PM_IMG}
- </td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen"><a href="{pending_members_row.U_VIEWPROFILE}" class="gen">{pending_members_row.USERNAME}</a></span></td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.POSTS}</span></td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.FROM}</span></td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.EMAIL_IMG}</span></td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.WWW_IMG}</span></td>
- <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gensmall"> <input type="checkbox" name="pending_members[]" value="{pending_members_row.USER_ID}" /></span></td>
- </tr>
- <!-- END pending_members_row -->
- <tr>
- <td class="cat" colspan="8" align="right"><span class="cattitle">
- <input type="submit" name="approve" value="{L_APPROVE_SELECTED}" class="mainoption" />
- &nbsp;
- <input type="submit" name="deny" value="{L_DENY_SELECTED}" class="liteoption" />
- </span></td>
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
+ <tr>
+ <td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
+ <tr>
+ <th height="25">{L_PM}</th>
+ <th height="25">{L_USERNAME}</th>
+ <th height="25">{L_POSTS}</th>
+ <th height="25">{L_FROM}</th>
+ <th height="25">{L_EMAIL}</th>
+ <th height="25">{L_WEBSITE}</th>
+ <th height="25">{L_SELECT}</th>
+ </tr>
+ <tr>
+ <td class="cat" colspan="8" height="30"><span class="cattitle">{L_PENDING_MEMBERS}</span></td>
+ </tr>
+ <!-- BEGIN pending_members_row -->
+ <tr>
+ <td class="{pending_members_row.ROW_CLASS}" align="center">{pending_members_row.PM_IMG}</td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen"><a href="{pending_members_row.U_VIEWPROFILE}" class="gen">{pending_members_row.USERNAME}</a></span></td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.POSTS}</span></td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen"> {pending_members_row.FROM}</span></td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center" valign="middle"><span class="gen">{pending_members_row.EMAIL_IMG}</span></td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center">{pending_members_row.WWW_IMG}</td>
+ <td class="{pending_members_row.ROW_CLASS}" align="center"> <input type="checkbox" name="members[]" value="{pending_members_row.USER_ID}" /> </td>
+ </tr>
+ <!-- END pending_members_row -->
+ <tr>
+ <td class="cat" colspan="8" height="30" align="right"><input class="liteoptiontable" type="submit" name="approve" value="{L_APPROVE_SELECTED}" /> &nbsp; <input class="liteoptiontable" type="submit" name="deny" value="{L_DENY_SELECTED}" /></td>
+ </tr>
+ </table></td>
</tr>
</table>
+
+<br clear="all" />
diff --git a/phpBB/templates/Euclid/groupcp_user_body.tpl b/phpBB/templates/Euclid/groupcp_user_body.tpl
index a959e7e94f..c3a62c005c 100644
--- a/phpBB/templates/Euclid/groupcp_user_body.tpl
+++ b/phpBB/templates/Euclid/groupcp_user_body.tpl
@@ -1,58 +1,57 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
- <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+ <td><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
</tr>
-</table></div>
+</table>
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
- <!-- BEGIN group_joined -->
+ <!-- BEGIN groups_joined -->
<tr>
- <td class="cat" colspan="2"><span class="cattitle"><b>{L_GROUP_MEMBERSHIP_DETAILS}</b></span></td>
+ <td class="cat" colspan="2" height="30"><span class="cattitle">{L_GROUP_MEMBERSHIP_DETAILS}</span></td>
</tr>
- <!-- BEGIN group_member -->
+ <!-- BEGIN groups_member -->
<tr>
<td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td>
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><form method="post" action="{S_USERGROUP_ACTION}">
- <td width="40%" align="center">&nbsp;{GROUP_MEMBER_SELECT}&nbsp;</td>
- <td width="30%" align="center">&nbsp;<input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
- <td width="30%" align="center">&nbsp;<input type="submit" name="unsub" value="{L_UNSUBSCRIBE}">&nbsp;</td>
+ <td width="50%" align="center">&nbsp;{GROUP_MEMBER_SELECT}&nbsp;</td>
+ <td width="50%" align="center">&nbsp;<input class="mainoptiontable" type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
</form></tr>
</table></td>
</tr>
- <!-- END group_member -->
- <!-- BEGIN group_pending -->
+ <!-- END groups_member -->
+ <!-- BEGIN groups_pending -->
<tr>
<td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td>
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><form method="post" action="{S_USERGROUP_ACTION}">
<td width="40%" align="center">&nbsp;{GROUP_PENDING_SELECT}&nbsp;</td>
- <td width="30%" align="center">&nbsp;<input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
- <td width="30%" align="center">&nbsp;<input type="submit" name="unsubpending" value="{L_UNSUBSCRIBE}">&nbsp;</td>
+ <td width="30%" align="center">&nbsp;<input class="mainoptiontable" type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
</form></tr>
</table></td>
</tr>
- <!-- END group_pending -->
- <!-- END group_joined -->
- <!-- BEGIN group_subscribe -->
+ <!-- END groups_pending -->
+ <!-- END groups_joined -->
+ <!-- BEGIN groups_remaining -->
<tr>
- <td class="cat" colspan="2"><span class="cattitle"><b>{L_JOIN_A_GROUP}</b></span></td>
+ <td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_JOIN_A_GROUP}</b></span></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_SELECT_A_GROUP}</span></td>
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><form method="post" action="{S_USERGROUP_ACTION}">
<td width="40%" align="center">&nbsp;{GROUP_LIST_SELECT}&nbsp;</td>
- <td width="30%" align="center">&nbsp;<input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
+ <td width="30%" align="center">&nbsp;<input class="mainoptiontable" type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}">&nbsp;</td>
<td width="30%" align="center">&nbsp;</td>
</form></tr>
</table></td>
</tr>
- <!-- END group_join -->
+ <!-- END groups_remaining -->
</table></td>
</tr>
-</table></div>
+</table>
-<br clear="all">
+<br clear="all" />
diff --git a/phpBB/templates/Euclid/login_body.tpl b/phpBB/templates/Euclid/login_body.tpl
index 4ad9323360..74272e0eba 100644
--- a/phpBB/templates/Euclid/login_body.tpl
+++ b/phpBB/templates/Euclid/login_body.tpl
@@ -1,38 +1,47 @@
-<div align="center"><table width="60%" cellspacing="0" cellpadding="4" border="0">
+
+<form action="{S_LOGIN_ACTION}" method="post">
+
+<table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
- <td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+ <td><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
</tr>
-</table></div>
+</table>
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="60%">
- <tr><form action="{S_LOGIN_ACTION}" method="post">
- <td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+<table width="80%" cellspacing="0" cellpadding="0" border="0" align="center">
+ <tr>
+ <td class="tablebg"><table width="100%" cellspacing="1" cellpadding="4" border="0">
<tr>
- <th colspan="2" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}"><p><b>Please enter your username and password to login</b></p></font></th>
+ <td class="cat" colspan="2" height="30" align="center"><span class="cattitle">{L_ENTER_PASSWORD}</span></td>
</tr>
<tr>
- <td width="45%" bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR2}">{L_USERNAME}:&nbsp;</font></td><td bgcolor="{T_TD_COLOR2}"><input type="text" name="username" size="25" maxlength="40" value="{USERNAME}"></td>
+ <td class="row1" width="45%" align="right"><span class="gen">{L_USERNAME}: </span></td>
+ <td class="row1"><input type="text" name="username" size="25" maxlength="30" value="{USERNAME}" /></td>
</tr>
<tr>
- <td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR2}">{L_PASSWORD}:&nbsp;</font></td><td bgcolor="{T_TD_COLOR2}"><input type="password" name="password" size="25" maxlength="25"></td>
+ <td class="row2" align="right"><span class="gen">{L_PASSWORD}: </span></td>
+ <td class="row2"><input type="password" name="password" size="25" maxlength="25" /></td>
</tr>
<tr>
- <td colspan="2" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="6" border="0">
+ <td class="row1" colspan="2"><table width="100%" cellspacing="0" cellpadding="6" border="0">
<tr>
- <td align="center"><font face="{T_FONTFACE1}" size="2" color="{T_FONTCOLOR2}">{L_AUTO_LOGIN}</font>:&nbsp;<input type="checkbox" name="autologin"></td>
+ <td align="center"><span class="gen">{L_AUTO_LOGIN}</font>: <input type="checkbox" name="autologin" /></span></td>
</tr>
<tr>
- <td align="center"><input type="hidden" name="login" value="login"><input type="hidden" name="forward_page" value="{FORWARD_PAGE}"><input type="submit" name="submit" value="{L_LOGIN}"></td>
+ <td align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="login" value="{L_LOGIN}" /></td>
</tr>
<tr>
- <td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></font></td>
+ <td align="center"><span class="gensmall"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></span></td>
</tr>
</table></td>
</tr>
</table></td>
- </form></tr>
-</table></div>
+ </tr>
+</table></form>
-<div align="center"><table align="center" border="0" width="60%">
- <td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+<table width="80%" border="0" align="center">
+ <tr>
+ <td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+ </tr>
</table>
+
+<br clear="all" />