diff options
| -rwxr-xr-x | phpBB/includes/mcp/mcp_notes.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 7 | ||||
| -rwxr-xr-x | phpBB/styles/subSilver/template/mcp_notes_user.html | 8 |
4 files changed, 19 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 890b3d0a81..017eff26f3 100755 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -208,12 +208,12 @@ function mcp_notes_user_view($id, $mode, $action) } } - $pagination = generate_pagination("mcp.$phpEx$SID&i=$id&mode=$mode&u=$user_id&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start); - $template->assign_vars(array( 'U_POST_ACTION' => "mcp.$phpEx$SID&i=$id&mode=$mode&u=$user_id", 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'PAGINATION' => $pagination, + 'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start), + 'PAGINATION' => generate_pagination("mcp.$phpEx$SID&i=$id&mode=$mode&u=$user_id&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start), + 'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count), 'USERNAME' => $userrow['username'], 'USER_COLOR' => (!empty($userrow['user_colour'])) ? $userrow['user_colour'] : '', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 2895a51aac..d7516b86f8 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -316,6 +316,7 @@ $lang += array( 'REPLY_WITH_QUOTE' => 'Reply with quote', 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'REPLYING_MESSAGE' => 'Replying to message in %s', + 'REPORT_BY' => 'Report by', 'REPORT_POST' => 'Report this post', 'RESEND_ACTIVATION' => 'Resend activation email', 'RESET' => 'Reset', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index cb71932ba7..eabc8f98a6 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -78,6 +78,8 @@ $lang += array( 'LATEST_REPORTED' => 'Latest 5 reports', 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting for approval', 'LEAVE_SHADOW' => 'Leave shadow topic in place', + 'LIST_REPORT' => '1 Report', + 'LIST_REPORTS' => '%d Reports', 'LOCK' => 'Lock', 'LOCK_POST_POST' => 'Lock Post', 'LOCK_POST_POST_CONFIRM'=> 'Are you sure you want to prevent editing this post?', @@ -129,6 +131,10 @@ $lang += array( 'MCP_MAKE_NORMALS' => 'Make Standard Topics', 'MCP_MAKE_NORMALS_CONFIRM' => 'Are you sure you want to revert the selected topics?', + 'MCP_NOTES' => 'User Notes', + 'MCP_NOTES_FRONT' => 'Front Page', + 'MCP_NOTES_USER' => 'User Details', + 'MCP_QUEUE' => 'Moderation Queue', 'MCP_QUEUE_REPORTS' => 'Reports', 'MCP_QUEUE_UNAPPROVED_POSTS' => 'Posts awaiting for approval', @@ -198,6 +204,7 @@ $lang += array( 'SELECT_ACTION' => 'Select desired action', 'SELECT_TOPIC' => 'Select topic', + 'SELECT_USER' => 'Select user', 'SORT_ACTION' => 'Log action', 'SORT_DATE' => 'Date', 'SORT_IP' => 'IP address', diff --git a/phpBB/styles/subSilver/template/mcp_notes_user.html b/phpBB/styles/subSilver/template/mcp_notes_user.html index 46520d7694..e6e43a29d7 100755 --- a/phpBB/styles/subSilver/template/mcp_notes_user.html +++ b/phpBB/styles/subSilver/template/mcp_notes_user.html @@ -79,6 +79,14 @@ </tr> </table> + <table width="100%" cellspacing="0" cellpadding="0"> + <tr> + <td class="pagination">{PAGE_NUMBER} [ {TOTAL_REPORTS} ]</td> + <td align="right"><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> + </tr> + </table> + </table> + </form> <br clear="all" /><br /> |