bring cdmFeedTitle style in line with the rest of the UI

send headline rows as separate JSON objects
This commit is contained in:
Andrew Dolgov 2015-07-13 01:19:52 +03:00
parent f56e5a3504
commit ac4c1383ae
3 changed files with 127 additions and 90 deletions

View File

@ -307,7 +307,11 @@ class Feeds extends Handler_Protected {
$expand_cdm = get_pref('CDM_EXPANDED'); $expand_cdm = get_pref('CDM_EXPANDED');
$reply['content'] = array();
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$headline_row = '';
$line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250); $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250);
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
@ -448,76 +452,79 @@ class Feeds extends Handler_Protected {
$vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>"; $vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>". $feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style='float : right'>$feed_icon_img</div>". "<div style='float : right'>$feed_icon_img</div>".
"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> "<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a>
$vf_catchup_link</div>"; $vf_catchup_link</div>";
array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
} }
} }
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)' $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'"; onmouseout='postMouseOut($id)'";
$reply['content'] .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>"; $headline_row .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
$reply['content'] .= "<div class='hlLeft'>"; $headline_row .= "<div class='hlLeft'>";
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\" $headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this)\" type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
class='rchk'>"; class='rchk'>";
$reply['content'] .= "$marked_pic"; $headline_row .= "$marked_pic";
$reply['content'] .= "$published_pic"; $headline_row .= "$published_pic";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "<div onclick='return hlClicked(event, $id)' $headline_row .= "<div onclick='return hlClicked(event, $id)'
class=\"hlTitle\"><span class='hlContent $hlc_suffix'>"; class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
$reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\" $headline_row .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
href=\"" . htmlspecialchars($line["link"]) . "\" href=\"" . htmlspecialchars($line["link"]) . "\"
onclick=\"\">" . onclick=\"\">" .
truncate_string($line["title"], 200); truncate_string($line["title"], 200);
if (get_pref('SHOW_CONTENT_PREVIEW')) { if (get_pref('SHOW_CONTENT_PREVIEW')) {
$reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>"; $headline_row .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
} }
$reply['content'] .= "</a></span>"; $headline_row .= "</a></span>";
$reply['content'] .= $labels_str; $headline_row .= $labels_str;
$reply['content'] .= "</div>"; $headline_row .= "</div>";
if (!$vfeed_group_enabled) { if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) { if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id]; $rgba = @$rgba_cache[$feed_id];
$reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">". $headline_row .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">".
truncate_string($line["feed_title"],30)."</a></span>"; truncate_string($line["feed_title"],30)."</a></span>";
} }
} }
$reply['content'] .= "<span class=\"hlUpdated\">"; $headline_row .= "<span class=\"hlUpdated\">";
$reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div> $headline_row .= "<div title='$date_entered_fmt'>$updated_fmt</div>
</span>"; </span>";
$reply['content'] .= "<div class=\"hlRight\">"; $headline_row .= "<div class=\"hlRight\">";
$reply['content'] .= $score_pic; $headline_row .= $score_pic;
if ($line["feed_title"] && !$vfeed_group_enabled) { if ($line["feed_title"] && !$vfeed_group_enabled) {
$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\" $headline_row .= "<span onclick=\"viewfeed($feed_id)\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
title=\"".htmlspecialchars($line['feed_title'])."\"> title=\"".htmlspecialchars($line['feed_title'])."\">
$feed_icon_img</span>"; $feed_icon_img</span>";
} }
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
} else { } else {
@ -551,10 +558,12 @@ class Feeds extends Handler_Protected {
//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">"; //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
} }
$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>". $feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>". "<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">". "<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>"; $line["feed_title"]."</a> $vf_catchup_link</div>";
array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
} }
} }
@ -563,20 +572,20 @@ class Feeds extends Handler_Protected {
$expanded_class = $expand_cdm ? "expanded" : "expandable"; $expanded_class = $expand_cdm ? "expanded" : "expandable";
$reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\" $headline_row .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>"; id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>";
$reply['content'] .= "<div class=\"cdmHeader\">"; $headline_row .= "<div class=\"cdmHeader\">";
$reply['content'] .= "<div style=\"vertical-align : middle\">"; $headline_row .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\" $headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\" type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
class='rchk'>"; class='rchk'>";
$reply['content'] .= "$marked_pic"; $headline_row .= "$marked_pic";
$reply['content'] .= "$published_pic"; $headline_row .= "$published_pic";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
if ($highlight_words && count($highlight_words > 0)) { if ($highlight_words && count($highlight_words > 0)) {
foreach ($highlight_words as $word) { foreach ($highlight_words as $word) {
@ -585,7 +594,7 @@ class Feeds extends Handler_Protected {
} }
} }
$reply['content'] .= "<span id=\"RTITLE-$id\" $headline_row .= "<span id=\"RTITLE-$id\"
onclick=\"return cdmClicked(event, $id);\" onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap $hlc_suffix\"> class=\"titleWrap $hlc_suffix\">
<a class=\"title $hlc_suffix\" <a class=\"title $hlc_suffix\"
@ -595,9 +604,9 @@ class Feeds extends Handler_Protected {
$line["title"] . $line["title"] .
"</a> <span class=\"author\">$entry_author</span>"; "</a> <span class=\"author\">$entry_author</span>";
$reply['content'] .= $labels_str; $headline_row .= $labels_str;
$reply['content'] .= "<span class='collapseBtn' style='display : none'> $headline_row .= "<span class='collapseBtn' style='display : none'>
<img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\" <img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
title=\"".__("Collapse article")."\"/></span>"; title=\"".__("Collapse article")."\"/></span>";
@ -606,15 +615,15 @@ class Feeds extends Handler_Protected {
else else
$excerpt_hidden = "style=\"display : none\""; $excerpt_hidden = "style=\"display : none\"";
$reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>"; $headline_row .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>";
$reply['content'] .= "</span>"; $headline_row .= "</span>";
if (!$vfeed_group_enabled) { if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) { if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id]; $rgba = @$rgba_cache[$feed_id];
$reply['content'] .= "<div class=\"hlFeed\"> $headline_row .= "<div class=\"hlFeed\">
<a href=\"#\" style=\"background-color: rgba($rgba,0.3)\" <a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
onclick=\"viewfeed($feed_id)\">". onclick=\"viewfeed($feed_id)\">".
truncate_string($line["feed_title"],30)."</a> truncate_string($line["feed_title"],30)."</a>
@ -622,34 +631,34 @@ class Feeds extends Handler_Protected {
} }
} }
$reply['content'] .= "<span class='updated' title='$date_entered_fmt'> $headline_row .= "<span class='updated' title='$date_entered_fmt'>
$updated_fmt</span>"; $updated_fmt</span>";
$reply['content'] .= "<div class='scoreWrap' style=\"vertical-align : middle\">"; $headline_row .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
$reply['content'] .= "$score_pic"; $headline_row .= "$score_pic";
if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
$reply['content'] .= "<span style=\"cursor : pointer\" $headline_row .= "<span style=\"cursor : pointer\"
title=\"".htmlspecialchars($line["feed_title"])."\" title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>"; onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
} }
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "<div class=\"cdmContent\" $content_hidden $headline_row .= "<div class=\"cdmContent\" $content_hidden
onclick=\"return cdmClicked(event, $id);\" onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">"; id=\"CICD-$id\">";
$reply['content'] .= "<div id=\"POSTNOTE-$id\">"; $headline_row .= "<div id=\"POSTNOTE-$id\">";
if ($line['note']) { if ($line['note']) {
$reply['content'] .= format_article_note($id, $line['note']); $headline_row .= format_article_note($id, $line['note']);
} }
$reply['content'] .= "</div>"; $headline_row .= "</div>";
if (!$line['lang']) $line['lang'] = 'en'; if (!$line['lang']) $line['lang'] = 'en';
$reply['content'] .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">"; $headline_row .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
if ($line["orig_feed_id"]) { if ($line["orig_feed_id"]) {
@ -658,54 +667,54 @@ class Feeds extends Handler_Protected {
if ($this->dbh->num_rows($tmp_result) != 0) { if ($this->dbh->num_rows($tmp_result) != 0) {
$reply['content'] .= "<div clear='both'>"; $headline_row .= "<div clear='both'>";
$reply['content'] .= __("Originally from:"); $headline_row .= __("Originally from:");
$reply['content'] .= "&nbsp;"; $headline_row .= "&nbsp;";
$tmp_line = $this->dbh->fetch_assoc($tmp_result); $tmp_line = $this->dbh->fetch_assoc($tmp_result);
$reply['content'] .= "<a target='_blank' $headline_row .= "<a target='_blank'
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" . href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
$tmp_line['title'] . "</a>"; $tmp_line['title'] . "</a>";
$reply['content'] .= "&nbsp;"; $headline_row .= "&nbsp;";
$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>"; $headline_row .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
$reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>"; $headline_row .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
} }
} }
$reply['content'] .= "<span id=\"CWRAP-$id\">"; $headline_row .= "<span id=\"CWRAP-$id\">";
// if (!$expand_cdm) { // if (!$expand_cdm) {
$reply['content'] .= "<span id=\"CENCW-$id\" style=\"display : none\">"; $headline_row .= "<span id=\"CENCW-$id\" style=\"display : none\">";
$reply['content'] .= htmlspecialchars($line["content"]); $headline_row .= htmlspecialchars($line["content"]);
$reply['content'] .= "</span."; $headline_row .= "</span.";
// } else { // } else {
// $reply['content'] .= $line["content"]; // $headline_row .= $line["content"];
// } // }
$reply['content'] .= "</span>"; $headline_row .= "</span>";
$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); $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"])); $headline_row .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">"; $headline_row .= "<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) {
$reply['content'] .= $p->hook_article_left_button($line); $headline_row .= $p->hook_article_left_button($line);
} }
$tags_str = format_tags_string($tags, $id); $tags_str = format_tags_string($tags, $id);
$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'> $headline_row .= "<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')."\"
href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>"; href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>";
@ -729,26 +738,28 @@ class Feeds extends Handler_Protected {
} }
} }
if ($entry_comments) $reply['content'] .= "&nbsp;($entry_comments)"; if ($entry_comments) $headline_row .= "&nbsp;($entry_comments)";
$reply['content'] .= "<div style=\"float : right\">"; $headline_row .= "<div style=\"float : right\">";
// $reply['content'] .= "$marked_pic"; // $headline_row .= "$marked_pic";
// $reply['content'] .= "$published_pic"; // $headline_row .= "$published_pic";
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); $headline_row .= $p->hook_article_button($line);
} }
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
$reply['content'] .= "</div>"; $headline_row .= "</div>";
} }
array_push($reply['content'], array("id" => (int)$line['id'], 'html' => $headline_row));
++$lnum; ++$lnum;
} }

View File

@ -213,17 +213,14 @@ div.cdmContent div.postEnclosures {
} }
div.cdmFeedTitle { div.cdmFeedTitle {
border-color : #a0a0a0; border-color : #4684ff;
border-width : 0px 0px 1px 0px; border-width : 0px 0px 1px 0px;
border-style : solid; border-style : solid;
padding : 5px 3px 5px 5px; padding : 5px 3px 5px 5px;
background : url("../images/toolbar.png") bottom left;
background-repeat : repeat-x;
} }
div.cdmFeedTitle a.title { div.cdmFeedTitle a.title {
color : #555; color : #555;
font-style : italic;
font-weight : bold; font-weight : bold;
} }

View File

@ -86,8 +86,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
if (infscroll_req == false) { if (infscroll_req == false) {
loaded_article_ids = []; loaded_article_ids = [];
dijit.byId("headlines-frame").attr('content', /*dijit.byId("headlines-frame").attr('content',
reply['headlines']['content']); reply['headlines']['content']);*/
//dijit.byId("headlines-toolbar").attr('content', //dijit.byId("headlines-toolbar").attr('content',
// reply['headlines']['toolbar']); // reply['headlines']['toolbar']);
@ -96,12 +96,28 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
reply['headlines']['toolbar'], reply['headlines']['toolbar'],
{parseContent: true}); {parseContent: true});
$$("#headlines-frame > div[id*=RROW]").each(function(row) { /*$$("#headlines-frame > div[id*=RROW]").each(function(row) {
if (loaded_article_ids.indexOf(row.id) != -1) { if (loaded_article_ids.indexOf(row.id) != -1) {
row.parentNode.removeChild(row); row.parentNode.removeChild(row);
} else { } else {
loaded_article_ids.push(row.id); loaded_article_ids.push(row.id);
} }
});*/
dijit.byId("headlines-frame").attr("content", "");
reply['headlines']['content'].each(function(row) {
if (loaded_article_ids.indexOf(row.id) == -1) {
loaded_article_ids.push(row.id);
}
var tmp = new Element("div");
tmp.innerHTML = row.html;
dojo.parser.parse(tmp.firstChild);
dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild);
}); });
var hsp = $("headlines-spacer"); var hsp = $("headlines-spacer");
@ -127,16 +143,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
var c = dijit.byId("headlines-frame"); var c = dijit.byId("headlines-frame");
var ids = getSelectedArticleIds2(); var ids = getSelectedArticleIds2();
var new_elems = []; //var new_elems = [];
$("headlines-tmp").innerHTML = reply['headlines']['content']; //$("headlines-tmp").innerHTML = reply['headlines']['content'];
var hsp = $("headlines-spacer"); var hsp = $("headlines-spacer");
if (hsp) if (hsp)
c.domNode.removeChild(hsp); c.domNode.removeChild(hsp);
$$("#headlines-tmp > div").each(function(row) { /*$$("#headlines-tmp > div").each(function(row) {
if (row.className == 'cdmFeedTitle') { if (row.className == 'cdmFeedTitle') {
row.style.display = 'none'; row.style.display = 'none';
c.domNode.appendChild(row); c.domNode.appendChild(row);
@ -149,18 +165,31 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
} else { } else {
row.parentNode.removeChild(row); row.parentNode.removeChild(row);
} }
});*/
reply['headlines']['content'].each(function(row) {
if (loaded_article_ids.indexOf(row.id) == -1 || row.kind == 'feed_title') {
loaded_article_ids.push(row.id);
var tmp = new Element("div");
tmp.innerHTML = row.html;
dojo.parser.parse(tmp.firstChild);
dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild);
}
}); });
if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
// if (getInitParam("cdm_auto_catchup") == 1) { // if (getInitParam("cdm_auto_catchup") == 1) {
c.domNode.appendChild(hsp); c.domNode.appendChild(hsp);
// } // }
console.log("added " + new_elems.size() + " headlines"); console.log("added " + reply['headlines']['content'].size() + " headlines");
if (new_elems.size() == 0) if (reply['headlines']['content'].size() == 0) _infscroll_disable = true;
_infscroll_disable = true;
console.log("restore selected ids: " + ids); console.log("restore selected ids: " + ids);
@ -170,12 +199,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
initHeadlinesMenu(); initHeadlinesMenu();
new_elems.each(function(child) { /*new_elems.each(function(child) {
dojo.parser.parse(child); dojo.parser.parse(child);
if (!Element.visible(child)) if (!Element.visible(child))
new Effect.Appear(child, { duration : 0.5 }); new Effect.Appear(child, { duration : 0.5 });
}); });*/
if (_infscroll_disable) { if (_infscroll_disable) {
hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" + hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +