diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-21 20:30:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-21 20:30:33 +0200 |
| commit | 4222510e9c183437fe1b3896273ab6f672c25020 (patch) | |
| tree | 94ec3e0b1e683d0ee716160b503476f0dc139203 /phpBB | |
| parent | bcf4f4fbdfeec8fcfc48ebc4e08856e6526b21d2 (diff) | |
| parent | b7a1add009ec36ca1143fa75ebda828d0fdead80 (diff) | |
| download | forums-4222510e9c183437fe1b3896273ab6f672c25020.tar forums-4222510e9c183437fe1b3896273ab6f672c25020.tar.gz forums-4222510e9c183437fe1b3896273ab6f672c25020.tar.bz2 forums-4222510e9c183437fe1b3896273ab6f672c25020.tar.xz forums-4222510e9c183437fe1b3896273ab6f672c25020.zip | |
Merge branch 'ticket/cs278/7332' into develop-olympus
* ticket/cs278/7332:
[ticket/7332] Redirect users back to post details when performing actions.
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 1fbedbac4f..7098b4bbce 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -176,7 +176,7 @@ function mcp_post_details($id, $mode, $action) } $template->assign_vars(array( - 'U_MCP_ACTION' => "$url&i=main&quickmod=1", // Use this for mode paramaters + 'U_MCP_ACTION' => "$url&i=main&quickmod=1&mode=post_details", // Use this for mode paramaters 'U_POST_ACTION' => "$url&i=$id&mode=post_details", // Use this for action parameters 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f={$post_info['forum_id']}"), diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 0265d7ce12..dab2d572a9 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -54,6 +54,8 @@ </ul> <!-- ENDIF --> + <span class="right-box clear" id="expand"><a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">{L_EXPAND_VIEW}</a></span> + <h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3> <!-- IF S_PM --> <p class="author"> @@ -84,7 +86,7 @@ </p> <!-- ENDIF --> - <div class="content"> + <div class="content" id="post_details"> {POST_PREVIEW} </div> diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 417537e660..dfe00371e4 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -298,6 +298,15 @@ div[class].topic-actions { display: none; } +/* MCP Post details +----------------------------------------*/ +#post_details +{ + /* This will only work in IE7+, plus the others */ + overflow: auto; + max-height: 300px; +} + /* Content container styles ----------------------------------------*/ .content { |