diff options
Diffstat (limited to 'plugins')
30 files changed, 124 insertions, 138 deletions
diff --git a/plugins/af_comics/filters/af_comics_comicpress.php b/plugins/af_comics/filters/af_comics_comicpress.php index 4c568d2b6..19c335660 100755 --- a/plugins/af_comics/filters/af_comics_comicpress.php +++ b/plugins/af_comics/filters/af_comics_comicpress.php @@ -3,7 +3,7 @@ class Af_Comics_ComicPress extends Af_ComicFilter { function supported() { return array("Buni", "Buttersafe", "Happy Jar", "CSection", - "Extra Fabulous Comics", "Nedroid"); + "Extra Fabulous Comics", "Nedroid", "Stonetoss"); } function process(&$article) { @@ -12,6 +12,7 @@ class Af_Comics_ComicPress extends Af_ComicFilter { strpos($article["guid"], "extrafabulouscomics.com") !== FALSE || strpos($article["guid"], "happyjar.com") !== FALSE || strpos($article["guid"], "nedroid.com") !== FALSE || + strpos($article["guid"], "stonetoss.com") !== FALSE || strpos($article["guid"], "csectioncomics.com") !== FALSE) { // lol at people who block clients by user agent diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php index 94305bc75..a46933305 100755 --- a/plugins/af_comics/init.php +++ b/plugins/af_comics/init.php @@ -46,7 +46,8 @@ class Af_Comics extends Plugin { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds supported by af_comics')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">"; print "<p>" . __("The following comics are currently supported:") . "</p>"; @@ -60,7 +61,7 @@ class Af_Comics extends Plugin { asort($comics); - print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">"; + print "<ul class='panel panel-scrollable list list-unstyled'>"; foreach ($comics as $comic) { print "<li>$comic</li>"; } diff --git a/plugins/af_psql_trgm/button.png b/plugins/af_psql_trgm/button.png Binary files differdeleted file mode 100644 index 9b3422c61..000000000 --- a/plugins/af_psql_trgm/button.png +++ /dev/null diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 57ad355f9..cd12c6be0 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -56,14 +56,14 @@ class Af_Psql_Trgm extends Plugin { $title = $row['title']; - print "<h2>$title</h2>"; + print "<p>$title</p>"; $sth = $this->pdo->prepare("SELECT ttrss_entries.id AS id, feed_id, ttrss_entries.title AS title, updated, link, ttrss_feeds.title AS feed_title, - SIMILARITY(ttrss_entries.title, '$title') AS sm + SIMILARITY(ttrss_entries.title, ?) AS sm FROM ttrss_entries, ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = feed_id) WHERE @@ -75,28 +75,30 @@ class Af_Psql_Trgm extends Plugin { sm DESC, date_entered DESC LIMIT 10"); - $sth->execute([$owner_uid, $id]); + $sth->execute([$title, $owner_uid, $id]); - print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">"; + print "<ul class='panel panel-scrollable'>"; while ($line = $sth->fetch()) { - print "<li>"; - print "<div class='insensitive small' style='margin-left : 20px; float : right'>" . - smart_date_time(strtotime($line["updated"])) - . "</div>"; + print "<li style='display : flex'>"; + print "<i class='material-icons'>bookmark_outline</i>"; $sm = sprintf("%.2f", $line['sm']); - print "<img src='images/score_high.png' title='$sm' - style='vertical-align : middle'>"; - $article_link = htmlspecialchars($line["link"]); + + print "<div style='flex-grow : 2'>"; + print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">". $line["title"]."</a>"; print " (<a href=\"#\" onclick=\"Feeds.open({feed:".$line["feed_id"]."})\">". htmlspecialchars($line["feed_title"])."</a>)"; - print " <span class='insensitive'>($sm)</span>"; + print " — $sm"; + + print "</div>"; + + print "<div style='text-align : right' class='insensitive'>" . smart_date_time(strtotime($line["updated"])) . "</div>"; print "</li>"; } @@ -113,16 +115,16 @@ class Af_Psql_Trgm extends Plugin { } function hook_article_button($line) { - return "<img src=\"plugins/af_psql_trgm/button.png\" - style=\"cursor : pointer\" style=\"cursor : pointer\" + return "<i style=\"cursor : pointer\" class='material-icons' onclick=\"Plugins.Psql_Trgm.showRelated(".$line["id"].")\" - class='tagsPic' title='".__('Show related articles')."'>"; + title='".__('Show related articles')."'>bookmark_outline</i>"; } function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Mark similar articles as read')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read')."\">"; if (DB_TYPE != "pgsql") { print_error("Database type not supported."); @@ -197,7 +199,7 @@ class Af_Psql_Trgm extends Plugin { if (count($enabled_feeds) > 0) { print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>"; - print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">"; + print "<ul class=\"panel panel-scrollable list list-unstyled\">"; foreach ($enabled_feeds as $f) { print "<li>" . "<img src='images/pub_set.png' diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 8c17738c9..710001aa3 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -44,7 +44,8 @@ class Af_Readability extends Plugin { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Readability settings (af_readability)')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__('Readability settings (af_readability)')."\">"; if (version_compare(PHP_VERSION, '5.6.0', '<')) { print_error("This plugin requires PHP version 5.6."); @@ -89,7 +90,7 @@ class Af_Readability extends Plugin { if (count($enabled_feeds) > 0) { print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>"; - print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">"; + print "<ul class='panel panel-scrollable list list-unstyled'>"; foreach ($enabled_feeds as $f) { print "<li>" . "<img src='images/pub_set.png' diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php index 1958e83be..36f31a031 100755 --- a/plugins/af_redditimgur/init.php +++ b/plugins/af_redditimgur/init.php @@ -27,7 +27,8 @@ class Af_RedditImgur extends Plugin { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Reddit content settings (af_redditimgur)')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__('Reddit content settings (af_redditimgur)')."\">"; $enable_readability = $this->host->get($this, "enable_readability"); $enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck"); diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php index ca49e94a7..7947d4ca2 100755 --- a/plugins/af_zz_imgproxy/init.php +++ b/plugins/af_zz_imgproxy/init.php @@ -205,7 +205,8 @@ class Af_Zz_ImgProxy extends Plugin { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Image proxy settings (af_zz_imgproxy)')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__('Image proxy settings (af_zz_imgproxy)')."\">"; print "<form dojoType=\"dijit.form.Form\">"; diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index 27a7b13b2..8a3822341 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -17,7 +17,8 @@ class Bookmarklets extends Plugin { function hook_prefs_tab($args) { if ($args == "prefFeeds") { - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bookmarklets')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">"; print __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."); @@ -27,19 +28,16 @@ class Bookmarklets extends Plugin { $bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}"); - print "<p>"; - print "<a href=\"$bm_url\" class='dijitButton'>" . __('Subscribe in Tiny Tiny RSS'). "</a>"; - print "</p>"; + print "<p><label class='dijitButton'>"; + print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>"; + print "</label></p>"; print "<p>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</p>"; - print "<p>"; - + print "<p><label class='dijitButton'>"; $bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()"); - - print "<a href=\"$bm_url\" class='dijitButton'>" . __('Share with Tiny Tiny RSS'). "</a>"; - - print "</p>"; + print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>"; + print "</label></p>"; print "</div>"; #pane diff --git a/plugins/close_button/button.png b/plugins/close_button/button.png Binary files differdeleted file mode 100644 index 1514d51a3..000000000 --- a/plugins/close_button/button.png +++ /dev/null diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php index 8678d577c..62404a6ee 100644 --- a/plugins/close_button/init.php +++ b/plugins/close_button/init.php @@ -14,15 +14,18 @@ class Close_Button extends Plugin { "fox"); } + function get_css() { + return "i.icon-close-article { color : red; }"; + } + /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ function hook_article_button($line) { if (!get_pref("COMBINED_DISPLAY_MODE")) { - $rv = "<img src=\"plugins/close_button/button.png\" - class='tagsPic' style=\"cursor : pointer\" - onclick=\"Article.close()\" - title='".__('Close article')."'>"; + $rv = "<i class='material-icons icon-close-article' + style='cursor : pointer' onclick='Article.close()' + title='".__('Close article')."'>close</i>"; } return $rv; diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index ef1e2db65..c49426f9f 100755 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -50,7 +50,8 @@ class Import_Export extends Plugin implements IHandler { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Import and export')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>import_export</i> ".__('Import and export')."\">"; print_notice(__("You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version.")); diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 1609a05c3..72d8a65c2 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -32,7 +32,8 @@ class Mail extends Plugin { function hook_prefs_tab($args) { if ($args != "prefPrefs") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Mail plugin')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">"; print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>"; @@ -70,10 +71,9 @@ class Mail extends Plugin { } function hook_article_button($line) { - return "<img src=\"plugins/mail/mail.png\" - class='tagsPic' style=\"cursor : pointer\" + return "<i class='material-icons' style=\"cursor : pointer\" onclick=\"Plugins.Mail.send(".$line["id"].")\" - alt='Zoom' title='".__('Forward by email')."'>"; + title='".__('Forward by email')."'>mail</i>"; } function emailArticle() { diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php index 3dbc8d643..26871ac2b 100644 --- a/plugins/mailto/init.php +++ b/plugins/mailto/init.php @@ -19,10 +19,9 @@ class MailTo extends Plugin { } function hook_article_button($line) { - return "<img src=\"plugins/mailto/mail.png\" - class='tagsPic' style=\"cursor : pointer\" + return "<i class='material-icons' style=\"cursor : pointer\" onclick=\"Plugins.Mailto.send(".$line["id"].")\" - alt='Zoom' title='".__('Forward by email')."'>"; + title='".__('Forward by email')."'>mail_outline</i>"; } function emailArticle() { @@ -73,7 +72,7 @@ class MailTo extends Plugin { print __("Clicking the following link to invoke your mail client:"); - print "<div class=\"tagCloudContainer\">"; + print "<div class='panel text-center'>"; print "<a target=\"_blank\" href=\"$mailto_link\">". __("Forward selected article(s) by email.")."</a>"; print "</div>"; diff --git a/plugins/mark_button/init.php b/plugins/mark_button/init.php deleted file mode 100644 index 8f05d1ada..000000000 --- a/plugins/mark_button/init.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -class Mark_Button extends Plugin { - private $host; - - function init($host) { - $this->host = $host; - - $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); - } - - function about() { - return array(1.0, - "Bottom un/star button for the combined mode", - "fox"); - } - - function hook_article_button($line) { - $marked_pic = ""; - $id = $line["id"]; - - if (get_pref("COMBINED_DISPLAY_MODE")) { - if (sql_bool_to_bool($line["marked"])) { - $marked_pic = "<img - src=\"images/mark_set.png\" - class=\"marked-pic marked-$id\" alt=\"Unstar article\" - onclick='Headlines.toggleMark($id)'>"; - } else { - $marked_pic = "<img - src=\"images/mark_unset.png\" - class=\"marked-pic marked-$id\" alt=\"Star article\" - onclick='Headlines.toggleMark($id)'>"; - } - } - - return $marked_pic; - } - - function api_version() { - return 2; - } - -} diff --git a/plugins/no_title_counters/init.js b/plugins/no_title_counters/init.js index 1170bf3ef..6c0cb38e2 100644 --- a/plugins/no_title_counters/init.js +++ b/plugins/no_title_counters/init.js @@ -1,7 +1,9 @@ require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) { ready(function () { - App.updateTitle = function () { - document.title = "Tiny Tiny RSS"; - }; + PluginHost.register(PluginHost.HOOK_INIT_COMPLETE, () => { + App.updateTitle = function () { + document.title = "Tiny Tiny RSS"; + }; + }); }); }); diff --git a/plugins/note/init.php b/plugins/note/init.php index ac908a5ba..a0abb7f19 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -22,10 +22,8 @@ class Note extends Plugin { function hook_article_button($line) { - return "<img src=\"plugins/note/note.png\" - style=\"cursor : pointer\" style=\"cursor : pointer\" - onclick=\"Plugins.Note.edit(".$line["id"].")\" - class='tagsPic' title='".__('Edit article note')."'>"; + return "<i class='material-icons' onclick=\"Plugins.Note.edit(".$line["id"].")\" + style='cursor : pointer' title='".__('Edit article note')."'>note</i>"; } function edit() { diff --git a/plugins/note/note.js b/plugins/note/note.js index 21c1ae51e..0c811000d 100644 --- a/plugins/note/note.js +++ b/plugins/note/note.js @@ -18,16 +18,15 @@ Plugins.Note = { dialog.hide(); if (reply) { - ArticleCache.del(id); - - var elem = $("POSTNOTE-" + id); + const elem = $("POSTNOTE-" + id); if (elem) { - Element.hide(elem); elem.innerHTML = reply.note; if (reply.raw_length != 0) - new Effect.Appear(elem); + Element.show(elem); + else + Element.hide(elem); } } }); diff --git a/plugins/note/note.png b/plugins/note/note.png Binary files differdeleted file mode 100644 index 244e6ca04..000000000 --- a/plugins/note/note.png +++ /dev/null diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php index 53b9ee479..02344eb14 100644 --- a/plugins/nsfw/init.php +++ b/plugins/nsfw/init.php @@ -49,7 +49,8 @@ class NSFW extends Plugin { function hook_prefs_tab($args) { if ($args != "prefPrefs") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("NSFW Plugin")."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">"; print "<br/>"; diff --git a/plugins/share/init.php b/plugins/share/init.php index 752e8ac1e..095cffbdf 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -20,6 +20,10 @@ class Share extends Plugin { return file_get_contents(dirname(__FILE__) . "/share.js"); } + function get_css() { + return file_get_contents(dirname(__FILE__) . "/share.css"); + } + function get_prefs_js() { return file_get_contents(dirname(__FILE__) . "/share_prefs.js"); } @@ -72,12 +76,11 @@ class Share extends Plugin { } function hook_article_button($line) { - $img = $line['uuid'] ? "share.png" : "notshared.png"; + $img_class = $line['uuid'] ? "shared" : ""; - return "<img id='SHARE-IMG-".$line['int_id']."' src=\"plugins/share/$img\" - class='tagsPic' style=\"cursor : pointer\" - onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\" - title='".__('Share by URL')."'>"; + return "<i id='SHARE-IMG-".$line['int_id']."' class='material-icons icon-share $img_class' + style='cursor : pointer' onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\" + title='".__('Share by URL')."'>link</i>"; } function shareArticle() { @@ -104,7 +107,7 @@ class Share extends Plugin { $url_path = get_self_url_prefix(); $url_path .= "/public.php?op=share&key=$uuid"; - print "<div class=\"tagCloudContainer\">"; + print "<div class='panel text-center'>"; print "<a id='gen_article_url' href='$url_path' target='_blank' rel='noopener noreferrer'>$url_path</a>"; print "</div>"; diff --git a/plugins/share/notshared.png b/plugins/share/notshared.png Binary files differdeleted file mode 100644 index 523575306..000000000 --- a/plugins/share/notshared.png +++ /dev/null diff --git a/plugins/share/share.css b/plugins/share/share.css new file mode 100644 index 000000000..00bad68dd --- /dev/null +++ b/plugins/share/share.css @@ -0,0 +1,3 @@ +i.icon-share.shared { + color : #0a0; +}
\ No newline at end of file diff --git a/plugins/share/share.js b/plugins/share/share.js index 7366c2aff..c49f64b4b 100644 --- a/plugins/share/share.js +++ b/plugins/share/share.js @@ -32,7 +32,7 @@ Plugins.Share = { new Effect.Highlight(e); const img = $("SHARE-IMG-" + id); - if (img) img.src = img.src.replace("notshared.png", "share.png"); + img.addClassName("shared"); Notify.close(); @@ -47,17 +47,21 @@ Plugins.Share = { unshare: function () { if (confirm(__("Remove sharing for this article?"))) { - Notify.progress("Trying to unshare...", true); - const query = {op: "pluginhandler", plugin: "share", method: "unshare", id: id}; xhrPost("backend.php", query, () => { - notify("Article unshared."); + try { + const img = $("SHARE-IMG-" + id); - var img = $("SHARE-IMG-" + id); - if (img) img.src = img.src.replace("share.png", "notshared.png"); + if (img) { + img.removeClassName("shared"); + img.up("div[id*=RROW]").removeClassName("shared"); + } - dialog.hide(); + dialog.hide(); + } catch (e) { + console.error(e); + } }); } @@ -68,7 +72,7 @@ Plugins.Share = { dialog.show(); const img = $("SHARE-IMG-" + id); - if (img) img.src = img.src.replace("notshared.png", "share.png"); + img.addClassName("shared"); } }; diff --git a/plugins/share/share.png b/plugins/share/share.png Binary files differdeleted file mode 100644 index 25eacb7c2..000000000 --- a/plugins/share/share.png +++ /dev/null diff --git a/plugins/shorten_expanded/init.css b/plugins/shorten_expanded/init.css index 920e38415..0966aa1f9 100644 --- a/plugins/shorten_expanded/init.css +++ b/plugins/shorten_expanded/init.css @@ -1,9 +1,9 @@ -div.contentSizeWrapper { +.content-shrink-wrap { overflow : hidden; text-overflow: ellipsis; height : 800px; } -button.expandPrompt { - margin-top : 20px; +.expand-prompt { + margin-top : 16px; } diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js index 577ed880e..6371bd1c6 100644 --- a/plugins/shorten_expanded/init.js +++ b/plugins/shorten_expanded/init.js @@ -1,17 +1,19 @@ -var _shorten_expanded_threshold = 1.5; //window heights +const _shorten_expanded_threshold = 1.5; //window heights -function expandSizeWrapper(id) { - const row = $(id); +Plugins.Shorten_Expanded = { + expand: function(id) { + const row = $(id); - if (row) { - const content = row.select(".contentSizeWrapper")[0]; - const link = row.select(".expandPrompt")[0]; + if (row) { + const content = row.select(".content-shrink-wrap")[0]; + const link = row.select(".expand-prompt")[0]; - if (content) content.removeClassName("contentSizeWrapper"); - if (link) Element.hide(link); - } + if (content) content.removeClassName("content-shrink-wrap"); + if (link) Element.hide(link); + } - return false; + return false; + } } require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) { @@ -19,19 +21,27 @@ require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) { PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) { window.setTimeout(function() { if (row) { + const c_inner = row.select(".content-inner")[0]; const c_inter = row.select(".intermediate")[0]; if (c_inner && c_inter && row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) { - c_inter.parentNode.removeChild(c_inter); + let tmp = document.createElement("div"); + + c_inter.select("> *:not([class*='attachments'])").each(function(p) { + p.parentNode.removeChild(p); + tmp.appendChild(p); + }); + + c_inner.innerHTML = `<div class="content-shrink-wrap"> + ${c_inner.innerHTML} + ${tmp.innerHTML}</div> + <button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#"> + ${__("Click to expand article")}</button>`; - c_inner.innerHTML = "<div class='contentSizeWrapper'>" + - c_inner.innerHTML + - c_inter.innerHTML + "</div>" + - "<button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' href='#'>" + - __("Click to expand article") + "</button>"; + dojo.parser.parse(c_inner); Headlines.unpackVisible(); } diff --git a/plugins/toggle_sidebar/application_side_list.png b/plugins/toggle_sidebar/application_side_list.png Binary files differdeleted file mode 100644 index 248eaf1ac..000000000 --- a/plugins/toggle_sidebar/application_side_list.png +++ /dev/null diff --git a/plugins/toggle_sidebar/init.php b/plugins/toggle_sidebar/init.php index e3b2acbb3..ab7924bc5 100644 --- a/plugins/toggle_sidebar/init.php +++ b/plugins/toggle_sidebar/init.php @@ -19,8 +19,8 @@ class Toggle_Sidebar extends Plugin { ?> <button dojoType="dijit.form.Button" onclick="Feeds.toggle()"> - <img src="plugins/toggle_sidebar/application_side_list.png" - title="<?php echo __('Collapse feedlist') ?>"> + <i class="material-icons" + title="<?php echo __('Toggle feedlist') ?>">fullscreen</i> </button> <?php diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php index 941d3c8ad..8414a6f08 100644 --- a/plugins/vf_shared/init.php +++ b/plugins/vf_shared/init.php @@ -14,7 +14,7 @@ class VF_Shared extends Plugin { function init($host) { $this->host = $host; - $host->add_feed(-1, __("Shared articles"), 'plugins/vf_shared/share.png', $this); + $host->add_feed(-1, __("Shared articles"), 'link', $this); } function api_version() { diff --git a/plugins/vf_shared/share.png b/plugins/vf_shared/share.png Binary files differdeleted file mode 100644 index 25eacb7c2..000000000 --- a/plugins/vf_shared/share.png +++ /dev/null |
