mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-13 17:47:26 +02:00
Code Issues Projects Releases Wiki Activity

move attachment dropdown to cdmFooter, use table styles for cdmFooter

Browse Source
This commit is contained in:
Andrew Dolgov 2015-08-11 15:29:27 +03:00
parent 8a1b2a1015
commit bc20cb9fad
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/feeds.php
View File

@ -699,21 +699,18 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "</span>"; $reply['content'] .= "</span>";
$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
$reply['content'] .= "</div>"; $reply['content'] .= "</div>";
$reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">"; $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) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
$reply['content'] .= $p->hook_article_left_button($line); $reply['content'] .= $p->hook_article_left_button($line);
} }
$tags_str = format_tags_string($tags, $id); $tags_str = format_tags_string($tags, $id);
$reply['content'] .= "<span class='left'>";
$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'> $reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span> <span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\" <a title=\"".__('Edit tags for this article')."\"
@ -740,11 +737,15 @@ class Feeds extends Handler_Protected {
if ($entry_comments) $reply['content'] .= "&nbsp;($entry_comments)"; 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'] .= "$marked_pic";
// $reply['content'] .= "$published_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) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
$reply['content'] .= $p->hook_article_button($line); $reply['content'] .= $p->hook_article_button($line);
} }

14
css/cdm.css
View File

@ -2,7 +2,7 @@ div.cdmHeader img, div.cdmHeader input, div.cdmFooter img {
vertical-align : middle; vertical-align : middle;
} }
div.cdmHeader { div.cdmHeader, div.cdmFooter {
display : table; display : table;
} }
@ -11,11 +11,16 @@ div.cdmHeader > * {
padding : 5px; padding : 5px;
} }
div.cdmHeader > div { div.cdmFooter > * {
display : table-cell;
vertical-align : middle;
}
div.cdmHeader > div, div.cdmFooter > div {
white-space : nowrap; white-space : nowrap;
} }
div.cdmHeader > span { div.cdmHeader > span, div.cdmFooter > span.left {
width : 100%; width : 100%;
} }
@ -74,7 +79,8 @@ div.cdmContentInner h4 {
} }
div.cdmFooter { div.cdmFooter {
padding : 5px; height : 30px;
padding-left : 5px;
font-weight : normal; font-weight : normal;
color : #555; color : #555;
clear : both; clear : both;

8
css/tt-rss.css
View File

@ -1114,6 +1114,10 @@ body#ttrssMain #feedTree .dijitTreeRow img.dijitTreeExpandoLeaf {
outline: none; outline: none;
} }
.dijitDropDownButton.attachments { .dijitDropDownButton.attachments .dijitButtonText {
margin-bottom : 10px; font-size : 12px;
}
.dijitDropDownButton.attachments {
display : inline-block;
} }