diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
commit | 5b0bba72b1c619af2f39859ec0c262f860f991ac (patch) | |
tree | 9fb003cf223ff6bf2e26feb78a35603dff88a471 /phpBB/templates | |
parent | 65aa92182826eb06830626df49ab7a0210b06718 (diff) | |
download | forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.gz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.bz2 forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.xz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.zip |
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/templates')
-rw-r--r-- | phpBB/templates/subSilver/admin/board_config_body.tpl | 6 | ||||
-rw-r--r-- | phpBB/templates/subSilver/admin/ranks_list_body.tpl | 4 | ||||
-rw-r--r-- | phpBB/templates/subSilver/index_body.tpl | 43 | ||||
-rw-r--r-- | phpBB/templates/subSilver/posting_body.tpl | 2 | ||||
-rw-r--r-- | phpBB/templates/subSilver/posting_topic_review.tpl | 2 | ||||
-rw-r--r-- | phpBB/templates/subSilver/viewforum_body.tpl | 4 |
6 files changed, 32 insertions, 29 deletions
diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index f1635830d2..a7e253e108 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -117,15 +117,15 @@ <td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED} />{L_ENABLED} <input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED} />{L_DISABLED}</td> </tr> <tr> - <td class="row1">{L_INBOX_LIMIT}</span></td> + <td class="row1">{L_INBOX_LIMIT}</td> <td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td> </tr> <tr> - <td class="row1">{L_SENTBOX_LIMIT}</span></td> + <td class="row1">{L_SENTBOX_LIMIT}</td> <td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td> </tr> <tr> - <td class="row1">{L_SAVEBOX_LIMIT}</span></td> + <td class="row1">{L_SAVEBOX_LIMIT}</td> <td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td> </tr> <tr> diff --git a/phpBB/templates/subSilver/admin/ranks_list_body.tpl b/phpBB/templates/subSilver/admin/ranks_list_body.tpl index 9060e5841b..368326fa17 100644 --- a/phpBB/templates/subSilver/admin/ranks_list_body.tpl +++ b/phpBB/templates/subSilver/admin/ranks_list_body.tpl @@ -16,8 +16,8 @@ <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td> <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td> <td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td> - <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td> - <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td> + <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</a></td> + <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</a></td> </tr> <!-- END ranks --> <tr> diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl index c073d22b5a..b06c77a637 100644 --- a/phpBB/templates/subSilver/index_body.tpl +++ b/phpBB/templates/subSilver/index_body.tpl @@ -1,15 +1,21 @@ + <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom"><span class="gensmall"> - <!-- BEGIN switch_user_logged_in --> - {LAST_VISIT_DATE}<br /> - <!-- END switch_user_logged_in --> - {CURRENT_TIME}<br /></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> - <td align="right" valign="bottom" class="gensmall"> - <!-- BEGIN switch_user_logged_in --> - <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br /> - <!-- END switch_user_logged_in --> - <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a></td> + <td width="100%" align="left" valign="bottom"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td align="left" valign="bottom"><p><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span></p><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> + <td align="right" class="gensmall" valign="bottom"> + <!-- BEGIN switch_user_logged_in --> + <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br /> + <!-- END switch_user_logged_in --> + <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br /> + <br /> + <!-- BEGIN switch_user_logged_in --> + {LAST_VISIT_DATE}<br /> + <!-- END switch_user_logged_in --> + {CURRENT_TIME}</td> + </tr> + </table></td> </tr> </table> @@ -27,10 +33,8 @@ </tr> <!-- BEGIN forumrow --> <tr> - <td class="row1" align="center" valign="middle" height="50"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> - <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> - </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /> - </span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td> + <td class="row1" width="50" height="50" align="center" valign="middle"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> + <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /></span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /></span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td> <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td> <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td> <td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{catrow.forumrow.LAST_POST}</span></td> @@ -46,17 +50,16 @@ </tr> </table> -<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> +<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <td class="catHead" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td> </tr> <tr> - <td class="row1" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td> - <td class="row1" align="left" width="100%"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span> - </td> + <td class="row1" width="46" rowspan="2" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td> + <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td> </tr> - <tr> - <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td> + <tr> + <td class="row1" align="left"><span class="gensmall"><b>{L_LEGEND}</b> :: {L_WHOSONLINE_ADMIN} - {L_WHOSONLINE_MOD} - {L_WHOSONLINE_USER}</span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl index 15cfabaddc..08d7108bb7 100644 --- a/phpBB/templates/subSilver/posting_body.tpl +++ b/phpBB/templates/subSilver/posting_body.tpl @@ -279,7 +279,7 @@ function storeCaret(textEl) { <!-- END smilies_row --> <!-- BEGIN switch_smilies_extra --> <tr align="center"> - <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td> + <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> </tr> <!-- END switch_smilies_extra --> </table> diff --git a/phpBB/templates/subSilver/posting_topic_review.tpl b/phpBB/templates/subSilver/posting_topic_review.tpl index e712abe004..7b8960c0fa 100644 --- a/phpBB/templates/subSilver/posting_topic_review.tpl +++ b/phpBB/templates/subSilver/posting_topic_review.tpl @@ -7,7 +7,7 @@ <tr> <td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" > <!-- END switch_inline_mode --> -<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" style="border: 0px #006699 solid "> +<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <tr> <th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th> <th class="thCornerR">{L_MESSAGE}</th> diff --git a/phpBB/templates/subSilver/viewforum_body.tpl b/phpBB/templates/subSilver/viewforum_body.tpl index 40a4f12158..df8ecfd0ad 100644 --- a/phpBB/templates/subSilver/viewforum_body.tpl +++ b/phpBB/templates/subSilver/viewforum_body.tpl @@ -3,7 +3,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td> - <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td> + <td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td> </tr> <tr> <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td> @@ -18,7 +18,7 @@ <th width="50" align="center" class="thTop" nowrap="nowrap"> {L_REPLIES} </th> <th width="100" align="center" class="thTop" nowrap="nowrap"> {L_AUTHOR} </th> <th width="50" align="center" class="thTop" nowrap="nowrap"> {L_VIEWS} </th> - <th align="center" nowrap="nowrap" class="thCornerR" nowrap="nowrap"> {L_LASTPOST} </th> + <th align="center" class="thCornerR" nowrap="nowrap"> {L_LASTPOST} </th> </tr> <!-- BEGIN topicrow --> <tr> |