aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subSilver
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-06 18:43:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-06 18:43:55 +0000
commit0f0d160ded7fd129d40a4ec0372cab11d7ce7a88 (patch)
treef8e6f506f09bb6fdb81deece5da18f2ee41e3a7e /phpBB/styles/subSilver
parentc645088a34bfcaf31ba10e90badb148a284e7133 (diff)
downloadforums-0f0d160ded7fd129d40a4ec0372cab11d7ce7a88.tar
forums-0f0d160ded7fd129d40a4ec0372cab11d7ce7a88.tar.gz
forums-0f0d160ded7fd129d40a4ec0372cab11d7ce7a88.tar.bz2
forums-0f0d160ded7fd129d40a4ec0372cab11d7ce7a88.tar.xz
forums-0f0d160ded7fd129d40a4ec0372cab11d7ce7a88.zip
- support re-caching of theme data if stylesheet.css changed and load_tplcompile enabled
- mcp fixes - fixed some usability issues git-svn-id: file:///svn/phpbb/trunk@6447 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subSilver')
-rw-r--r--phpBB/styles/subSilver/template/jumpbox.html2
-rw-r--r--phpBB/styles/subSilver/template/mcp_forum.html4
-rw-r--r--phpBB/styles/subSilver/template/mcp_post.html8
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/styles/subSilver/template/jumpbox.html b/phpBB/styles/subSilver/template/jumpbox.html
index 1f1b06d9be..2f54ebc488 100644
--- a/phpBB/styles/subSilver/template/jumpbox.html
+++ b/phpBB/styles/subSilver/template/jumpbox.html
@@ -4,7 +4,7 @@
<table cellspacing="0" cellpadding="0" border="0">
<tr>
- <td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
+ <td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
<!-- BEGIN jumpbox_forums -->
<!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF -->
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index 5d45eb17a3..4aa6050a8d 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -1,7 +1,11 @@
<!-- INCLUDE mcp_header.html -->
+<!-- IF S_MERGE_SELECT --><div style="float: right;"><!-- INCLUDE jumpbox.html --></div><!-- ENDIF -->
+
<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
+<!-- IF S_MERGE_SELECT --><br clear="right" /><!-- ENDIF -->
+
<form method="post" id="mcp" action="{S_MCP_ACTION}">
<table class="tablebg" width="100%" cellspacing="1">
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index e36106bf4a..e4e8d38cab 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -127,12 +127,8 @@
<td colspan="2" class="cat"><b class="gen">{L_OTHER_USERS}</b></td>
</tr>
<!-- BEGIN userrow -->
- <!-- IF userrow.S_ROW_COUNT is even -->
- <tr class="row1">
- <!-- ELSE -->
- <tr class="row2">
- <!-- ENDIF -->
- <td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
+ <!-- IF userrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+ <td><span class="gen"><!-- IF userrow.U_PROFILE --><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a><!-- ELSE -->{userrow.USERNAME}<!-- ENDIF --> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
<td align="center"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
</tr>
<!-- BEGINELSE -->