Browse Source

integrate silk icons by Mark James

remotes/origin/jsonfeed-test-branch
Andrew Dolgov 9 years ago
parent
commit
2f20dd58d2
  1. 2
      README.md
  2. 14
      classes/feeds.php
  3. 8
      classes/pref/prefs.php
  4. 2
      classes/pref/users.php
  5. 8
      css/prefs.css
  6. 35
      css/tt-rss.css
  7. 2
      css/utility.css
  8. BIN
      images/alert.png
  9. 87
      images/alert.svg
  10. BIN
      images/archive.png
  11. 76
      images/close_notify.svg
  12. BIN
      images/collapse.png
  13. BIN
      images/cross.png
  14. BIN
      images/feed.png
  15. BIN
      images/filter.png
  16. BIN
      images/folder.png
  17. BIN
      images/fresh.png
  18. BIN
      images/information.png
  19. BIN
      images/label.png
  20. BIN
      images/mark_set.png
  21. 73
      images/mark_set.svg
  22. BIN
      images/mark_unset.png
  23. 76
      images/mark_unset.svg
  24. BIN
      images/new_version.png
  25. BIN
      images/plugin.png
  26. BIN
      images/plugin_disabled.png
  27. BIN
      images/pub_set.png
  28. 184
      images/pub_set.svg
  29. BIN
      images/pub_unset.png
  30. 149
      images/pub_unset.svg
  31. BIN
      images/recently_read.png
  32. BIN
      images/score_half_high.png
  33. BIN
      images/score_half_low.png
  34. BIN
      images/score_high.png
  35. BIN
      images/score_low.png
  36. BIN
      images/score_neutral.png
  37. 80
      images/sign_excl.svg
  38. 83
      images/sign_info.svg
  39. BIN
      images/star.png
  40. BIN
      images/tag.png
  41. BIN
      images/time.png
  42. BIN
      images/user.png
  43. 14
      include/functions.php
  44. 4
      install/index.php
  45. 8
      js/PrefFilterTree.js
  46. 4
      js/PrefLabelTree.js
  47. 2
      js/functions.js
  48. BIN
      plugins/close_button/button.png
  49. BIN
      plugins/mail/mail.png
  50. BIN
      plugins/mailto/mail.png
  51. 2
      plugins/mark_button/init.php
  52. BIN
      plugins/note/note.png
  53. BIN
      plugins/share/share.png

2
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)

14
classes/feeds.php

@ -74,7 +74,7 @@ class Feeds extends Handler_Protected {
<a href=\"#\"
title=\"".__("View as RSS feed")."\"
onclick=\"displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
<img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.svg\"></a>";
<img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.png\"></a>";
$reply .= "</span>";
@ -323,24 +323,24 @@ class Feeds extends Handler_Protected {
if (sql_bool_to_bool($line["marked"])) {
$marked_pic = "<img
src=\"images/mark_set.svg\"
src=\"images/mark_set.png\"
class=\"markedPic\" alt=\"Unstar article\"
onclick='toggleMark($id)'>";
$class .= " marked";
} else {
$marked_pic = "<img
src=\"images/mark_unset.svg\"
src=\"images/mark_unset.png\"
class=\"markedPic\" alt=\"Star article\"
onclick='toggleMark($id)'>";
}
if (sql_bool_to_bool($line["published"])) {
$published_pic = "<img src=\"images/pub_set.svg\"
$published_pic = "<img src=\"images/pub_set.png\"
class=\"pubPic\"
alt=\"Unpublish article\" onclick='togglePub($id)'>";
$class .= " published";
} else {
$published_pic = "<img src=\"images/pub_unset.svg\"
$published_pic = "<img src=\"images/pub_unset.png\"
class=\"pubPic\"
alt=\"Publish article\" onclick='togglePub($id)'>";
}
@ -395,7 +395,7 @@ class Feeds extends Handler_Protected {
if ($has_feed_icon) {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
} else {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.png\" alt=\"\">";
}
$entry_site_url = $line["site_url"];
@ -638,7 +638,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "&nbsp;";
$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
$reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.svg'></a>";
$reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
$reply['content'] .= "</div>";
}

8
classes/pref/prefs.php

@ -765,7 +765,9 @@ class Pref_Prefs extends Handler_Protected {
dojoType=\"dijit.form.CheckBox\" $checked
type=\"checkbox\"></td>";
print "<td>$name</td>";
$plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png";
print "<td><img src='images/$plugin_icon' alt=''> $name</td>";
print "<td>" . htmlspecialchars($about[1]);
if (@$about[4]) {
print " &mdash; <a target=\"_blank\" class=\"visibleLink\"
@ -818,11 +820,13 @@ class Pref_Prefs extends Handler_Protected {
print "<tr class='$rowclass'>";
$plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png";
print "<td align='center'><input id='FPCHK-$name' name='plugins[]' value='$name' onclick='toggleSelectRow2(this);'
dojoType=\"dijit.form.CheckBox\" $checked $disabled
type=\"checkbox\"></td>";
print "<td><label for='FPCHK-$name'>$name</label></td>";
print "<td><label for='FPCHK-$name'><img src='images/$plugin_icon' alt=''> $name</label></td>";
print "<td><label for='FPCHK-$name'>" . htmlspecialchars($about[1]) . "</label>";
if (@$about[4]) {
print " &mdash; <a target=\"_blank\" class=\"visibleLink\"

2
classes/pref/users.php

@ -418,7 +418,7 @@ class Pref_Users extends Handler_Protected {
$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
print "<td $onclick>" . $line["login"] . "</td>";
print "<td $onclick><img src='images/user.png' class='markedPic' alt=''> " . $line["login"] . "</td>";
if (!$line["email"]) $line["email"] = "&nbsp;";

8
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;
}

35
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;
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;
border : 1px solid #ccc;
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;
}

2
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;
}

BIN
images/alert.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 701 B

87
images/alert.svg

@ -1,87 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2985"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:export-filename="Y:\public_html\testbox\tt-irc\images\alert.png"
inkscape:export-xdpi="102.17"
inkscape:export-ydpi="102.17"
sodipodi:docname="alert.svg">
<defs
id="defs2987" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="0.97227717"
inkscape:cy="13.508447"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1600"
inkscape:window-height="1137"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="star"
style="opacity:1;fill:#d40000;fill-opacity:1"
id="path2993"
sodipodi:sides="3"
sodipodi:cx="4.7752476"
sodipodi:cy="2.3499999"
sodipodi:r1="8.1370182"
sodipodi:r2="4.0685091"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 11.822112,6.418509 -7.0468643,0 -7.0468646,0 3.5234322,-6.10276355 3.5234323,-6.10276375 3.5234322,6.10276356 z"
inkscape:transform-center-y="-2.0342545"
transform="translate(3.2247524,7.6842546)" />
<text
xml:space="preserve"
style="font-size:11px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Sans Bold"
x="6.1657715"
y="12.508285"
id="text3767"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3769"
x="6.1657715"
y="12.508285">!</tspan></text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
images/archive.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 555 B

76
images/close_notify.svg

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2985"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="close_notify.svg">
<defs
id="defs2987" />
<sodipodi:namedview
id="base"
pagecolor="#88b0f0"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="0.97227717"
inkscape:cy="8"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1920"
inkscape:window-height="1138"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="arc"
style="opacity:1;fill:none;fill-opacity:1;stroke:#454545;stroke-width:0.73948608000000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path2997"
sodipodi:cx="6.6673269"
sodipodi:cy="7.1702971"
sodipodi:rx="5.270792"
sodipodi:ry="5.270792"
d="m 11.938119,7.1702971 a 5.270792,5.270792 0 1 1 -10.5415841,0 5.270792,5.270792 0 1 1 10.5415841,0 z"
transform="matrix(1.3522905,0,0,1.3522905,-1.0161629,-1.6963247)" />
<path
style="fill:none;stroke:#454545;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;opacity:1"
d="M 4.4322613,4.4322611 11.567739,11.567739"
id="path3771"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#454545;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;opacity:1"
d="M 11.567739,4.432261 4.432261,11.567739"
id="path3771-1"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
images/collapse.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 317 B

BIN
images/cross.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

BIN
images/feed.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 B

BIN
images/filter.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

BIN
images/folder.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 537 B

BIN
images/fresh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 633 B

BIN
images/information.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 778 B

BIN
images/label.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 586 B

BIN
images/mark_set.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

73
images/mark_set.svg

@ -1,73 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16.000000px"
height="16.000000px"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.42"
sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images"
sodipodi:docname="mark_set.svg"
inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/mark_set.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0000000"
inkscape:pageshadow="2"
inkscape:zoom="31.678384"
inkscape:cx="6.9004349"
inkscape:cy="7.4155540"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1600"
inkscape:window-height="1131"
inkscape:window-x="0"
inkscape:window-y="25"
showguides="true"
inkscape:guide-bbox="true" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
sodipodi:type="star"
style="opacity:1.0000000;fill:#a8cdfd;fill-opacity:1.0000000;stroke:#4f9dfd;stroke-width:0.99999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
id="path1306"
sodipodi:sides="5"
sodipodi:cx="7.3551731"
sodipodi:cy="1.6684607"
sodipodi:r1="6.3745561"
sodipodi:r2="3.1872780"
sodipodi:arg1="0.78539816"
sodipodi:arg2="1.4137167"
inkscape:flatsided="false"
inkscape:rounded="0.0000000"
inkscape:randomized="0.0000000"
d="M 11.862665,6.1759525 L 7.8537732,4.8164981 L 4.4611852,7.3482318 L 4.5152876,3.1154547 L 1.0590984,0.67126048 L 5.1014272,-0.58528520 L 6.3579728,-4.6276140 L 8.8021671,-1.1714248 L 13.034944,-1.2255272 L 10.503210,2.1670609 L 11.862665,6.1759525 z "
transform="matrix(-0.707107,-0.707107,0.707107,-0.707107,12.02111,14.98939)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
images/mark_unset.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

76
images/mark_unset.svg

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16.000000px"
height="16.000000px"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
sodipodi:docname="mark_unset.svg"
inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/mark_unset.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
version="1.1">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0000000"
inkscape:pageshadow="2"
inkscape:zoom="7.919596"
inkscape:cx="-13.509597"
inkscape:cy="-5.9527534"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1600"
inkscape:window-height="1131"
inkscape:window-x="0"
inkscape:window-y="25"
showguides="true"
inkscape:guide-bbox="true"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
sodipodi:type="star"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#88b0f0;stroke-width:0.99999938000000022;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path1306"
sodipodi:sides="5"
sodipodi:cx="7.3551731"
sodipodi:cy="1.6684607"
sodipodi:r1="6.3745561"
sodipodi:r2="3.1872780"
sodipodi:arg1="0.78539816"
sodipodi:arg2="1.4137167"
inkscape:flatsided="false"
inkscape:rounded="0.0000000"
inkscape:randomized="0.0000000"
d="M 11.862665,6.1759525 L 7.8537732,4.8164981 L 4.4611852,7.3482318 L 4.5152876,3.1154547 L 1.0590984,0.67126048 L 5.1014272,-0.58528520 L 6.3579728,-4.6276140 L 8.8021671,-1.1714248 L 13.034944,-1.2255272 L 10.503210,2.1670609 L 11.862665,6.1759525 z "
transform="matrix(-0.707107,-0.707107,0.707107,-0.707107,12.02111,14.98939)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
images/new_version.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 372 B

BIN
images/plugin.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 B

BIN
images/plugin_disabled.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

BIN
images/pub_set.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 B

184
images/pub_set.svg

@ -1,184 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
width="16"
height="16"
id="RSSicon"
viewBox="0 0 32 32"
inkscape:version="0.48.0 r9654"
sodipodi:docname="mark_set.svg">
<metadata
id="metadata34">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="1137"
id="namedview32"
showgrid="false"
inkscape:zoom="23.953242"
inkscape:cx="6.5252922"
inkscape:cy="10.694533"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="RSSicon" />
<defs
id="defs3">
<linearGradient
x1="30.059999"
y1="30.059999"
x2="225.94"
y2="225.94"
id="RSSg"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-224)">
<stop
offset="0.0"
stop-color="#E3702D"
id="stop6" />
<stop
offset="0.1071"
stop-color="#EA7D31"
id="stop8" />
<stop
offset="0.3503"
stop-color="#F69537"
id="stop10" />
<stop
offset="0.5"
stop-color="#FB9E3A"
id="stop12" />
<stop
offset="0.7016"
stop-color="#EA7C31"
id="stop14" />
<stop
offset="0.8866"
stop-color="#DE642B"
id="stop16" />
<stop
offset="1.0"
stop-color="#D95B29"
id="stop18" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#RSSg"
id="linearGradient3029"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-224)"
x1="30.059999"
y1="30.059999"
x2="225.94"
y2="225.94" />
<filter
id="filter3031"
inkscape:label="Desaturate"
x="0"
y="0"
width="1"
height="1"
inkscape:menu="Color"
inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
color-interpolation-filters="sRGB">
<feColorMatrix
id="feColorMatrix3033"
type="saturate"
values="0" />
</filter>
<filter
id="filter3035"
inkscape:label="Desaturate"
x="0"
y="0"
width="1"
height="1"
inkscape:menu="Color"
inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
color-interpolation-filters="sRGB">
<feColorMatrix
id="feColorMatrix3037"
type="saturate"
values="0" />
</filter>
</defs>
<g
id="g3021"
transform="matrix(0.10305878,0,0,0.10305878,2.808475,25.893644)"
style="opacity:1">
<rect
style="fill:#cc5d15;"
id="rect20"
y="-224"
x="0"
ry="55"
rx="55"
height="256"
width="256" />
<rect
style="fill:#f49c52;"
id="rect22"
y="-219"
x="5"
ry="50"
rx="50"
height="246"
width="246" />
<rect
style="fill:url(#linearGradient3029);"
id="rect24"
y="-214"
x="10"
ry="47"
rx="47"
height="236"
width="236" />
<circle
transform="translate(0,-224)"
style="fill:#ffffff;"
sodipodi:ry="24"
sodipodi:rx="24"
sodipodi:cy="189"
sodipodi:cx="68"
id="circle26"
r="24"
cy="189"
cx="68"
d="m 92,189 c 0,13.25483 -10.745166,24 -24,24 -13.254834,0 -24,-10.74517 -24,-24 0,-13.25483 10.745166,-24 24,-24 13.254834,0 24,10.74517 24,24 z" />
<path
style="fill:#ffffff;"
inkscape:connector-curvature="0"
id="path28"
d="M 160,-11 H 126 A 82,82 0 0 0 44,-93 v -34 a 116,116 0 0 1 116,116 z" />
<path
style="fill:#ffffff;"
inkscape:connector-curvature="0"
id="path30"
d="M 184,-11 A 140,140 0 0 0 44,-151 v -35 a 175,175 0 0 1 175,175 z" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
images/pub_unset.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

149
images/pub_unset.svg

@ -1,149 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
width="16"
height="16"
id="RSSicon"
viewBox="0 0 32 32"
inkscape:version="0.48.4 r9939"
sodipodi:docname="pub_unset.svg">
<metadata
id="metadata34">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="1137"
id="namedview32"
showgrid="false"
inkscape:zoom="23.953242"
inkscape:cx="6.0451902"
inkscape:cy="5.8935127"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="RSSicon" />
<defs
id="defs3">
<linearGradient
x1="30.059999"
y1="30.059999"
x2="225.94"
y2="225.94"
id="RSSg"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-224)">
<stop
offset="0.0"
stop-color="#E3702D"
id="stop6" />
<stop
offset="0.1071"
stop-color="#EA7D31"
id="stop8" />
<stop
offset="0.3503"
stop-color="#F69537"
id="stop10" />
<stop
offset="0.5"
stop-color="#FB9E3A"
id="stop12" />
<stop
offset="0.7016"
stop-color="#EA7C31"
id="stop14" />
<stop
offset="0.8866"
stop-color="#DE642B"
id="stop16" />
<stop
offset="1.0"
stop-color="#D95B29"
id="stop18" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#RSSg"
id="linearGradient3029"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-224)"
x1="30.059999"
y1="30.059999"
x2="225.94"
y2="225.94" />
</defs>
<rect
width="27.385"
height="27.385"
rx="5.8834963"
ry="5.8834963"
x="2.3074989"
y="2.3075001"
id="rect20"
style="fill:#909090;fill-opacity:1" />
<rect
width="26.315275"
height="26.315275"
rx="5.3486328"
ry="5.3486328"
x="2.8423624"
y="2.8423634"
id="rect22"
style="fill:#a0a0a0;fill-opacity:0.94117647" />
<rect
width="25.245548"
height="25.245548"
rx="5.0277152"
ry="5.0277152"
x="3.3772256"
y="3.3772268"
id="rect24"
style="fill:#c0c0c0;fill-opacity:1" />
<circle
d="m 92,189 c 0,13.25483 -10.745166,24 -24,24 -13.254834,0 -24,-10.74517 -24,-24 0,-13.25483 10.745166,-24 24,-24 13.254834,0 24,10.74517 24,24 z"
cx="68"
cy="189"
r="24"
id="circle26"
sodipodi:cx="68"
sodipodi:cy="189"
sodipodi:rx="24"
sodipodi:ry="24"
style="fill:#ffffff"
transform="matrix(0.10697266,0,0,0.10697266,2.307499,2.3075002)" />
<path
d="M 19.423125,25.092677 H 15.786054 A 8.7717581,8.7717581 0 0 0 7.014296,16.320919 v -3.637071 a 12.408829,12.408829 0 0 1 12.408829,12.408829 z"
id="path28"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
<path
d="M 21.990468,25.092677 A 14.976172,14.976172 0 0 0 7.014296,10.116504 V 6.3724612 A 18.720216,18.720216 0 0 1 25.734512,25.092677 z"
id="path30"
inkscape:connector-curvature="0"
style="fill:#ffffff" />
</svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
images/recently_read.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
images/score_half_high.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 295 B

BIN
images/score_half_low.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 211 B

BIN
images/score_high.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 295 B

BIN
images/score_low.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 211 B

BIN
images/score_neutral.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 201 B

80
images/sign_excl.svg

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32px"
height="32px"
id="svg7311"
version="1.1"
inkscape:version="0.48.0 r9654"
sodipodi:docname="sign_excl.svg">
<defs
id="defs7313" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="-11.862611"
inkscape:cy="16"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1600"
inkscape:window-height="1137"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7316">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="arc"
style="fill:#eb6363;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path6540-7"
sodipodi:cx="3.409934"
sodipodi:cy="4.3416462"
sodipodi:rx="14.271205"
sodipodi:ry="14.271205"
d="m 17.681139,4.3416462 a 14.271205,14.271205 0 1 1 -28.54241,0 14.271205,14.271205 0 1 1 28.54241,0 z"
transform="translate(12.590066,11.658354)"
inkscape:export-xdpi="73.07"
inkscape:export-ydpi="73.07" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
x="11.482422"
y="24.308594"
id="text6542-9"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6544-5"
x="11.482422"
y="24.308594"
style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Georgia;-inkscape-font-specification:Georgia Bold">!</tspan></text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

83
images/sign_info.svg

@ -1,83 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32px"
height="32px"
id="svg2985"
version="1.1"
inkscape:version="0.48.0 r9654"
sodipodi:docname="sign_info.svg"
inkscape:export-filename="Y:\public_html\testbox\tt-rss\images\sign_info.png"
inkscape:export-xdpi="67.5"
inkscape:export-ydpi="67.5">
<defs
id="defs2987" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.7994505"
inkscape:cx="6.8311272"
inkscape:cy="-22.339561"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1600"
inkscape:window-height="1137"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="arc"
style="fill:#88b0f0;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path6540"
sodipodi:cx="3.409934"
sodipodi:cy="4.3416462"
sodipodi:rx="14.271205"
sodipodi:ry="14.271205"
d="m 17.681139,4.3416462 a 14.271205,14.271205 0 1 1 -28.54241,0 14.271205,14.271205 0 1 1 28.54241,0 z"
transform="translate(12.590066,11.658354)"
inkscape:export-xdpi="73.07"
inkscape:export-ydpi="73.07" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
x="11.763672"
y="25.070313"
id="text6542"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6544"
x="11.763672"
y="25.070313"
style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Georgia;-inkscape-font-specification:Georgia Bold">i</tspan></text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

BIN
images/star.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

BIN
images/tag.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 594 B

BIN
images/time.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

BIN
images/user.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 B

14
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 "<div class=\"warning\" id=\"$id\">
<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
<span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
}
function format_notice($msg, $id = "") {
global $link;
return "<div class=\"notice\" id=\"$id\">
<span><img src=\"images/sign_info.svg\"></span><span>$msg</span></div>";
<span><img src=\"images/information.png\"></span><span>$msg</span></div>";
}
function format_error($msg, $id = "") {
global $link;
return "<div class=\"error\" id=\"$id\">
<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
<span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
}
function print_notice($msg) {

4
install/index.php

@ -80,13 +80,13 @@
}
function print_error($msg) {
print "<div class='error'><span><img src='../images/sign_excl.svg'></span>
print "<div class='error'><span><img src='../images/alert.png'></span>
<span>$msg</span></div>";
}
function print_notice($msg) {
print "<div class=\"notice\">
<span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
<span><img src=\"../images/information.png\"></span><span>$msg</span></div>";
}
function db_connect($host, $user, $pass, $db, $type, $port = false) {

8
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;
},

4
js/PrefLabelTree.js

@ -22,7 +22,7 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
if (type == 'label') {
var span = dojo.doc.createElement('span');
span.innerHTML = '&alpha;';
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";
},
},
});

2
js/functions.js

@ -232,7 +232,7 @@ function notify_real(msg, no_hide, n_type) {
msg = "<span><img src='images/sign_info.svg'></span>" + msg;
}
msg += " <span><img src=\"images/close_notify.svg\" class=\"close\" title=\"" +
msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
__("Click to close") + "\" onclick=\"notify('')\"></span>";
// msg = "<img src='images/live_com_loading.gif'> " + msg;

BIN
plugins/close_button/button.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 655 B

BIN
plugins/mail/mail.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 641 B

BIN
plugins/mailto/mail.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 821 B

2
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 = "<img
src=\"images/mark_set.svg\"
src=\"images/mark_set.png\"
class=\"markedPic\" alt=\"Unstar article\"
onclick='toggleMark($id)'>";
} else {

BIN
plugins/note/note.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 500 B

BIN
plugins/share/share.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 343 B

Loading…
Cancel
Save