diff options
| author | Andrew Dolgov <[email protected]> | 2015-08-12 08:29:09 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-08-12 08:29:09 +0300 |
| commit | 90da4ada664443704dca6119c12bb7ecccb48aa9 (patch) | |
| tree | c783ff9f616e76ac37501409d6a796a358d607a6 | |
| parent | ad9928a5cb50bfd9cddce5e68efcc843a9a30288 (diff) | |
move attachments back to cdm content
| -rw-r--r-- | classes/feeds.php | 10 | ||||
| -rw-r--r-- | css/cdm.css | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 14d507add..9e07057ba 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -701,6 +701,13 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; + $reply['content'] .= "<div class=\"cdmIntermediate\">"; + + $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); + $reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"])); + + $reply['content'] .= "</div>"; + $reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">"; foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { @@ -743,9 +750,6 @@ class Feeds extends Handler_Protected { // $reply['content'] .= "$marked_pic"; // $reply['content'] .= "$published_pic"; - $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); - $reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"])); - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) { $reply['content'] .= $p->hook_article_button($line); } diff --git a/css/cdm.css b/css/cdm.css index 515bbb3fb..6bb55375e 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -55,6 +55,10 @@ div.cdmHeader input { margin-right : 4px; } +div.cdmIntermediate { + margin : 10px; +} + div.cdmContentInner { margin : 10px; line-height : 1.5; |