aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/templates
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-11-19 18:55:23 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-11-19 18:55:23 +0000
commitc1fc6dce16cf70a690bd02fd6bbb501527c6b7c4 (patch)
treebad6e0996d20604d40f882db55e62abb9e42e663 /phpBB/templates
parentb468fd6e29c65f9a5825ebbbd33845e0fa549380 (diff)
downloadforums-c1fc6dce16cf70a690bd02fd6bbb501527c6b7c4.tar
forums-c1fc6dce16cf70a690bd02fd6bbb501527c6b7c4.tar.gz
forums-c1fc6dce16cf70a690bd02fd6bbb501527c6b7c4.tar.bz2
forums-c1fc6dce16cf70a690bd02fd6bbb501527c6b7c4.tar.xz
forums-c1fc6dce16cf70a690bd02fd6bbb501527c6b7c4.zip
Further layout faffing, nav links for viewtopic (code needs merging with viewforum/posting), moderators for viewtopic
git-svn-id: file:///svn/phpbb/trunk@3063 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/templates')
-rw-r--r--phpBB/templates/subSilver/viewforum_body.html37
-rw-r--r--phpBB/templates/subSilver/viewforum_subforum.html25
-rw-r--r--phpBB/templates/subSilver/viewtopic_body.html14
3 files changed, 62 insertions, 14 deletions
diff --git a/phpBB/templates/subSilver/viewforum_body.html b/phpBB/templates/subSilver/viewforum_body.html
index 68a635f89a..85d4f35ef2 100644
--- a/phpBB/templates/subSilver/viewforum_body.html
+++ b/phpBB/templates/subSilver/viewforum_body.html
@@ -2,12 +2,31 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
- <td colspan="2" align="left" valign="bottom"><a class="maintitle" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a> <br /><span class="gensmall"><!-- IF S_IS_POSTABLE --><b>{L_MODERATORS}: {MODERATORS}</b><!-- ENDIF --><br /><br /><b>{LOGGED_IN_USER_LIST}</b></span></td>
- <td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><!-- IF S_IS_POSTABLE -->{MOD_CP}<br /><br /><!-- ENDIF --><br /><b>{PAGINATION}</b></span></td>
+ <td align="left" valign="bottom"><a class="maintitle" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><br /><!-- IF S_IS_POSTABLE --><span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span><!-- ENDIF --></td>
+ <td align="right" valign="bottom"><!-- IF S_IS_POSTABLE --><span class="gensmall">{MOD_CP}</span><!-- ENDIF --></td>
</tr>
+ <tr>
+ <td valign="bottom"><span class="gensmall"><b>{LOGGED_IN_USER_LIST}</b></span></td>
+ <td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
+ </tr>
+</table>
+
+<!-- if we have subforums output navigational links (for ease of use) and then include the subforum listing, else output the new post image and associated nav links -->
+<!-- IF S_HAS_SUBFORUM -->
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+ <tr>
+ <td class="nav" width="100%" align="left" valign="middle"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>
+ <!-- BEGIN navlinks -->
+ -> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a>
+ <!-- END navlinks -->
+ </span></td>
+ </tr>
+</table>
-<!-- IF S_HAS_SUBFORUM --><!-- INCLUDE viewforum_subforum.html --><br /><!-- ENDIF -->
+<!-- INCLUDE viewforum_subforum.html -->
+<!-- ELSE -->
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td width="50" align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></a></td>
@@ -16,10 +35,12 @@
-> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a>
<!-- END navlinks -->
</span></td>
- <td class="nav" align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
+ <td class="nav" align="right" valign="bottom" nowrap="nowrap"><!-- IF S_IS_POSTABLE --><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span><!-- ENDIF --></td>
</tr>
</table>
+<!-- ENDIF -->
+<!-- if the forum is postable output the viewforum listing -->
<!-- IF S_IS_POSTABLE -->
<table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
<tr>
@@ -46,9 +67,9 @@
<td class="row1" colspan="8" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
</tr>
<!-- END topicrow -->
- <tr>
- <form method="post" action="{S_FORUM_ACTION}"><td class="catBottom" colspan="8" height="28" align="center" valign="middle"><span class="genmed">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_SORT_DAYS}&nbsp;{L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="sort" /></span></td></form>
- </tr>
+ <tr><form method="post" action="{S_FORUM_ACTION}">
+ <td class="catBottom" colspan="8" height="28" align="center" valign="middle"><span class="genmed">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_SORT_DAYS}&nbsp;{L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="sort" /></span></td>
+ </form></tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
@@ -68,6 +89,7 @@
<td colspan="2"><span class="gensmall">{S_WATCH_FORUM}</span></td>
</tr>
</table>
+<!-- ENDIF -->
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
@@ -75,6 +97,7 @@
</tr>
</table>
+<!-- IF S_IS_POSTABLE -->
<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0">
diff --git a/phpBB/templates/subSilver/viewforum_subforum.html b/phpBB/templates/subSilver/viewforum_subforum.html
index 0acde8d353..0efd298888 100644
--- a/phpBB/templates/subSilver/viewforum_subforum.html
+++ b/phpBB/templates/subSilver/viewforum_subforum.html
@@ -13,11 +13,32 @@
<!-- ELSE -->
<tr>
<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
- <td class="row1" width="100%" height="50"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{L_MODERATORS}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><b>{forumrow.L_SUBFORUM}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
+ <td class="row1" width="100%" height="50" valign="top"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{L_MODERATORS}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{forumrow.LAST_POST}</span></td>
</tr>
<!-- ENDIF -->
<!-- END forumrow -->
-</table> \ No newline at end of file
+</table>
+
+<!-- if the forum is postable then output the post img and associated text, else add a break so the jumpbox isn't squashed right below the forum listing -->
+<!-- IF S_IS_POSTABLE -->
+<br />
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+ <tr>
+ <td width="50" align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+ <td class="nav" width="100%" align="left" valign="middle"><span class="nav">&nbsp; &nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a>
+ <!-- BEGIN navlinks -->
+ -> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a>
+ <!-- END navlinks -->
+ </span></td>
+ <td class="nav" align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
+ </tr>
+</table>
+<!-- ELSE -->
+
+<br />
+
+<!-- ENDIF -->
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html
index d2a1480868..83a081bf74 100644
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -1,15 +1,19 @@
<!-- INCLUDE overall_header.html -->
-<table width="100%" cellspacing="2" cellpadding="2" border="0">
+<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_TOPIC}">{TOPIC_TITLE}</a></span><br /><span class="gensmall">{MOD_CP}</span><br /><br /></td>
+ <td align="left" valign="bottom"><a class="maintitle" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></span><br /><span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td>
+ <td align="right" valign="bottom"><span class="gensmall">{MOD_CP}</span></td>
+ </tr>
+ <tr>
+ <td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
</tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr>
- <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp; &nbsp;<a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></span></td>
- <td align="left" valign="middle" width="100%"><span class="nav">&nbsp; &nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
+ <td align="left" valign="middle" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp; &nbsp;<a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></span></td>
+ <td class="nav" width="100%" align="left" valign="middle"><span class="nav">&nbsp; &nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></span></td>
</tr>
</table>
@@ -130,7 +134,7 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" valign="middle" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp; &nbsp;<a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></span></td>
- <td align="left" valign="middle" width="100%"><span class="nav">&nbsp; &nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
+ <td class="nav" width="100%" align="left" valign="middle"><span class="nav">&nbsp; &nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a class="nav" href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
</tr>
<tr>