From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Aug 2015 05:29:09 +0000 (+0300)
Subject: move attachments back to cdm content
X-Git-Tag: 16.3~159
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=90da4ada664443704dca6119c12bb7ecccb48aa9;hp=ad9928a5cb50bfd9cddce5e68efcc843a9a30288;p=tt-rss.git

move attachments back to cdm content
---

diff --git a/classes/feeds.php b/classes/feeds.php
index 14d507ad..9e07057b 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 515bbb3f..6bb55375 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;