move attachment dropdown to cdmFooter, use table styles for cdmFooter

diff --git a/classes/feeds.php b/classes/feeds.php
index afc720957ac01563e35b73afb1d6d8d26af395e2..fec542ef8f8bab060d503792e260e5d8938f1431 100644 (file)
--- 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);
                                        }

diff --git a/css/cdm.css b/css/cdm.css
index ed9bedea13d240cfad8fc6137b60713319288d27..515bbb3fbadb34b0d2b90cfdda4658bcc88c7949 100644 (file)
--- a/css/cdm.css
+++ b/css/cdm.css
@@ -2,7 +2,7 @@ div.cdmHeader img, div.cdmHeader input, div.cdmFooter img {
        vertical-align : middle;
 }
 
-div.cdmHeader {
+div.cdmHeader, div.cdmFooter {
        display : table;
 }
 
@@ -11,11 +11,16 @@ div.cdmHeader > * {
        padding : 5px;
 }
 
-div.cdmHeader > div {
+div.cdmFooter > * {
+       display : table-cell;
+       vertical-align : middle;
+}
+
+div.cdmHeader > div, div.cdmFooter > div {
        white-space : nowrap;
 }
 
-div.cdmHeader > span {
+div.cdmHeader > span, div.cdmFooter > span.left {
        width : 100%;
 }
 
@@ -74,7 +79,8 @@ div.cdmContentInner h4 {
 }
 
 div.cdmFooter {
-       padding : 5px;
+       height : 30px;
+       padding-left : 5px;
        font-weight : normal;
        color : #555;
        clear : both;

diff --git a/css/tt-rss.css b/css/tt-rss.css
index 789319ccb7c99f1d52ec41af63218d3b0e00e750..57b914e14405d7ab2459a05ab1478d11e013298b 100644 (file)
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -1114,6 +1114,10 @@ body#ttrssMain #feedTree .dijitTreeRow img.dijitTreeExpandoLeaf {
        outline: none; 
 }
 
+.dijitDropDownButton.attachments .dijitButtonText {
+       font-size : 12px;
+}
+
 .dijitDropDownButton.attachments {
-       margin-bottom : 10px;
+       display : inline-block;
 }
\ No newline at end of file