From bc20cb9fad53bc8575a6463d24d9f44f2883c482 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 11 Aug 2015 15:29:27 +0300
Subject: move attachment dropdown to cdmFooter, use table styles for cdmFooter

---
 classes/feeds.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index afc720957..fec542ef8 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -699,21 +699,18 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "</span>";
 
-					$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
-
 					$reply['content'] .= "</div>";
 
 					$reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
 
-					$reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
-					$reply['content'] .= "<br/>";
-
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
 						$reply['content'] .= $p->hook_article_left_button($line);
 					}
 
 					$tags_str = format_tags_string($tags, $id);
 
+					$reply['content'] .= "<span class='left'>";
+
 					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\"
@@ -740,11 +737,15 @@ class Feeds extends Handler_Protected {
 
 					if ($entry_comments) $reply['content'] .= "&nbsp;($entry_comments)";
 
-					$reply['content'] .= "<div style=\"float : right\">";
+					$reply['content'] .= "</span>";
+					$reply['content'] .= "<div>";
 
 //					$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);
 					}
-- 
cgit v1.2.3-54-g00ecf