makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- log entries for deleted topics don't provide a link to the topic or to the topic logs, do we need to change handling of this else where?

Browse source 
- added select all/deselect all to mcp_forum
- realigned mcp_forum.html
- don't display announcements on all pages in mcp_forum => easier use of "select all" + delete/other function


git-svn-id: file:///svn/phpbb/trunk@5609 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-03-08 17:56:24 +00:00
parent 91720e826f
commit 38176447a8
5 changed files with 65 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/mcp/mcp_forum.php
View file

@ -89,22 +89,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
FROM ' . TOPICS_TABLE . " t FROM ' . TOPICS_TABLE . " t
WHERE (t.forum_id = $forum_id OR t.forum_id = 0) WHERE (t.forum_id = $forum_id OR t.forum_id = 0)
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
AND t.topic_type IN (" . POST_ANNOUNCE . ", " . POST_GLOBAL . ")
$limit_time_sql
ORDER BY $sort_order_sql";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$topic_rows[] = $row;
}
$db->sql_freeresult($result);
$sql = 'SELECT t.*
FROM ' . TOPICS_TABLE . " t
WHERE t.forum_id = $forum_id
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . '
AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ")
$limit_time_sql $limit_time_sql
ORDER BY t.topic_type DESC, $sort_order_sql"; ORDER BY t.topic_type DESC, $sort_order_sql";
$result = $db->sql_query_limit($sql, $topics_per_page, $start); $result = $db->sql_query_limit($sql, $topics_per_page, $start);

4
phpBB/includes/mcp/mcp_front.php
View file

@ -187,8 +187,8 @@ function mcp_front_view($id, $mode, $action)
'IP' => $row['ip'], 'IP' => $row['ip'],
'TIME' => $user->format_date($row['time']), 'TIME' => $user->format_date($row['time']),
'ACTION' => $row['action'], 'ACTION' => $row['action'],
'U_VIEWTOPIC' => $row['viewtopic'], 'U_VIEWTOPIC' => isset($row['viewtopic']) ? $row['viewtopic'] : '',
'U_VIEWLOGS' => $row['viewlogs']) 'U_VIEWLOGS' => isset($row['viewlogs']) ? $row['viewlogs'] : '')
); );
} }
} }

112
phpBB/styles/subSilver/template/mcp_forum.html
View file

@ -1,60 +1,66 @@
<!-- INCLUDE mcp_header.html --> <!-- INCLUDE mcp_header.html -->
<!-- $Id$ --> <!-- $Id$ -->
<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF --> <!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
<form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> <form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> <td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
</tr> </tr>
<tr> <tr>
<th width="4%" nowrap="nowrap">&nbsp;</th> <th width="4%" nowrap="nowrap">&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th> <th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th> <th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th> <th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
<th width="5%" nowrap="nowrap">&nbsp;{L_MARK}&nbsp;</th> <th width="5%" nowrap="nowrap">&nbsp;{L_MARK}&nbsp;</th>
</tr> </tr>
<!-- BEGIN topicrow --> <!-- BEGIN topicrow -->
<tr> <tr>
<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
<!-- IF S_TOPIC_ICONS --> <!-- IF S_TOPIC_ICONS -->
<!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td --> <!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td -->
<!-- ENDIF --> <!-- ENDIF -->
<td class="row1"> <td class="row1">
<!-- IF topicrow.S_SELECT_TOPIC --> <!-- IF topicrow.S_SELECT_TOPIC -->
<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span> <span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_UNAPPROVED --> <!-- IF topicrow.S_TOPIC_UNAPPROVED -->
<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp; <a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_REPORTED --> <!-- IF topicrow.S_TOPIC_REPORTED -->
<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp; <a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
<!-- ENDIF --> <!-- ENDIF -->
<p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p> <p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
</td> </td>
<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
<td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td> <td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td>
<td class="row2" align="center"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" {topicrow.S_TOPIC_CHECKED}/></td> <td class="row2" align="center"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" {topicrow.S_TOPIC_CHECKED}/></td>
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="8" height="28" align="center"><p class="gen">{L_NO_TOPICS}</p></td> <td class="row1" colspan="8" height="28" align="center"><p class="gen">{L_NO_TOPICS}</p></td>
</tr> </tr>
<!-- END topicrow --> <!-- END topicrow -->
<tr> <tr>
<td class="cat" colspan="6" align="right"> <td class="cat" colspan="6" align="right">
<select name="action"> <select name="action">
<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF --> <!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF --> <!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF --> <!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> <!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
</select> </select>
<input class="btnmain" type="submit" value="{L_SUBMIT}" /> <input class="btnmain" type="submit" value="{L_SUBMIT}" />
</td> </td>
</tr> </tr>
</table></form> </table></form>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', false);">{L_UNMARK_ALL}</a></b></td>
</tr>
</table>
<!-- INCLUDE mcp_footer.html --> <!-- INCLUDE mcp_footer.html -->

2
phpBB/styles/subSilver/template/mcp_post.html
View file

@ -1,5 +1,7 @@
<!-- INCLUDE mcp_header.html --> <!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"> <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}">
<tr> <tr>
<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th> <th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>

2
phpBB/styles/subSilver/template/mcp_topic.html
View file

@ -1,5 +1,7 @@
<!-- INCLUDE mcp_header.html --> <!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> <form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
<!-- IF S_CAN_SPLIT --> <!-- IF S_CAN_SPLIT -->
<tr> <tr>