move attachments back to cdm content

diff --git a/classes/feeds.php b/classes/feeds.php
index 14d507add3647bd56f3d24e74a04649696f253e0..9e07057ba4f6e1a266e336ade83cbe8f5246c5ed 100644 (file)
--- 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 515bbb3fbadb34b0d2b90cfdda4658bcc88c7949..6bb55375ea2fa5187dab02ecf82704aa80fc54da 100644 (file)
--- 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;