do not require themed images to be overridden

diff --git a/functions.php b/functions.php
index ace753b67fa372346c308b8e903db22e8809a93a..cf78cdf30d4df07298c51578d438a4e41c6ef59e 100644 (file)
--- 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'>&nbsp;";
+                               <img src='".theme_image($link, 'images/tag.png')."' 
+                               class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
 
                        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>";

diff --git a/prefs.php b/prefs.php
index 9d2d0a846766c034f8e77cb1d3cefdc4daf98327..7d1ff3379a53ccb4377cfdf8b6c62aa5d8cb33a4 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -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
deleted file mode 100755 (executable)
index 6edd2da..0000000
Binary files a/themes/compact/images/archive.png and /dev/null differ

diff --git a/themes/compact/images/art-pub-note.png b/themes/compact/images/art-pub-note.png
deleted file mode 100755 (executable)
index e048326..0000000
Binary files a/themes/compact/images/art-pub-note.png and /dev/null differ

diff --git a/themes/compact/images/art-zoom.png b/themes/compact/images/art-zoom.png
deleted file mode 100755 (executable)
index 6311b31..0000000
Binary files a/themes/compact/images/art-zoom.png and /dev/null differ

diff --git a/themes/compact/images/fresh.png b/themes/compact/images/fresh.png
deleted file mode 100755 (executable)
index b6040aa..0000000
Binary files a/themes/compact/images/fresh.png and /dev/null differ

diff --git a/themes/compact/images/fresh_sign.png b/themes/compact/images/fresh_sign.png
deleted file mode 100755 (executable)
index 6ec38ee..0000000
Binary files a/themes/compact/images/fresh_sign.png and /dev/null differ

diff --git a/themes/compact/images/grad_1.png b/themes/compact/images/grad_1.png
deleted file mode 100644 (file)
index 1a25a78..0000000
Binary files a/themes/compact/images/grad_1.png and /dev/null differ

diff --git a/themes/compact/images/label.png b/themes/compact/images/label.png
deleted file mode 100644 (file)
index e27d0c5..0000000
Binary files a/themes/compact/images/label.png and /dev/null differ

diff --git a/themes/compact/images/mark_set.png b/themes/compact/images/mark_set.png
deleted file mode 100644 (file)
index b35655c..0000000
Binary files a/themes/compact/images/mark_set.png and /dev/null differ

diff --git a/themes/compact/images/mark_unset.png b/themes/compact/images/mark_unset.png
deleted file mode 100644 (file)
index bf9059a..0000000
Binary files a/themes/compact/images/mark_unset.png and /dev/null differ

diff --git a/themes/compact/images/pub_set.png b/themes/compact/images/pub_set.png
deleted file mode 100644 (file)
index 1aff094..0000000
Binary files a/themes/compact/images/pub_set.png and /dev/null differ

diff --git a/themes/compact/images/pub_unset.png b/themes/compact/images/pub_unset.png
deleted file mode 100644 (file)
index 14609df..0000000
Binary files a/themes/compact/images/pub_unset.png and /dev/null differ

diff --git a/themes/compact/images/resize_handle_horiz.png b/themes/compact/images/resize_handle_horiz.png
deleted file mode 100644 (file)
index a2e347e..0000000
Binary files a/themes/compact/images/resize_handle_horiz.png and /dev/null differ

diff --git a/themes/compact/images/resize_horiz.png b/themes/compact/images/resize_horiz.png
deleted file mode 100644 (file)
index cbf1909..0000000
Binary files a/themes/compact/images/resize_horiz.png and /dev/null differ

diff --git a/themes/compact/images/tag.png b/themes/compact/images/tag.png
deleted file mode 100644 (file)
index 5415949..0000000
Binary files a/themes/compact/images/tag.png and /dev/null differ

diff --git a/themes/compact/images/ttrss_logo.png b/themes/compact/images/ttrss_logo.png
deleted file mode 100644 (file)
index 2cedc35..0000000
Binary files a/themes/compact/images/ttrss_logo.png and /dev/null differ

diff --git a/themes/compact/images/ttrss_logo.svg b/themes/compact/images/ttrss_logo.svg
deleted file mode 100644 (file)
index f2dabbc..0000000
--- 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
deleted file mode 100755 (executable)
index 6edd2da..0000000
Binary files a/themes/graycube/images/archive.png and /dev/null differ

diff --git a/themes/graycube/images/art-pub-note.png b/themes/graycube/images/art-pub-note.png
deleted file mode 100755 (executable)
index e048326..0000000
Binary files a/themes/graycube/images/art-pub-note.png and /dev/null differ

diff --git a/themes/graycube/images/art-zoom.png b/themes/graycube/images/art-zoom.png
deleted file mode 100755 (executable)
index 6311b31..0000000
Binary files a/themes/graycube/images/art-zoom.png and /dev/null differ

diff --git a/themes/graycube/images/fresh.png b/themes/graycube/images/fresh.png
deleted file mode 100755 (executable)
index b6040aa..0000000
Binary files a/themes/graycube/images/fresh.png and /dev/null differ

diff --git a/themes/graycube/images/fresh_sign.png b/themes/graycube/images/fresh_sign.png
deleted file mode 100755 (executable)
index 6ec38ee..0000000
Binary files a/themes/graycube/images/fresh_sign.png and /dev/null differ

diff --git a/themes/graycube/images/label.png b/themes/graycube/images/label.png
deleted file mode 100644 (file)
index e27d0c5..0000000
Binary files a/themes/graycube/images/label.png and /dev/null differ

diff --git a/themes/graycube/images/mark_set.png b/themes/graycube/images/mark_set.png
deleted file mode 100644 (file)
index b35655c..0000000
Binary files a/themes/graycube/images/mark_set.png and /dev/null differ

diff --git a/themes/graycube/images/mark_unset.png b/themes/graycube/images/mark_unset.png
deleted file mode 100644 (file)
index bf9059a..0000000
Binary files a/themes/graycube/images/mark_unset.png and /dev/null differ

diff --git a/themes/graycube/images/pub_set.png b/themes/graycube/images/pub_set.png
deleted file mode 100644 (file)
index 1aff094..0000000
Binary files a/themes/graycube/images/pub_set.png and /dev/null differ

diff --git a/themes/graycube/images/pub_unset.png b/themes/graycube/images/pub_unset.png
deleted file mode 100644 (file)
index 14609df..0000000
Binary files a/themes/graycube/images/pub_unset.png and /dev/null differ

diff --git a/themes/graycube/images/tag.png b/themes/graycube/images/tag.png
deleted file mode 100644 (file)
index 5415949..0000000
Binary files a/themes/graycube/images/tag.png and /dev/null differ

diff --git a/themes/old-skool/images/archive.png b/themes/old-skool/images/archive.png
deleted file mode 100755 (executable)
index 6edd2da..0000000
Binary files a/themes/old-skool/images/archive.png and /dev/null differ

diff --git a/themes/old-skool/images/art-pub-note.png b/themes/old-skool/images/art-pub-note.png
deleted file mode 100755 (executable)
index e048326..0000000
Binary files a/themes/old-skool/images/art-pub-note.png and /dev/null differ

diff --git a/themes/old-skool/images/art-zoom.png b/themes/old-skool/images/art-zoom.png
deleted file mode 100755 (executable)
index 6311b31..0000000
Binary files a/themes/old-skool/images/art-zoom.png and /dev/null differ

diff --git a/themes/old-skool/images/fresh.png b/themes/old-skool/images/fresh.png
deleted file mode 100755 (executable)
index b6040aa..0000000
Binary files a/themes/old-skool/images/fresh.png and /dev/null differ

diff --git a/themes/old-skool/images/fresh_sign.png b/themes/old-skool/images/fresh_sign.png
deleted file mode 100755 (executable)
index 6ec38ee..0000000
Binary files a/themes/old-skool/images/fresh_sign.png and /dev/null differ

diff --git a/themes/old-skool/images/label.png b/themes/old-skool/images/label.png
deleted file mode 100644 (file)
index e27d0c5..0000000
Binary files a/themes/old-skool/images/label.png and /dev/null differ

diff --git a/themes/old-skool/images/mark_set.png b/themes/old-skool/images/mark_set.png
deleted file mode 100644 (file)
index b35655c..0000000
Binary files a/themes/old-skool/images/mark_set.png and /dev/null differ

diff --git a/themes/old-skool/images/mark_unset.png b/themes/old-skool/images/mark_unset.png
deleted file mode 100644 (file)
index bf9059a..0000000
Binary files a/themes/old-skool/images/mark_unset.png and /dev/null differ

diff --git a/themes/old-skool/images/pub_set.png b/themes/old-skool/images/pub_set.png
deleted file mode 100644 (file)
index 1aff094..0000000
Binary files a/themes/old-skool/images/pub_set.png and /dev/null differ

diff --git a/themes/old-skool/images/pub_unset.png b/themes/old-skool/images/pub_unset.png
deleted file mode 100644 (file)
index 14609df..0000000
Binary files a/themes/old-skool/images/pub_unset.png and /dev/null differ

diff --git a/themes/old-skool/images/tag.png b/themes/old-skool/images/tag.png
deleted file mode 100644 (file)
index 5415949..0000000
Binary files a/themes/old-skool/images/tag.png and /dev/null differ

diff --git a/themes/triple-pane/images/archive.png b/themes/triple-pane/images/archive.png
deleted file mode 100755 (executable)
index 6edd2da..0000000
Binary files a/themes/triple-pane/images/archive.png and /dev/null differ

diff --git a/themes/triple-pane/images/art-pub-note.png b/themes/triple-pane/images/art-pub-note.png
deleted file mode 100755 (executable)
index e048326..0000000
Binary files a/themes/triple-pane/images/art-pub-note.png and /dev/null differ

diff --git a/themes/triple-pane/images/art-zoom.png b/themes/triple-pane/images/art-zoom.png
deleted file mode 100755 (executable)
index 6311b31..0000000
Binary files a/themes/triple-pane/images/art-zoom.png and /dev/null differ

diff --git a/themes/triple-pane/images/fresh.png b/themes/triple-pane/images/fresh.png
deleted file mode 100755 (executable)
index b6040aa..0000000
Binary files a/themes/triple-pane/images/fresh.png and /dev/null differ

diff --git a/themes/triple-pane/images/fresh_sign.png b/themes/triple-pane/images/fresh_sign.png
deleted file mode 100755 (executable)
index 6ec38ee..0000000
Binary files a/themes/triple-pane/images/fresh_sign.png and /dev/null differ

diff --git a/themes/triple-pane/images/grad_1.png b/themes/triple-pane/images/grad_1.png
deleted file mode 100644 (file)
index 1a25a78..0000000
Binary files a/themes/triple-pane/images/grad_1.png and /dev/null differ

diff --git a/themes/triple-pane/images/label.png b/themes/triple-pane/images/label.png
deleted file mode 100644 (file)
index e27d0c5..0000000
Binary files a/themes/triple-pane/images/label.png and /dev/null differ

diff --git a/themes/triple-pane/images/mark_set.png b/themes/triple-pane/images/mark_set.png
deleted file mode 100644 (file)
index b35655c..0000000
Binary files a/themes/triple-pane/images/mark_set.png and /dev/null differ

diff --git a/themes/triple-pane/images/mark_unset.png b/themes/triple-pane/images/mark_unset.png
deleted file mode 100644 (file)
index bf9059a..0000000
Binary files a/themes/triple-pane/images/mark_unset.png and /dev/null differ

diff --git a/themes/triple-pane/images/pub_set.png b/themes/triple-pane/images/pub_set.png
deleted file mode 100644 (file)
index 1aff094..0000000
Binary files a/themes/triple-pane/images/pub_set.png and /dev/null differ

diff --git a/themes/triple-pane/images/pub_unset.png b/themes/triple-pane/images/pub_unset.png
deleted file mode 100644 (file)
index 14609df..0000000
Binary files a/themes/triple-pane/images/pub_unset.png and /dev/null differ

diff --git a/themes/triple-pane/images/resize_handle_horiz.png b/themes/triple-pane/images/resize_handle_horiz.png
deleted file mode 100644 (file)
index a2e347e..0000000
Binary files a/themes/triple-pane/images/resize_handle_horiz.png and /dev/null differ

diff --git a/themes/triple-pane/images/resize_horiz.png b/themes/triple-pane/images/resize_horiz.png
deleted file mode 100644 (file)
index cbf1909..0000000
Binary files a/themes/triple-pane/images/resize_horiz.png and /dev/null differ

diff --git a/themes/triple-pane/images/tag.png b/themes/triple-pane/images/tag.png
deleted file mode 100644 (file)
index 5415949..0000000
Binary files a/themes/triple-pane/images/tag.png and /dev/null differ

diff --git a/themes/triple-pane/images/ttrss_logo.png b/themes/triple-pane/images/ttrss_logo.png
deleted file mode 100644 (file)
index 2cedc35..0000000
Binary files a/themes/triple-pane/images/ttrss_logo.png and /dev/null differ

diff --git a/themes/triple-pane/images/ttrss_logo.svg b/themes/triple-pane/images/ttrss_logo.svg
deleted file mode 100644 (file)
index f2dabbc..0000000
--- 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 9fa3da1d8cdd7145defc66b6c9e545c2a6227ad0..9d4305fe12ebf42fcdfa0eac6cdf647cd60af68e 100644 (file)
--- 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>