diff options
57 files changed, 38 insertions, 269 deletions
diff --git a/functions.php b/functions.php index ace753b67..cf78cdf30 100644 --- a/functions.php +++ b/functions.php @@ -1592,10 +1592,8 @@ if (!$icon_file) $icon_file = getFeedIcon($feed_id); - $theme_path = get_user_theme_path($link); - - if ($theme_path && strpos($icon_file, "images") !== false) { - $icon_file = $theme_path . $icon_file; + if (strpos($icon_file, "images") !== false) { + $icon_file = theme_image($link, $icon_file); } if (file_exists($icon_file) && filesize($icon_file) > 0) { @@ -1993,6 +1991,16 @@ } } + function theme_image($link, $filename) { + $theme_path = get_user_theme_path($link); + + if ($theme_path && is_file($theme_path.$filename)) { + return $theme_path.$filename; + } else { + return $filename; + } + } + function get_user_theme($link) { if (get_schema_version($link) >= 63) { @@ -4657,8 +4665,6 @@ $result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); - $theme_path = get_user_theme_path($link); - if (db_num_rows($result) == 1) { $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content")); $always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures")); @@ -4757,22 +4763,23 @@ if (!$entry_comments) $entry_comments = " "; # placeholder print "<div style='float : right'> - <img src='${theme_path}images/tag.png' class='tagsPic' alt='Tags' title='Tags'> "; + <img src='".theme_image($link, 'images/tag.png')."' + class='tagsPic' alt='Tags' title='Tags'> "; if (!$zoom_mode) { print "<span id=\"ATSTR-$id\">$tags_str</span> <a title=\"".__('Edit tags for this article')."\" href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>"; - print "<img src=\"${theme_path}images/art-zoom.png\" class='tagsPic' - style=\"cursor : pointer\" style=\"cursor : pointer\" + print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\" + class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\" onclick=\"zoomToArticle($id)\" alt='Zoom' title='".__('Show article summary in new window')."'>"; $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES); - print "<img src=\"${theme_path}images/art-pub-note.png\" class='tagsPic' - style=\"cursor : pointer\" style=\"cursor : pointer\" + print "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\" + class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\" onclick=\"publishWithNote($id, '$note_escaped')\" alt='PubNote' title='".__('Publish article with a note')."'>"; @@ -5053,8 +5060,6 @@ $fresh_intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60; - $theme_path = get_user_theme_path($link); - while ($line = db_fetch_assoc($result)) { $class = ($lnum % 2) ? "even" : "odd"; @@ -5084,8 +5089,8 @@ if (sql_bool_to_bool($line["unread"]) && time() - strtotime($line["updated_noms"]) < $fresh_intl) { - $update_pic = "<img id='FUPDPIC-$id' src=\"${theme_path}images/fresh_sign.png\" - alt=\"Fresh\">"; + $update_pic = "<img id='FUPDPIC-$id' src=\"". + theme_image($link, 'images/fresh_sign.png')."\" alt=\"Fresh\">"; } if ($line["unread"] == "t" || $line["unread"] == "1") { @@ -5097,21 +5102,25 @@ } if ($line["marked"] == "t" || $line["marked"] == "1") { - $marked_pic = "<img id=\"FMPIC-$id\" src=\"${theme_path}images/mark_set.png\" - class=\"markedPic\" - alt=\"Unstar article\" onclick='javascript:tMark($id)'>"; + $marked_pic = "<img id=\"FMPIC-$id\" + src=\"".theme_image($link, 'images/mark_set.png')."\" + class=\"markedPic\" alt=\"Unstar article\" + onclick='javascript:tMark($id)'>"; } else { - $marked_pic = "<img id=\"FMPIC-$id\" src=\"${theme_path}images/mark_unset.png\" - class=\"markedPic\" - alt=\"Star article\" onclick='javascript:tMark($id)'>"; + $marked_pic = "<img id=\"FMPIC-$id\" + src=\"".theme_image($link, 'images/mark_unset.png')."\" + class=\"markedPic\" alt=\"Star article\" + onclick='javascript:tMark($id)'>"; } if ($line["published"] == "t" || $line["published"] == "1") { - $published_pic = "<img id=\"FPPIC-$id\" src=\"${theme_path}images/pub_set.png\" + $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link, + 'images/pub_set.png')."\" class=\"markedPic\" alt=\"Unpublish article\" onclick='javascript:tPub($id)'>"; } else { - $published_pic = "<img id=\"FPPIC-$id\" src=\"${theme_path}images/pub_unset.png\" + $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link, + 'images/pub_unset.png')."\" class=\"markedPic\" alt=\"Publish article\" onclick='javascript:tPub($id)'>"; } @@ -5503,7 +5512,8 @@ $tags_str = format_tags_string(get_article_tags($link, $id), $id); print "<span class='s1'> - <img class='tagsPic' src='${theme_path}images/tag.png' alt='Tags' title='Tags'> + <img class='tagsPic' src='".theme_image($link, + 'images/tag.png')."' alt='Tags' title='Tags'> <span id=\"ATSTR-$id\">$tags_str</span> <a title=\"".__('Edit tags for this article')."\" href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>"; @@ -94,7 +94,7 @@ | <a href="logout.php"><?php echo __('Logout') ?></a> <?php } ?> </div> - <img src="<?php echo $user_theme ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> + <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/> </div> <div id="prefTabs"> diff --git a/themes/compact/images/archive.png b/themes/compact/images/archive.png Binary files differdeleted file mode 100755 index 6edd2da33..000000000 --- a/themes/compact/images/archive.png +++ /dev/null diff --git a/themes/compact/images/art-pub-note.png b/themes/compact/images/art-pub-note.png Binary files differdeleted file mode 100755 index e04832676..000000000 --- a/themes/compact/images/art-pub-note.png +++ /dev/null diff --git a/themes/compact/images/art-zoom.png b/themes/compact/images/art-zoom.png Binary files differdeleted file mode 100755 index 6311b3130..000000000 --- a/themes/compact/images/art-zoom.png +++ /dev/null diff --git a/themes/compact/images/fresh.png b/themes/compact/images/fresh.png Binary files differdeleted file mode 100755 index b6040aa9c..000000000 --- a/themes/compact/images/fresh.png +++ /dev/null diff --git a/themes/compact/images/fresh_sign.png b/themes/compact/images/fresh_sign.png Binary files differdeleted file mode 100755 index 6ec38eeb6..000000000 --- a/themes/compact/images/fresh_sign.png +++ /dev/null diff --git a/themes/compact/images/grad_1.png b/themes/compact/images/grad_1.png Binary files differdeleted file mode 100644 index 1a25a785a..000000000 --- a/themes/compact/images/grad_1.png +++ /dev/null diff --git a/themes/compact/images/label.png b/themes/compact/images/label.png Binary files differdeleted file mode 100644 index e27d0c537..000000000 --- a/themes/compact/images/label.png +++ /dev/null diff --git a/themes/compact/images/mark_set.png b/themes/compact/images/mark_set.png Binary files differdeleted file mode 100644 index b35655c85..000000000 --- a/themes/compact/images/mark_set.png +++ /dev/null diff --git a/themes/compact/images/mark_unset.png b/themes/compact/images/mark_unset.png Binary files differdeleted file mode 100644 index bf9059a32..000000000 --- a/themes/compact/images/mark_unset.png +++ /dev/null diff --git a/themes/compact/images/pub_set.png b/themes/compact/images/pub_set.png Binary files differdeleted file mode 100644 index 1aff094fd..000000000 --- a/themes/compact/images/pub_set.png +++ /dev/null diff --git a/themes/compact/images/pub_unset.png b/themes/compact/images/pub_unset.png Binary files differdeleted file mode 100644 index 14609dff7..000000000 --- a/themes/compact/images/pub_unset.png +++ /dev/null diff --git a/themes/compact/images/resize_handle_horiz.png b/themes/compact/images/resize_handle_horiz.png Binary files differdeleted file mode 100644 index a2e347e3d..000000000 --- a/themes/compact/images/resize_handle_horiz.png +++ /dev/null diff --git a/themes/compact/images/resize_horiz.png b/themes/compact/images/resize_horiz.png Binary files differdeleted file mode 100644 index cbf190971..000000000 --- a/themes/compact/images/resize_horiz.png +++ /dev/null diff --git a/themes/compact/images/tag.png b/themes/compact/images/tag.png Binary files differdeleted file mode 100644 index 5415949ee..000000000 --- a/themes/compact/images/tag.png +++ /dev/null diff --git a/themes/compact/images/ttrss_logo.png b/themes/compact/images/ttrss_logo.png Binary files differdeleted file mode 100644 index 2cedc35ed..000000000 --- a/themes/compact/images/ttrss_logo.png +++ /dev/null diff --git a/themes/compact/images/ttrss_logo.svg b/themes/compact/images/ttrss_logo.svg deleted file mode 100644 index f2dabbc61..000000000 --- a/themes/compact/images/ttrss_logo.svg +++ /dev/null @@ -1,121 +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="155.00000pt" - height="25.000000pt" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.43" - sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images" - sodipodi:docname="ttrss_logo.svg" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png" - inkscape:export-xdpi="109" - inkscape:export-ydpi="109"> - <defs - id="defs4"> - <linearGradient - id="linearGradient3112"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3114" /> - <stop - style="stop-color:#808080;stop-opacity:1;" - offset="1" - id="stop3116" /> - </linearGradient> - <linearGradient - id="linearGradient2800"> - <stop - style="stop-color:#000000;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2802" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop2804" /> - </linearGradient> - <linearGradient - id="linearGradient2782"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2784" /> - <stop - style="stop-color:#f6b5ba;stop-opacity:1;" - offset="1" - id="stop2786" /> - </linearGradient> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="109.86875" - inkscape:cy="3.8105931" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1590" - inkscape:window-height="1124" - 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"> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="3.2755625" - y="23.535715" - id="text1306" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan1308" - x="3.2755625" - y="23.535715" - style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="143.44531" - y="23.594028" - id="text3120" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan3122" - x="143.44531" - y="23.594028" - style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text> - </g> -</svg> diff --git a/themes/graycube/images/archive.png b/themes/graycube/images/archive.png Binary files differdeleted file mode 100755 index 6edd2da33..000000000 --- a/themes/graycube/images/archive.png +++ /dev/null diff --git a/themes/graycube/images/art-pub-note.png b/themes/graycube/images/art-pub-note.png Binary files differdeleted file mode 100755 index e04832676..000000000 --- a/themes/graycube/images/art-pub-note.png +++ /dev/null diff --git a/themes/graycube/images/art-zoom.png b/themes/graycube/images/art-zoom.png Binary files differdeleted file mode 100755 index 6311b3130..000000000 --- a/themes/graycube/images/art-zoom.png +++ /dev/null diff --git a/themes/graycube/images/fresh.png b/themes/graycube/images/fresh.png Binary files differdeleted file mode 100755 index b6040aa9c..000000000 --- a/themes/graycube/images/fresh.png +++ /dev/null diff --git a/themes/graycube/images/fresh_sign.png b/themes/graycube/images/fresh_sign.png Binary files differdeleted file mode 100755 index 6ec38eeb6..000000000 --- a/themes/graycube/images/fresh_sign.png +++ /dev/null diff --git a/themes/graycube/images/label.png b/themes/graycube/images/label.png Binary files differdeleted file mode 100644 index e27d0c537..000000000 --- a/themes/graycube/images/label.png +++ /dev/null diff --git a/themes/graycube/images/mark_set.png b/themes/graycube/images/mark_set.png Binary files differdeleted file mode 100644 index b35655c85..000000000 --- a/themes/graycube/images/mark_set.png +++ /dev/null diff --git a/themes/graycube/images/mark_unset.png b/themes/graycube/images/mark_unset.png Binary files differdeleted file mode 100644 index bf9059a32..000000000 --- a/themes/graycube/images/mark_unset.png +++ /dev/null diff --git a/themes/graycube/images/pub_set.png b/themes/graycube/images/pub_set.png Binary files differdeleted file mode 100644 index 1aff094fd..000000000 --- a/themes/graycube/images/pub_set.png +++ /dev/null diff --git a/themes/graycube/images/pub_unset.png b/themes/graycube/images/pub_unset.png Binary files differdeleted file mode 100644 index 14609dff7..000000000 --- a/themes/graycube/images/pub_unset.png +++ /dev/null diff --git a/themes/graycube/images/tag.png b/themes/graycube/images/tag.png Binary files differdeleted file mode 100644 index 5415949ee..000000000 --- a/themes/graycube/images/tag.png +++ /dev/null diff --git a/themes/old-skool/images/archive.png b/themes/old-skool/images/archive.png Binary files differdeleted file mode 100755 index 6edd2da33..000000000 --- a/themes/old-skool/images/archive.png +++ /dev/null diff --git a/themes/old-skool/images/art-pub-note.png b/themes/old-skool/images/art-pub-note.png Binary files differdeleted file mode 100755 index e04832676..000000000 --- a/themes/old-skool/images/art-pub-note.png +++ /dev/null diff --git a/themes/old-skool/images/art-zoom.png b/themes/old-skool/images/art-zoom.png Binary files differdeleted file mode 100755 index 6311b3130..000000000 --- a/themes/old-skool/images/art-zoom.png +++ /dev/null diff --git a/themes/old-skool/images/fresh.png b/themes/old-skool/images/fresh.png Binary files differdeleted file mode 100755 index b6040aa9c..000000000 --- a/themes/old-skool/images/fresh.png +++ /dev/null diff --git a/themes/old-skool/images/fresh_sign.png b/themes/old-skool/images/fresh_sign.png Binary files differdeleted file mode 100755 index 6ec38eeb6..000000000 --- a/themes/old-skool/images/fresh_sign.png +++ /dev/null diff --git a/themes/old-skool/images/label.png b/themes/old-skool/images/label.png Binary files differdeleted file mode 100644 index e27d0c537..000000000 --- a/themes/old-skool/images/label.png +++ /dev/null diff --git a/themes/old-skool/images/mark_set.png b/themes/old-skool/images/mark_set.png Binary files differdeleted file mode 100644 index b35655c85..000000000 --- a/themes/old-skool/images/mark_set.png +++ /dev/null diff --git a/themes/old-skool/images/mark_unset.png b/themes/old-skool/images/mark_unset.png Binary files differdeleted file mode 100644 index bf9059a32..000000000 --- a/themes/old-skool/images/mark_unset.png +++ /dev/null diff --git a/themes/old-skool/images/pub_set.png b/themes/old-skool/images/pub_set.png Binary files differdeleted file mode 100644 index 1aff094fd..000000000 --- a/themes/old-skool/images/pub_set.png +++ /dev/null diff --git a/themes/old-skool/images/pub_unset.png b/themes/old-skool/images/pub_unset.png Binary files differdeleted file mode 100644 index 14609dff7..000000000 --- a/themes/old-skool/images/pub_unset.png +++ /dev/null diff --git a/themes/old-skool/images/tag.png b/themes/old-skool/images/tag.png Binary files differdeleted file mode 100644 index 5415949ee..000000000 --- a/themes/old-skool/images/tag.png +++ /dev/null diff --git a/themes/triple-pane/images/archive.png b/themes/triple-pane/images/archive.png Binary files differdeleted file mode 100755 index 6edd2da33..000000000 --- a/themes/triple-pane/images/archive.png +++ /dev/null diff --git a/themes/triple-pane/images/art-pub-note.png b/themes/triple-pane/images/art-pub-note.png Binary files differdeleted file mode 100755 index e04832676..000000000 --- a/themes/triple-pane/images/art-pub-note.png +++ /dev/null diff --git a/themes/triple-pane/images/art-zoom.png b/themes/triple-pane/images/art-zoom.png Binary files differdeleted file mode 100755 index 6311b3130..000000000 --- a/themes/triple-pane/images/art-zoom.png +++ /dev/null diff --git a/themes/triple-pane/images/fresh.png b/themes/triple-pane/images/fresh.png Binary files differdeleted file mode 100755 index b6040aa9c..000000000 --- a/themes/triple-pane/images/fresh.png +++ /dev/null diff --git a/themes/triple-pane/images/fresh_sign.png b/themes/triple-pane/images/fresh_sign.png Binary files differdeleted file mode 100755 index 6ec38eeb6..000000000 --- a/themes/triple-pane/images/fresh_sign.png +++ /dev/null diff --git a/themes/triple-pane/images/grad_1.png b/themes/triple-pane/images/grad_1.png Binary files differdeleted file mode 100644 index 1a25a785a..000000000 --- a/themes/triple-pane/images/grad_1.png +++ /dev/null diff --git a/themes/triple-pane/images/label.png b/themes/triple-pane/images/label.png Binary files differdeleted file mode 100644 index e27d0c537..000000000 --- a/themes/triple-pane/images/label.png +++ /dev/null diff --git a/themes/triple-pane/images/mark_set.png b/themes/triple-pane/images/mark_set.png Binary files differdeleted file mode 100644 index b35655c85..000000000 --- a/themes/triple-pane/images/mark_set.png +++ /dev/null diff --git a/themes/triple-pane/images/mark_unset.png b/themes/triple-pane/images/mark_unset.png Binary files differdeleted file mode 100644 index bf9059a32..000000000 --- a/themes/triple-pane/images/mark_unset.png +++ /dev/null diff --git a/themes/triple-pane/images/pub_set.png b/themes/triple-pane/images/pub_set.png Binary files differdeleted file mode 100644 index 1aff094fd..000000000 --- a/themes/triple-pane/images/pub_set.png +++ /dev/null diff --git a/themes/triple-pane/images/pub_unset.png b/themes/triple-pane/images/pub_unset.png Binary files differdeleted file mode 100644 index 14609dff7..000000000 --- a/themes/triple-pane/images/pub_unset.png +++ /dev/null diff --git a/themes/triple-pane/images/resize_handle_horiz.png b/themes/triple-pane/images/resize_handle_horiz.png Binary files differdeleted file mode 100644 index a2e347e3d..000000000 --- a/themes/triple-pane/images/resize_handle_horiz.png +++ /dev/null diff --git a/themes/triple-pane/images/resize_horiz.png b/themes/triple-pane/images/resize_horiz.png Binary files differdeleted file mode 100644 index cbf190971..000000000 --- a/themes/triple-pane/images/resize_horiz.png +++ /dev/null diff --git a/themes/triple-pane/images/tag.png b/themes/triple-pane/images/tag.png Binary files differdeleted file mode 100644 index 5415949ee..000000000 --- a/themes/triple-pane/images/tag.png +++ /dev/null diff --git a/themes/triple-pane/images/ttrss_logo.png b/themes/triple-pane/images/ttrss_logo.png Binary files differdeleted file mode 100644 index 2cedc35ed..000000000 --- a/themes/triple-pane/images/ttrss_logo.png +++ /dev/null diff --git a/themes/triple-pane/images/ttrss_logo.svg b/themes/triple-pane/images/ttrss_logo.svg deleted file mode 100644 index f2dabbc61..000000000 --- a/themes/triple-pane/images/ttrss_logo.svg +++ /dev/null @@ -1,121 +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="155.00000pt" - height="25.000000pt" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.43" - sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images" - sodipodi:docname="ttrss_logo.svg" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png" - inkscape:export-xdpi="109" - inkscape:export-ydpi="109"> - <defs - id="defs4"> - <linearGradient - id="linearGradient3112"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3114" /> - <stop - style="stop-color:#808080;stop-opacity:1;" - offset="1" - id="stop3116" /> - </linearGradient> - <linearGradient - id="linearGradient2800"> - <stop - style="stop-color:#000000;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2802" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop2804" /> - </linearGradient> - <linearGradient - id="linearGradient2782"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2784" /> - <stop - style="stop-color:#f6b5ba;stop-opacity:1;" - offset="1" - id="stop2786" /> - </linearGradient> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="109.86875" - inkscape:cy="3.8105931" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1590" - inkscape:window-height="1124" - 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"> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="3.2755625" - y="23.535715" - id="text1306" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan1308" - x="3.2755625" - y="23.535715" - style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="143.44531" - y="23.594028" - id="text3120" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan3122" - x="143.44531" - y="23.594028" - style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text> - </g> -</svg> diff --git a/tt-rss.php b/tt-rss.php index 9fa3da1d8..9d4305fe1 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -159,7 +159,7 @@ </div> - <img src="<?php echo $user_theme ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> + <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/> </div> <div id="feeds-holder"> @@ -240,7 +240,8 @@ <div id="resize-grabber" onmouseover="enable_resize(true)" onmouseout="enable_resize(false)" title="<?php echo __('Drag me to resize panels') ?>"> - <img src="<?php echo $user_theme ?>images/resize_handle_horiz.png" id="resize-handle" + <img src="<?php echo theme_image($link, + 'images/resize_handle_horiz.png') ?>" id="resize-handle" onmouseover="enable_resize(true)" onmouseout="enable_resize(false)" alt=""/> </div> |
