Move attachments display below user/date in message header.
This commit is contained in:
parent
adbd795a8f
commit
aeb1a6a870
|
@ -356,7 +356,6 @@ function message_thread($id, $group, $thread, $highlightids = false)
|
|||
* $group: the name of the newsgroup, is needed for the links to post.php3
|
||||
* and the header.
|
||||
*/
|
||||
|
||||
function show_header($head, $group, $local_poster = false)
|
||||
{
|
||||
global $article_show, $text_header, $file_article, $attachment_show;
|
||||
|
@ -512,6 +511,17 @@ function show_header_short($head, $group, $local_poster = false)
|
|||
$displaydate = $ts->format($text_header["date_format"]) . "<br>\n";
|
||||
}
|
||||
unset($ts);
|
||||
if ($article_show["trigger_headers"]) {
|
||||
echo '<div class=np_ob_posted_date>';
|
||||
echo '<input type="checkbox" class="np_header_button_checkbox" id="trigger_headers" title="Show headers">';
|
||||
echo '<div class="display_headers_on">' . display_full_headers($head->number, $group, $head->name, $head->from) . '</div>';
|
||||
if ($local_poster) {
|
||||
echo " by: <i>" . $displayname . "</i> - " . $displaydate;
|
||||
} else {
|
||||
echo " by: " . $displayname . " - " . $displaydate;
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
if ((isset($attachment_show)) && ($attachment_show == true) && (isset($head->content_type[1]))) {
|
||||
echo '<div class=np_ob_posted_date>';
|
||||
echo $text_header["attachments"];
|
||||
|
@ -527,17 +537,6 @@ function show_header_short($head, $group, $local_poster = false)
|
|||
}
|
||||
echo '</div>';
|
||||
}
|
||||
if ($article_show["trigger_headers"]) {
|
||||
echo '<div class=np_ob_posted_date>';
|
||||
echo '<input type="checkbox" class="np_header_button_checkbox" id="trigger_headers" title="Show headers">';
|
||||
echo '<div class="display_headers_on">' . display_full_headers($head->number, $group, $head->name, $head->from) . '</div>';
|
||||
if($local_poster) {
|
||||
echo " by: <i>".$displayname."</i> - ".$displaydate;
|
||||
} else {
|
||||
echo " by: ".$displayname." - ".$displaydate;
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
echo '</p>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
@ -688,8 +687,7 @@ function nl2p($string, $line_breaks = true, $xml = true)
|
|||
"</p>\n<p>",
|
||||
"</p>\n<p>",
|
||||
'$1<br' . ($xml == true ? ' /' : '') . '>$2'
|
||||
),
|
||||
trim($string)) . '</p>';
|
||||
), trim($string)) . '</p>';
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue