valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move attachments back to cdm content

This commit is contained in:
Andrew Dolgov 2015-08-12 08:29:09 +03:00
parent ad9928a5cb
commit 90da4ada66
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/feeds.php
View File

@ -701,6 +701,13 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "</div>"; $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)\">"; $reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { 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'] .= "$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);
} }

4
css/cdm.css
View File

@ -55,6 +55,10 @@ div.cdmHeader input {
margin-right : 4px; margin-right : 4px;
} }
div.cdmIntermediate {
margin : 10px;
}
div.cdmContentInner { div.cdmContentInner {
margin : 10px; margin : 10px;
line-height : 1.5; line-height : 1.5;