diff options
Diffstat (limited to 'plugins')
-rwxr-xr-x | plugins/af_comics/init.php | 3 | ||||
-rw-r--r-- | plugins/af_psql_trgm/button.png | bin | 523 -> 0 bytes | |||
-rw-r--r-- | plugins/af_psql_trgm/init.php | 30 | ||||
-rwxr-xr-x | plugins/af_readability/init.php | 3 | ||||
-rwxr-xr-x | plugins/af_redditimgur/init.php | 3 | ||||
-rwxr-xr-x | plugins/af_zz_imgproxy/init.php | 3 | ||||
-rw-r--r-- | plugins/bookmarklets/init.php | 3 | ||||
-rwxr-xr-x | plugins/import_export/init.php | 3 | ||||
-rw-r--r-- | plugins/mail/init.php | 8 | ||||
-rw-r--r-- | plugins/mailto/init.php | 5 | ||||
-rw-r--r-- | plugins/mark_button/init.php | 42 | ||||
-rw-r--r-- | plugins/note/init.php | 6 | ||||
-rw-r--r-- | plugins/note/note.png | bin | 500 -> 0 bytes | |||
-rw-r--r-- | plugins/nsfw/init.php | 3 | ||||
-rw-r--r-- | plugins/share/init.php | 13 | ||||
-rw-r--r-- | plugins/share/notshared.png | bin | 657 -> 0 bytes | |||
-rw-r--r-- | plugins/share/share.css | 3 | ||||
-rw-r--r-- | plugins/share/share.js | 8 | ||||
-rw-r--r-- | plugins/share/share.png | bin | 343 -> 0 bytes | |||
-rw-r--r-- | plugins/toggle_sidebar/application_side_list.png | bin | 510 -> 0 bytes | |||
-rw-r--r-- | plugins/toggle_sidebar/init.php | 4 | ||||
-rw-r--r-- | plugins/vf_shared/init.php | 2 |
22 files changed, 56 insertions, 86 deletions
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php index 94305bc75..774b85b64 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>"; 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..ef7ef3449 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -56,7 +56,7 @@ 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, @@ -77,26 +77,28 @@ class Af_Psql_Trgm extends Plugin { $sth->execute([$owner_uid, $id]); - print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">"; + print "<ul class='browseFeedList'>"; 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."); diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 8c17738c9..6cb9e402e 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."); 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..015500480 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."); 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..206197413 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() { 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/note/init.php b/plugins/note/init.php index ac908a5ba..d97bf678b 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_add</i>"; } function edit() { 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..d80a51a6e 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() { 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..c30dd03e0 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(); @@ -54,8 +54,8 @@ Plugins.Share = { xhrPost("backend.php", query, () => { notify("Article unshared."); - var img = $("SHARE-IMG-" + id); - if (img) img.src = img.src.replace("share.png", "notshared.png"); + const img = $("SHARE-IMG-" + id); + img.removeClassName("shared"); dialog.hide(); }); @@ -68,7 +68,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/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() { |