diff --git a/README.md b/README.md index 3aeea3319..469184c87 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ Licensed under GNU GPL version 2 Copyright (c) 2005 Andrew Dolgov (unless explicitly stated otherwise). +Uses Silk icons by Mark James: http://www.famfamfam.com/lab/icons/silk/ + ## Requirements * Compatible web browser (http://tt-rss.org/wiki/CompatibleBrowsers) diff --git a/classes/feeds.php b/classes/feeds.php index b15875bd3..89b2f7128 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -74,7 +74,7 @@ class Feeds extends Handler_Protected { - "; + "; $reply .= ""; @@ -323,24 +323,24 @@ class Feeds extends Handler_Protected { if (sql_bool_to_bool($line["marked"])) { $marked_pic = "\"Unstar"; $class .= " marked"; } else { $marked_pic = "\"Star"; } if (sql_bool_to_bool($line["published"])) { - $published_pic = "\"Unpublish"; $class .= " published"; } else { - $published_pic = "\"Publish"; } @@ -395,7 +395,7 @@ class Feeds extends Handler_Protected { if ($has_feed_icon) { $feed_icon_img = "\"\""; } else { - $feed_icon_img = "\"\""; + $feed_icon_img = "\"\""; } $entry_site_url = $line["site_url"]; @@ -638,7 +638,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= " "; $reply['content'] .= ""; - $reply['content'] .= ""; + $reply['content'] .= ""; $reply['content'] .= ""; } diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 32071e3b3..3dfe95241 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -765,7 +765,9 @@ class Pref_Prefs extends Handler_Protected { dojoType=\"dijit.form.CheckBox\" $checked type=\"checkbox\">"; - print "$name"; + $plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png"; + + print " $name"; print "" . htmlspecialchars($about[1]); if (@$about[4]) { print " — "; + $plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png"; + print ""; - print ""; + print ""; print ""; if (@$about[4]) { print " — " . $line["login"] . ""; + print " " . $line["login"] . ""; if (!$line["email"]) $line["email"] = " "; diff --git a/css/prefs.css b/css/prefs.css index 1cc8b7b03..502a53be9 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -98,6 +98,14 @@ table.prefPluginsList td label, table.prefUserList td { cursor : pointer; } +table.prefPluginsList label { + white-space : nowrap; +} + +table.prefPluginsList label img { + vertical-align : middle; +} + table.prefErrorLog tr.errrow td { font-size : 10px; } diff --git a/css/tt-rss.css b/css/tt-rss.css index bdf1bf72a..94bc5826c 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -299,7 +299,7 @@ div.error { } div.warning img, div.notice img, div.error img { - margin-right : 4px; + margin : 4px; vertical-align : middle; } @@ -660,29 +660,18 @@ div.dlgButtons { } span.labelColorIndicator { - height : 14px; - width : 14px; + height : 16px; + width : 16px; + border-radius : 4px; line-height : 14px; + vertical-align : middle; font-size : 9px; display : inline-block; - border : 1px solid black; + border : 1px solid #ccc; background-color : #fff7d5; color : #063064; text-align : center; - margin-right : 2px; -} - -span.labelColorIndicator2 { - height : 14px; - width : 14px; - font-size : 9px; - display : inline-block; - border : 1px solid black; - background-color : #fff7d5; - color : #063064; - text-align : center; - margin-right : 2px; - vertical-align : bottom; + box-shadow : 0px 0px 1px 0px rgba(0,0,0,0.1); } div#cmdline { @@ -894,6 +883,7 @@ div.fatalError textarea { img.feedIcon, img.tinyFeedIcon { width : 16px; height : 16px; + line-height : 16px; vertical-align : middle; display : inline-block; } @@ -1070,6 +1060,11 @@ div.hl.active { margin-right : 25px; } +#feedTree img.feedIcon { + position : relative; + top : -2px; +} + body#ttrssMain #feedTree .dijitTreeRow { padding : 2px 0px 2px; height : 22px; @@ -1078,8 +1073,8 @@ body#ttrssMain #feedTree .dijitTreeRow { color : #333; } -.dijitFolderClosed, -.dijitFolderOpened { +body#ttrssMain #feedTree .dijitFolderClosed, +body#ttrssMain #feedTree .dijitFolderOpened { display : none; } diff --git a/css/utility.css b/css/utility.css index 029fa9cb3..f342223e3 100644 --- a/css/utility.css +++ b/css/utility.css @@ -86,7 +86,7 @@ div.error { } div.warning img, div.notice img, div.error img { - margin-right : 4px; + margin : 4px; vertical-align : middle; } diff --git a/images/alert.png b/images/alert.png index 9687c4cf1..c37bd062e 100644 Binary files a/images/alert.png and b/images/alert.png differ diff --git a/images/alert.svg b/images/alert.svg deleted file mode 100644 index 237f66caf..000000000 --- a/images/alert.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - ! - - diff --git a/images/archive.png b/images/archive.png index 1afa254f7..8443c23eb 100644 Binary files a/images/archive.png and b/images/archive.png differ diff --git a/images/close_notify.svg b/images/close_notify.svg deleted file mode 100644 index b3a17e02e..000000000 --- a/images/close_notify.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/images/collapse.png b/images/collapse.png index 5adbd5e1c..79b344645 100644 Binary files a/images/collapse.png and b/images/collapse.png differ diff --git a/images/cross.png b/images/cross.png new file mode 100644 index 000000000..1514d51a3 Binary files /dev/null and b/images/cross.png differ diff --git a/images/feed.png b/images/feed.png new file mode 100644 index 000000000..315c4f4fa Binary files /dev/null and b/images/feed.png differ diff --git a/images/filter.png b/images/filter.png new file mode 100644 index 000000000..9757fc6ed Binary files /dev/null and b/images/filter.png differ diff --git a/images/folder.png b/images/folder.png new file mode 100644 index 000000000..784e8fa48 Binary files /dev/null and b/images/folder.png differ diff --git a/images/fresh.png b/images/fresh.png index f5b741a19..b7bfcd15f 100644 Binary files a/images/fresh.png and b/images/fresh.png differ diff --git a/images/information.png b/images/information.png new file mode 100644 index 000000000..12cd1aef9 Binary files /dev/null and b/images/information.png differ diff --git a/images/label.png b/images/label.png index aea67c4fd..83d12924f 100644 Binary files a/images/label.png and b/images/label.png differ diff --git a/images/mark_set.png b/images/mark_set.png new file mode 100644 index 000000000..b88c85789 Binary files /dev/null and b/images/mark_set.png differ diff --git a/images/mark_set.svg b/images/mark_set.svg deleted file mode 100644 index 1942d14c2..000000000 --- a/images/mark_set.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/images/mark_unset.png b/images/mark_unset.png new file mode 100644 index 000000000..537e2f0c0 Binary files /dev/null and b/images/mark_unset.png differ diff --git a/images/mark_unset.svg b/images/mark_unset.svg deleted file mode 100644 index 4b31d31c4..000000000 --- a/images/mark_unset.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/images/new_version.png b/images/new_version.png index 878f7a4fb..1ebb19324 100644 Binary files a/images/new_version.png and b/images/new_version.png differ diff --git a/images/plugin.png b/images/plugin.png new file mode 100644 index 000000000..6187b15ae Binary files /dev/null and b/images/plugin.png differ diff --git a/images/plugin_disabled.png b/images/plugin_disabled.png new file mode 100644 index 000000000..f4f6be59c Binary files /dev/null and b/images/plugin_disabled.png differ diff --git a/images/pub_set.png b/images/pub_set.png new file mode 100644 index 000000000..315c4f4fa Binary files /dev/null and b/images/pub_set.png differ diff --git a/images/pub_set.svg b/images/pub_set.svg deleted file mode 100644 index c13a5c31b..000000000 --- a/images/pub_set.svg +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/pub_unset.png b/images/pub_unset.png new file mode 100644 index 000000000..3629d4cb8 Binary files /dev/null and b/images/pub_unset.png differ diff --git a/images/pub_unset.svg b/images/pub_unset.svg deleted file mode 100644 index 7b823fc5e..000000000 --- a/images/pub_unset.svg +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/recently_read.png b/images/recently_read.png deleted file mode 100644 index ac1bf1782..000000000 Binary files a/images/recently_read.png and /dev/null differ diff --git a/images/score_half_high.png b/images/score_half_high.png index 205429aba..058ad261f 100644 Binary files a/images/score_half_high.png and b/images/score_half_high.png differ diff --git a/images/score_half_low.png b/images/score_half_low.png index 62da70043..57619706d 100644 Binary files a/images/score_half_low.png and b/images/score_half_low.png differ diff --git a/images/score_high.png b/images/score_high.png index 0ab5c07cb..058ad261f 100644 Binary files a/images/score_high.png and b/images/score_high.png differ diff --git a/images/score_low.png b/images/score_low.png index 7a18affc9..57619706d 100644 Binary files a/images/score_low.png and b/images/score_low.png differ diff --git a/images/score_neutral.png b/images/score_neutral.png index 22d44f8ef..a9af8d44b 100644 Binary files a/images/score_neutral.png and b/images/score_neutral.png differ diff --git a/images/sign_excl.svg b/images/sign_excl.svg deleted file mode 100644 index eb5e6dd20..000000000 --- a/images/sign_excl.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - ! - - diff --git a/images/sign_info.svg b/images/sign_info.svg deleted file mode 100644 index b5a3e9f4d..000000000 --- a/images/sign_info.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - i - - diff --git a/images/star.png b/images/star.png new file mode 100644 index 000000000..b88c85789 Binary files /dev/null and b/images/star.png differ diff --git a/images/tag.png b/images/tag.png index 5fe6596ec..80547e927 100644 Binary files a/images/tag.png and b/images/tag.png differ diff --git a/images/time.png b/images/time.png new file mode 100644 index 000000000..911da3f1d Binary files /dev/null and b/images/time.png differ diff --git a/images/user.png b/images/user.png new file mode 100644 index 000000000..79f35ccbd Binary files /dev/null and b/images/user.png differ diff --git a/include/functions.php b/include/functions.php index bcded7e5f..603a865a1 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1876,19 +1876,19 @@ return "images/archive.png"; break; case -1: - return "images/mark_set.svg"; + return "images/star.png"; break; case -2: - return "images/pub_set.svg"; + return "images/feed.png"; break; case -3: return "images/fresh.png"; break; case -4: - return "images/tag.png"; + return "images/folder.png"; break; case -6: - return "images/recently_read.png"; + return "images/time.png"; break; default: if ($id < LABEL_BASE_INDEX) { @@ -2996,19 +2996,19 @@ function format_warning($msg, $id = "") { global $link; return "
- $msg
"; + $msg"; } function format_notice($msg, $id = "") { global $link; return "
- $msg
"; + $msg"; } function format_error($msg, $id = "") { global $link; return "
- $msg
"; + $msg"; } function print_notice($msg) { diff --git a/install/index.php b/install/index.php index f71a779fa..440954537 100644 --- a/install/index.php +++ b/install/index.php @@ -80,13 +80,13 @@ } function print_error($msg) { - print "
+ print "
$msg
"; } function print_notice($msg) { print "
- $msg
"; + $msg
"; } function db_connect($host, $user, $pass, $db, $type, $port = false) { diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index 4e49075bd..d9391c135 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -32,6 +32,14 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, { dojo.place(param, tnode.rowNode, 'first'); } + if (this.model.store.getValue(args.item, 'id') != 'root') { + var img = dojo.doc.createElement('img'); + img.src ='images/filter.png'; + img.className = 'markedPic'; + tnode._filterIconNode = img; + dojo.place(tnode._filterIconNode, tnode.labelNode, 'before'); + } + return tnode; }, diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index 05a0c15b6..2f7dc0f53 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -22,7 +22,7 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, { if (type == 'label') { var span = dojo.doc.createElement('span'); span.innerHTML = 'α'; - span.className = 'labelColorIndicator2'; + span.className = 'labelColorIndicator'; span.id = 'LICID-' + bare_id; span.setStyle({ @@ -38,6 +38,6 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, { }, getIconClass: function (item, opened) { return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible"; - }, + }, }); diff --git a/js/functions.js b/js/functions.js index 8691c1ee5..b9b3aa44e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -232,7 +232,7 @@ function notify_real(msg, no_hide, n_type) { msg = "" + msg; } - msg += " "; // msg = " " + msg; diff --git a/plugins/close_button/button.png b/plugins/close_button/button.png index b04aed796..1514d51a3 100644 Binary files a/plugins/close_button/button.png and b/plugins/close_button/button.png differ diff --git a/plugins/mail/mail.png b/plugins/mail/mail.png index 4d3fe7751..7348aed77 100644 Binary files a/plugins/mail/mail.png and b/plugins/mail/mail.png differ diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png index fcdcbd604..2c49f78a6 100644 Binary files a/plugins/mailto/mail.png and b/plugins/mailto/mail.png differ diff --git a/plugins/mark_button/init.php b/plugins/mark_button/init.php index 971b12932..103475251 100644 --- a/plugins/mark_button/init.php +++ b/plugins/mark_button/init.php @@ -21,7 +21,7 @@ class Mark_Button extends Plugin { if (get_pref("COMBINED_DISPLAY_MODE")) { if (sql_bool_to_bool($line["marked"])) { $marked_pic = "\"Unstar"; } else { diff --git a/plugins/note/note.png b/plugins/note/note.png index 7f9f3fc3f..244e6ca04 100644 Binary files a/plugins/note/note.png and b/plugins/note/note.png differ diff --git a/plugins/share/share.png b/plugins/share/share.png index 3b6398f4a..25eacb7c2 100644 Binary files a/plugins/share/share.png and b/plugins/share/share.png differ