diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-02 13:06:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-02 13:06:57 +0000 |
| commit | 729c3abd02fc564fb99be53ba5fba450a073197f (patch) | |
| tree | 625496783aefb4310826381bcb69aec6558858ad /phpBB/styles/subSilver | |
| parent | 67d2ac36679f6c38fecaf157d2bc837daa237c41 (diff) | |
| download | forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.gz forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.bz2 forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.xz forums-729c3abd02fc564fb99be53ba5fba450a073197f.zip | |
fix some issues with oop, fixing small bugs and prepare the next steps...
NOTE TO DEVS: have a look at adm/admin_board.php (new config layout)
git-svn-id: file:///svn/phpbb/trunk@4883 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subSilver')
| -rw-r--r-- | phpBB/styles/subSilver/template/editor.js | 3 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/index_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/memberlist_search.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/overall_header.html | 24 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/posting_attach_body.html | 22 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/posting_body.html | 359 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/posting_progress_bar.html | 43 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/report_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_attachments.html | 7 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_main_drafts.html | 7 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_pm_body.html | 120 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_pm_popup.html | 25 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_pm_preview.html | 27 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_pm_read.html | 86 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/viewforum_body.html | 2 |
15 files changed, 307 insertions, 423 deletions
diff --git a/phpBB/styles/subSilver/template/editor.js b/phpBB/styles/subSilver/template/editor.js index 2ae7a75ed2..b2279c6d02 100644 --- a/phpBB/styles/subSilver/template/editor.js +++ b/phpBB/styles/subSilver/template/editor.js @@ -357,4 +357,5 @@ function colorPalette(dir, width, height) } } document.writeln('</table>'); -}
\ No newline at end of file +} + diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 78726545ef..a32a1fab69 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -2,7 +2,7 @@ <!-- $Id$ --> - <table class="tablebg" cellspacing="1"> + <table class="tablebg" cellspacing="1" width="100%"> <tr> <td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a> </td> </tr> diff --git a/phpBB/styles/subSilver/template/memberlist_search.html b/phpBB/styles/subSilver/template/memberlist_search.html index 44ac8139c7..2243672dc9 100644 --- a/phpBB/styles/subSilver/template/memberlist_search.html +++ b/phpBB/styles/subSilver/template/memberlist_search.html @@ -15,6 +15,7 @@ function insert_marked(users) insert_user(users[i].value); } } + self.close(); } function marklist(status) diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index c4be311a5c..26e59fa712 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -7,23 +7,25 @@ <meta http-equiv="Content-Style-Type" content="text/css" /> {META} <title>{SITENAME} :: {PAGE_TITLE}</title> + <!-- IF T_STYLESHEET_LINK --> -<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" /> + <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" /> <!-- ELSE --> -<style type="text/css"> -<!-- -{T_THEME_DATA} -//--> -</style> + <style type="text/css"> + <!-- + {T_THEME_DATA} + //--> + </style> <!-- ENDIF --> + <script language="Javascript" type="text/javascript"> <!-- <!-- IF S_USER_PM_POPUP --> -if ({S_NEW_PM}) -{ - window.open('{U_PRIVATEMSGS}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); -} + if ({S_NEW_PM}) + { + window.open('{U_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); + } <!-- ENDIF --> function popup(url, width, height) @@ -61,7 +63,7 @@ function jumpto() <div id="menubar"><table width="100%" cellspacing="0"> <tr> - <td class="genmed"><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_LOGIN_LOGOUT}</a> <!-- IF S_USER_LOGGED_IN --><!-- IF S_DISPLAY_PM --> <a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" /> {PRIVATE_MESSAGE_INFO}</a><!-- ENDIF --><!-- ELSE --> <a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" /> {L_REGISTER}</a><!-- ENDIF --></td> + <td class="genmed"><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_LOGIN_LOGOUT}</a> <!-- IF S_USER_LOGGED_IN --><!-- IF S_DISPLAY_PM --> <a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF --><!-- ELSE --> <a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" /> {L_REGISTER}</a><!-- ENDIF --></td> <td class="genmed" align="right"><a href="{U_FAQ}"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" /> {L_FAQ}</a><!-- IF S_DISPLAY_SEARCH --> <a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" /> {L_SEARCH}</a><!-- ENDIF --><!-- IF S_DISPLAY_MEMBERLIST --> <a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" /> {L_MEMBERLIST}</a><!-- ENDIF --> <a href="{U_GROUP_CP}"><img src="{T_THEME_PATH}/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" /> {L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN --> <a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" /> {L_PROFILE}</a><!-- ENDIF --></td> </tr> </table></div> diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index 707570953a..e50500d946 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -1,5 +1,23 @@ <!-- $Id$ --> +<script language="javascript" type="text/javascript"> +<!-- + function popup_progress_bar() + { + close_waitscreen = 0; + window.open('{U_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); + } +//--> +</script> + +<!-- IF S_CLOSE_PROGRESS_WINDOW --> +<script language="javascript" type="text/javascript"> +<!-- + close_waitscreen = 1; +//--> +</script> +<!-- ENDIF --> + <tr> <th colspan="2" height="28">{L_ADD_ATTACHMENT}</th> </tr> @@ -9,7 +27,7 @@ <tr> <td class="row1"><b class="genmed">{L_FILENAME}</b></td> - <td class="row2"><input class="post" type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="{FILENAME}" class="btnlite" /></td> + <td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="{FILENAME}" class="btnlite" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> @@ -18,7 +36,7 @@ <td><textarea class="post" name="filecomment" rows="3" cols="35" wrap="virtual" size=40>{FILE_COMMENT}</textarea> </td> <td valign="top"><table border="0" cellspacing="4" cellpadding="0"> <tr> - <td><input class="btnlite" type="submit" style="width:150px" name="add_file" value="{L_ADD_FILE}" /></td> + <td><input class="btnlite" type="submit" style="width:150px" name="add_file" value="{L_ADD_FILE}" onclick="javascript:popup_progress_bar();" /></td> </tr></table> </td> </tr></table> diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index d9e789eea0..05d6898e75 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -1,4 +1,8 @@ -<!-- INCLUDE overall_header.html --> +<!-- IF S_PRIVMSGS --> + <!-- INCLUDE ucp_header.html --> +<!-- ELSE --> + <!-- INCLUDE overall_header.html --> +<!-- ENDIF --> <!-- $Id$ --> @@ -43,18 +47,19 @@ function checkForm() </script> <script language="javascript" type="text/javascript" src="styles/subSilver/template/editor.js"></script> - <!-- IF S_FORUM_RULES --> +<!-- IF S_FORUM_RULES --> <p class="forumrules"> - <!-- IF U_FORUM_RULES --> + <!-- IF U_FORUM_RULES --> <a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a> - <!-- ELSE --> + <!-- ELSE --> {L_FORUM_RULES} - <!-- ENDIF --> + <!-- ENDIF --> </p> <br clear="all" /> - <!-- ENDIF --> +<!-- ENDIF --> +<!-- IF not S_PRIVMSGS --> <div id="pageheader"> <h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- ENDIF --></h2> @@ -67,109 +72,138 @@ function checkForm() </div> <br clear="all" /><br /> +<!-- ENDIF --> - <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"{S_FORM_ENCTYPE}> +<!-- IF not S_SHOW_PM_BOX --> + <form action="{S_POST_ACTION}" method="post" name="post"{S_FORM_ENCTYPE}> +<!-- ENDIF --> <!-- IF S_DRAFT_LOADED --> -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th align="center">{L_INFORMATION}</th> - </tr> - <tr> - <td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td> - </tr> -</table> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th align="center">{L_INFORMATION}</th> + </tr> + <tr> + <td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td> + </tr> + </table> -<br clear="all" /> + <br clear="all" /> <!-- ENDIF --> <!-- IF S_SHOW_DRAFTS --> -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="3" align="center">{L_LOAD_DRAFT}</th> - </tr> - <tr> - <td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td> - </tr> - <tr> - <th>{L_SAVE_DATE}</th> - <th>{L_DRAFT_TITLE}</th> - <th>{L_OPTIONS}</th> - </tr> - <!-- BEGIN draftrow --> - - <!-- IF draftrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - - <td class="postdetails">{draftrow.DATE}</td> - <td><b class="gen">{draftrow.DRAFT_SUBJECT}</b><!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --></td> - <td align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></td> - </tr> - <!-- END draftrow --> -</table> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="3" align="center">{L_LOAD_DRAFT}</th> + </tr> + <tr> + <td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td> + </tr> + <tr> + <th>{L_SAVE_DATE}</th> + <th>{L_DRAFT_TITLE}</th> + <th>{L_OPTIONS}</th> + </tr> + <!-- BEGIN draftrow --> + + <!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td> + <td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b> + <!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span> + <!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --> + </td> + <td style="padding: 4px;" align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></td> + </tr> + <!-- END draftrow --> + </table> -<br clear="all" /> + <br clear="all" /> <!-- ENDIF --> <!-- IF S_POST_REVIEW --><!-- INCLUDE posting_review.html --><!-- ENDIF --> +<!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF --> -<!-- IF S_UNGLOBALISE --> -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_MOVE}</th> - </tr> - <tr> - <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - <tr> - <td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM} </span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" /> <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td> - </tr> -</table> +<!-- IF not S_PRIVMSGS and S_UNGLOBALISE --> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{L_MOVE}</th> + </tr> + <tr> + <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <tr> + <td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM} </span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" /> <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td> + </tr> + </table> -<br clear="all" /> + <br clear="all" /> <!-- ENDIF --> -<!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF --> - <table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="2"><b>{L_POST_A}</b></th> </tr> <!-- IF ERROR --> - <tr> - <td class="row2" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td> - </tr> + <tr> + <td class="row2" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td> + </tr> <!-- ENDIF --> <!-- IF S_DELETE_ALLOWED --> - <tr> - <td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td> - <td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> - </tr> + <tr> + <td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td> + <td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> + </tr> <!-- ENDIF --> <!-- IF S_SHOW_TOPIC_ICONS --> - <tr> - <td class="row1"><b class="genmed">{L_ICON}:</b></td> - <td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><input type="radio" name="icon" value="1" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> - </tr> - </table></td> - </tr> + <tr> + <td class="row1"><b class="genmed">{L_ICON}:</b></td> + <td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><input type="radio" name="icon" value="0" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> + </tr> + </table></td> + </tr> <!-- ENDIF --> - <!-- IF S_DISPLAY_USERNAME --> - <tr> - <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> - <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> - </tr> + <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> + <tr> + <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> + <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> + </tr> + <!-- ENDIF --> + + <!-- IF S_PRIVMSGS --> + <tr> + <td class="row1"><b class="genmed">{L_TO}:</b></td> + <td class="row2"> + <!-- BEGIN to_recipient --> + <span class="genmed"> + <a href="{to_recipient.U_VIEW}"><!-- IF to_recipient.COLOUR --><b style="color:#{to_recipient.COLOUR}"><!-- ELSE --><b<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> + <!-- BEGINELSE --> + <span class="genmed">{L_NONE}</span> + <!-- END to_recipient --> + </td> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_BCC}:</b></td> + <td class="row2"> + <!-- BEGIN bcc_recipient --> + <span class="genmed"> + <a href="{bcc_recipient.U_VIEW}"><!-- IF bcc_recipient.COLOUR --><b style="color:#{bcc_recipient.COLOUR}"><!-- ELSE --><b<!-- IF bcc_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> + <!-- BEGINELSE --> + <span class="genmed">{L_NONE}</span> + <!-- END bcc_recipient --> + </td> + </tr> + {S_HIDDEN_ADDRESS_FIELD} <!-- ENDIF --> <tr> @@ -186,9 +220,9 @@ function checkForm() </tr> <!-- IF S_SHOW_EMOTICON_LINK --> - <tr> - <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_EMOTICONS}</a></td> - </tr> + <tr> + <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_EMOTICONS}</a></td> + </tr> <!-- ENDIF --> </table></td> @@ -236,13 +270,15 @@ function checkForm() </tr> </table></td> </tr> + <!-- IF S_INLINE_ATTACHMENT_OPTIONS --> - <tr> - <td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td> - <td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select> <input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_inline();" /> - </td> - </tr> + <tr> + <td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td> + <td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select> <input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_inline();" /> + </td> + </tr> <!-- ENDIF --> + <tr> <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br /><table cellspacing="2" cellpadding="0" border="0"> <tr> @@ -263,24 +299,24 @@ function checkForm() </table></td> <td class="row2"><table cellpadding="1"> <!-- IF S_HTML_ALLOWED --> - <tr> - <td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} /></td> - <td class="gen">{L_DISABLE_HTML}</td> - </tr> + <tr> + <td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} /></td> + <td class="gen">{L_DISABLE_HTML}</td> + </tr> <!-- ENDIF --> <!-- IF S_BBCODE_ALLOWED --> - <tr> - <td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> - <td class="gen">{L_DISABLE_BBCODE}</td> - </tr> + <tr> + <td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> + <td class="gen">{L_DISABLE_BBCODE}</td> + </tr> <!-- ENDIF --> <!-- IF S_SMILIES_ALLOWED --> - <tr> - <td><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /></td> - <td class="gen">{L_DISABLE_SMILIES}</td> - </tr> + <tr> + <td><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /></td> + <td class="gen">{L_DISABLE_SMILIES}</td> + </tr> <!-- ENDIF --> <tr> @@ -289,37 +325,40 @@ function checkForm() </tr> <!-- IF S_SIG_ALLOWED --> - <tr> - <td><input type="checkbox" name="attach_sig"{S_SIGNATURE_CHECKED} /></td> - <td class="gen">{L_ATTACH_SIG}</td> - </tr> + <tr> + <td><input type="checkbox" name="attach_sig"{S_SIGNATURE_CHECKED} /></td> + <td class="gen">{L_ATTACH_SIG}</td> + </tr> <!-- ENDIF --> <!-- IF S_NOTIFY_ALLOWED --> - <tr> - <td><input type="checkbox" name="notify"{S_NOTIFY_CHECKED} /></td> - <td class="gen">{L_NOTIFY_REPLY}</td> - </tr> + <tr> + <td><input type="checkbox" name="notify"{S_NOTIFY_CHECKED} /></td> + <td class="gen">{L_NOTIFY_REPLY}</td> + </tr> <!-- ENDIF --> - <!-- IF S_LOCK_TOPIC_ALLOWED --> - <tr> - <td><input type="checkbox" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td> - <td class="gen">{L_LOCK_TOPIC}</td> - </tr> - <!-- ENDIF --> - <!-- IF S_LOCK_POST_ALLOWED --> - <tr> - <td><input type="checkbox" name="lock_post"{S_LOCK_POST_CHECKED} /></td> - <td class="gen">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</td> - </tr> - <!-- ENDIF --> + <!-- IF not S_PRIVMSGS --> + <!-- IF S_LOCK_TOPIC_ALLOWED --> + <tr> + <td><input type="checkbox" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td> + <td class="gen">{L_LOCK_TOPIC}</td> + </tr> + <!-- ENDIF --> + + <!-- IF S_LOCK_POST_ALLOWED --> + <tr> + <td><input type="checkbox" name="lock_post"{S_LOCK_POST_CHECKED} /></td> + <td class="gen">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</td> + </tr> + <!-- ENDIF --> - <!-- IF S_TYPE_TOGGLE --> - <tr> - <td> </td> - <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> - </tr> + <!-- IF S_TYPE_TOGGLE --> + <tr> + <td> </td> + <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> + </tr> + <!-- ENDIF --> <!-- ENDIF --> </table></td> </tr> @@ -332,10 +371,10 @@ function checkForm() <!-- ENDIF --> <!-- IF S_EDIT_REASON --> - <tr> - <td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> - <td class="row2"><input class="post" type="text" name="edit_reason" size="50" maxlength="100" value="{EDIT_REASON}" /></td> - </tr> + <tr> + <td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> + <td class="row2"><input class="post" type="text" name="edit_reason" size="50" maxlength="100" value="{EDIT_REASON}" /></td> + </tr> <!-- ENDIF --> <!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX --> @@ -347,13 +386,14 @@ function checkForm() <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> <!-- IF S_SHOW_POLL_BOX --> - <!-- INCLUDE posting_poll_body.html --> + <!-- INCLUDE posting_poll_body.html --> <!-- ELSEIF S_POLL_DELETE --> - <tr> - <td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td> - <td class="row2"><input type="checkbox" name="poll_delete" /></td> - </tr> + <tr> + <td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td> + <td class="row2"><input type="checkbox" name="poll_delete" /></td> + </tr> <!-- ENDIF --> + <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" /> <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /><!-- IF S_SAVE_ALLOWED --> <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --><!-- IF S_HAS_DRAFTS --> <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF --> <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /></td> </tr> @@ -363,34 +403,41 @@ function checkForm() <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF --> -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> - </tr> -</table> +<!-- IF S_PRIVMSGS --> + </form> -</form> + <br clear="all" /> -<!-- IF S_DISPLAY_ONLINE_LIST --> -<br clear="all" /> + <!-- INCLUDE ucp_footer.html --> +<!-- ELSE --> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> + </tr> + </table> -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat"><span class="cattitle">{L_WHO_IS_ONLINE}</span></td> - </tr> - <tr> - <td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td> - </tr> -</table> -<!-- ENDIF --> + </form> -<br clear="all" /> + <!-- IF S_DISPLAY_ONLINE_LIST --> + <br clear="all" /> -<table width="100%" cellspacing="1"> - <tr> - <td align="right"><!-- INCLUDE jumpbox.html --></td> - </tr> -</table> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <td class="cat"><span class="cattitle">{L_WHO_IS_ONLINE}</span></td> + </tr> + <tr> + <td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td> + </tr> + </table> + <!-- ENDIF --> + + <br clear="all" /> + <table width="100%" cellspacing="1"> + <tr> + <td align="right"><!-- INCLUDE jumpbox.html --></td> + </tr> + </table> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file + <!-- INCLUDE overall_footer.html --> +<!-- ENDIF -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/posting_progress_bar.html b/phpBB/styles/subSilver/template/posting_progress_bar.html new file mode 100644 index 0000000000..607ff15b35 --- /dev/null +++ b/phpBB/styles/subSilver/template/posting_progress_bar.html @@ -0,0 +1,43 @@ +<script language="javascript" type="text/javascript"> +<!-- + function close_popup() + { + if (opener != null) + { + if (opener.close_waitscreen != null) + { + if (opener.close_waitscreen == 1) + { + opener.close_waitscreen = 0; + self.close(); + return 0; + } + } + } + setTimeout("close_popup()", 1000); + return 0; + } +//--> +</script> + +<!-- INCLUDE simple_header.html --> + +<table width="100%" border="0" cellspacing="0" cellpadding="10"> +<tr> + <td> + <table width="100%" border="0" cellspacing="1" cellpadding="4"> + <tr> + <td valign="top" class="row1" align="center"><br /><span class="gen">{L_UPLOAD_IN_PROGRESS}</span><br /><br /><img src="./images/upload.gif" width="280" height="16" align="center" /><br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td> + </tr> + </table> + </td> +</tr> +</table> + +<!-- INCLUDE simple_footer.html --> + +<script language="javascript" type="text/javascript"> +<!-- + close_popup(); +//--> +</script> diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index 40b4a5f56a..0df62ad1fe 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -2,6 +2,7 @@ <!-- $Id$ --> +<form method="post" action="{S_REPORT_ACTION}" name="report"> <table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="2">{L_REPORT_POST}</th> @@ -27,6 +28,7 @@ <td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" /> <input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}"></td> </tr> </table> +</form> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/ucp_attachments.html b/phpBB/styles/subSilver/template/ucp_attachments.html index ab98fba832..c6d42d8bfa 100644 --- a/phpBB/styles/subSilver/template/ucp_attachments.html +++ b/phpBB/styles/subSilver/template/ucp_attachments.html @@ -41,12 +41,7 @@ <!-- END attachrow --> <tr> - <td class="cat" colspan="6"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td width="100%" align="center"><span class="gensmall">{L_SORT_BY}: </span><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> <input class="btnlite" type="submit" name="sort" value="{L_SORT}" /></td> - <td align="right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </td> - </tr> - </table></td> + <td class="cat" colspan="6"><div style="float:left"><span class="gensmall">{L_SORT_BY}: </span><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> <input class="btnlite" type="submit" name="sort" value="{L_SORT}" /></div><div style="float:right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </div></td> </tr> </table> diff --git a/phpBB/styles/subSilver/template/ucp_main_drafts.html b/phpBB/styles/subSilver/template/ucp_main_drafts.html index 579f737d5a..3d844bf2fb 100644 --- a/phpBB/styles/subSilver/template/ucp_main_drafts.html +++ b/phpBB/styles/subSilver/template/ucp_main_drafts.html @@ -32,7 +32,12 @@ <!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td> - <td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b><!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --></td> + <td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b> + <!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span> + <!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --> + </td> <td style="padding: 4px;" align="center"><span class="gen"><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a><br /><!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></td> <td style="padding: 4px;" align="center"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" /></td> </tr> diff --git a/phpBB/styles/subSilver/template/ucp_pm_body.html b/phpBB/styles/subSilver/template/ucp_pm_body.html deleted file mode 100644 index 4644bdb768..0000000000 --- a/phpBB/styles/subSilver/template/ucp_pm_body.html +++ /dev/null @@ -1,120 +0,0 @@ - -<script language="Javascript" type="text/javascript"> - // - // Should really check the browser to stop this whining ... - // - function select_switch(status) - { - for (i = 0; i < document.privmsg_list.length; i++) - { - document.privmsg_list.elements[i].checked = status; - } - } -</script> - -<table border="0" cellspacing="0" cellpadding="0" align="center" width="100%"> - <tr> - <td valign="top" align="center" width="100%"> - <table height="40" cellspacing="2" cellpadding="2" border="0"> - <tr valign="middle"> - <td>{INBOX_IMG}</td> - <td><span class="cattitle">{INBOX} </span></td> - <td>{SENTBOX_IMG}</td> - <td><span class="cattitle">{SENTBOX} </span></td> - <td>{OUTBOX_IMG}</td> - <td><span class="cattitle">{OUTBOX} </span></td> - <td>{SAVEBOX_IMG}</td> - <td><span class="cattitle">{SAVEBOX} </span></td> - </tr> - </table> - </td> - <td align="right"> - <!-- BEGIN switch_box_size_notice --> - <table width="175" cellspacing="1" cellpadding="2" border="0" class="bodyline"> - <tr> - <td colspan="3" width="100%" class="row1" nowrap="nowrap"><span class="gensmall">{BOX_SIZE_STATUS}</span></td> - </tr> - <tr> - <td colspan="3" width="100%" class="row2"> - <table cellspacing="0" cellpadding="1" border="0"> - <tr> - <td bgcolor="{T_TD_COLOR2}"><img src="templates/subSilver/images/spacer.gif" width="{INBOX_LIMIT_IMG_WIDTH}" height="8" alt="{INBOX_LIMIT_PERCENT}" /></td> - </tr> - </table> - </td> - </tr> - <tr> - <td width="33%" class="row1"><span class="gensmall">0%</span></td> - <td width="34%" align="center" class="row1"><span class="gensmall">50%</span></td> - <td width="33%" align="right" class="row1"><span class="gensmall">100%</span></td> - </tr> - </table> - <!-- END switch_box_size_notice --> - </td> - </tr> -</table> - -<br clear="all" /> - -<form method="post" name="privmsg_list" action="{S_PRIVMSGS_ACTION}"> - <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" valign="middle">{POST_PM_IMG}</td> - <td align="left" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> - <td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}: - <select name="msgdays">{S_SELECT_MSG_DAYS} - </select> - <input type="submit" value="{L_GO}" name="submit_msgdays" class="btnlite" /> - </span></td> - </tr> - </table> - - <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> - <tr> - <th width="5%" height="25" class="thCornerL" nowrap="nowrap"> {L_FLAG} </th> - <th width="55%" class="thTop" nowrap="nowrap"> {L_SUBJECT} </th> - <th width="20%" class="thTop" nowrap="nowrap"> {L_FROM_OR_TO} </th> - <th width="15%" class="thTop" nowrap="nowrap"> {L_DATE} </th> - <th width="5%" class="thCornerR" nowrap="nowrap"> {L_MARK} </th> - </tr> - <!-- BEGIN listrow --> - <tr> - <td class="{listrow.ROW_CLASS}" width="5%" align="center" valign="middle"><img src="{listrow.PRIVMSG_FOLDER_IMG}" width="19" height="18" alt="{listrow.L_PRIVMSG_FOLDER_ALT}" title="{listrow.L_PRIVMSG_FOLDER_ALT}" /></td> - <td width="55%" valign="middle" class="{listrow.ROW_CLASS}"><span class="topictitle"> <a href="{listrow.U_READ}" class="topictitle">{listrow.SUBJECT}</a></span></td> - <td width="20%" valign="middle" align="center" class="{listrow.ROW_CLASS}"><span class="name"> <a href="{listrow.U_FROM_USER_PROFILE}" class="name">{listrow.FROM}</a></span></td> - <td width="15%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.DATE}</span></td> - <td width="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails"> - <input type="checkbox" name="mark[]2" value="{listrow.S_MARK_ID}" /> - </span></td> - </tr> - <!-- END listrow --> - <!-- BEGIN switch_no_messages --> - <tr> - <td class="row1" colspan="5" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> - </tr> - <!-- END switch_no_messages --> - <tr> - <td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS} - <input type="submit" name="save" value="{L_SAVE_MARKED}" class="btnmain" /> - - <input type="submit" name="delete" value="{L_DELETE_MARKED}" class="btnlite" /> - - <input type="submit" name="deleteall" value="{L_DELETE_ALL}" class="btnlite" /> - </td> - </tr> - </table> - - <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> - <tr> - <td align="left" valign="middle"><span class="nav">{POST_PM_IMG}</span></td> - <td align="left" valign="middle" width="100%"><span class="nav">{PAGE_NUMBER}</span></td> - <td align="right" valign="top" nowrap="nowrap"><b><span class="gensmall"><a href="javascript:select_switch(true);" class="gensmall">{L_MARK_ALL}</a> :: <a href="javascript:select_switch(false);" class="gensmall">{L_UNMARK_ALL}</a></span></b><br /><span class="nav">{PAGINATION}<br /></span><span class="gensmall">{S_TIMEZONE}</span></td> - </tr> - </table> -</form> - -<table width="100%" border="0"> - <tr> - <td align="right" valign="top">{JUMPBOX}</td> - </tr> -</table> diff --git a/phpBB/styles/subSilver/template/ucp_pm_popup.html b/phpBB/styles/subSilver/template/ucp_pm_popup.html index e48205b338..08314acf87 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_popup.html +++ b/phpBB/styles/subSilver/template/ucp_pm_popup.html @@ -1,22 +1,25 @@ +<!-- INCLUDE simple_header.html --> <script language="javascript" type="text/javascript"> <!-- function jump_to_inbox() { - opener.document.location.href = "{U_PRIVATEMSGS}"; + opener.document.location.href = "{U_RETURN_INBOX}"; window.close(); } //--> </script> - <table width="100%" border="0" cellspacing="0" cellpadding="10"> - <tr> - <td> - <table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline"> - <tr> - <td valign="top" class="row1" align="center"><br /><span class="gen">{L_MESSAGE}</span><br /><br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span><br /><br /></td> - </tr> +<table width="100%" border="0" cellspacing="0" cellpadding="10"> +<tr> + <td> + <table width="100%" border="0" cellspacing="1" cellpadding="4"> + <tr> + <td valign="top" class="row1" align="center"><br /><span class="gen">{MESSAGE}</span><br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td> + </tr> </table> - </td> - </tr> - </table> + </td> +</tr> +</table> + +<!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_pm_preview.html b/phpBB/styles/subSilver/template/ucp_pm_preview.html deleted file mode 100644 index ba2ed932fd..0000000000 --- a/phpBB/styles/subSilver/template/ucp_pm_preview.html +++ /dev/null @@ -1,27 +0,0 @@ - -<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> - <tr> - <th height="25" class="thHead" colspan="2">{L_PREVIEW}</th> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_FROM}:</span></td> - <td width="100%" class="row2"><span class="genmed">{MESSAGE_FROM}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_TO}:</span></td> - <td width="100%" class="row2"><span class="genmed">{MESSAGE_TO}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_POSTED}:</span></td> - <td width="100%" class="row2"><span class="genmed">{POST_DATE}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_SUBJECT}:</span></td> - <td width="100%" class="row2"><span class="genmed">{POST_SUBJECT}</span></td> - </tr> - <tr> - <td valign="top" colspan="2" class="row1"><span class="postbody">{MESSAGE}</span></td> - </tr> -</table> - -<br clear="all" /> diff --git a/phpBB/styles/subSilver/template/ucp_pm_read.html b/phpBB/styles/subSilver/template/ucp_pm_read.html deleted file mode 100644 index e38019f738..0000000000 --- a/phpBB/styles/subSilver/template/ucp_pm_read.html +++ /dev/null @@ -1,86 +0,0 @@ - -<table cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td valign="middle">{INBOX_IMG}</td> - <td valign="middle"><span class="cattitle">{INBOX} </span></td> - <td valign="middle">{SENTBOX_IMG}</td> - <td valign="middle"><span class="cattitle">{SENTBOX} </span></td> - <td valign="middle">{OUTBOX_IMG}</td> - <td valign="middle"><span class="cattitle">{OUTBOX} </span></td> - <td valign="middle">{SAVEBOX_IMG}</td> - <td valign="middle"><span class="cattitle">{SAVEBOX}</span></td> - </tr> -</table> - -<br clear="all" /> - -<form method="post" action="{S_PRIVMSGS_ACTION}"> -<table width="100%" cellspacing="2" cellpadding="2" border="0"> - <tr> - <td valign="middle">{REPLY_PM_IMG}</td> - <td width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> - </tr> -</table> - -<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> - <tr> - <th colspan="3" class="thHead" nowrap="nowrap">{BOX_NAME} :: {L_MESSAGE}</th> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_FROM}:</span></td> - <td width="100%" class="row2" colspan="2"><span class="genmed">{MESSAGE_FROM}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_TO}:</span></td> - <td width="100%" class="row2" colspan="2"><span class="genmed">{MESSAGE_TO}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_POSTED}:</span></td> - <td width="100%" class="row2" colspan="2"><span class="genmed">{POST_DATE}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{L_SUBJECT}:</span></td> - <td width="100%" class="row2"><span class="genmed">{POST_SUBJECT}</span></td> - <td nowrap="nowrap" class="row2" align="right"> {QUOTE_PM_IMG} {EDIT_PM_IMG}</td> - </tr> - <tr> - <td valign="top" colspan="3" class="row1"><span class="postbody">{MESSAGE}</span></td> - </tr> - <tr> - <td width="78%" height="28" valign="bottom" colspan="3" class="row1"> - <table cellspacing="0" cellpadding="0" border="0" height="18"> - <tr> - <td valign="middle" nowrap="nowrap">{PROFILE_IMG} {PM_IMG} {EMAIL_IMG} - {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td><td> </td><td valign="top" nowrap="nowrap"><script language="JavaScript" type="text/javascript"><!-- - - if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 ) - document.write('{ICQ_IMG}'); - else - document.write('<div style="position:relative"><div style="position:absolute">{ICQ_IMG}</div><div style="position:absolute;left:3px">{ICQ_STATUS_IMG}</div></div>'); - - //--></script><noscript>{ICQ_IMG}</noscript></td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="catBottom" colspan="3" height="28" align="right"> {S_HIDDEN_FIELDS} - <input type="submit" name="save" value="{L_SAVE_MSG}" class="btnlite" /> - - <input type="submit" name="delete" value="{L_DELETE_MSG}" class="btnlite" /> - </td> - </tr> - </table> - <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> - <tr> - <td>{REPLY_PM_IMG}</td> - <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td> - </tr> - </table> -</form> - -<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> - <tr> - <td valign="top" align="right"><span class="gensmall">{JUMPBOX}</span></td> - </tr> -</table> diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index 63d896c1d5..84c05981b7 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -17,7 +17,7 @@ <!-- IF S_DISPLAY_ACTIVE --> <table class="tablebg" width="100%" cellspacing="1"> <tr> - <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">Active Topics</span></td> + <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">{L_ACTIVE_TOPICS}</span></td> </tr> <tr> |