aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/default/bookmarks.tpl.php10
-rw-r--r--data/templates/default/top.inc.php4
-rw-r--r--www/jsScuttle.php4
-rw-r--r--www/themes/default/icon.png (renamed from www/icon.png)bin771 -> 771 bytes
-rw-r--r--www/themes/default/images/b_edit.png (renamed from www/images/b_edit.png)bin451 -> 451 bytes
-rw-r--r--www/themes/default/images/bg_admin.png (renamed from www/images/bg_admin.png)bin1212 -> 1212 bytes
-rw-r--r--www/themes/default/images/bg_bar.png (renamed from www/images/bg_bar.png)bin873 -> 873 bytes
-rw-r--r--www/themes/default/images/bg_header.png (renamed from www/images/bg_header.png)bin684 -> 684 bytes
-rw-r--r--www/themes/default/images/bg_sidebar.png (renamed from www/images/bg_sidebar.png)bin726 -> 726 bytes
-rw-r--r--www/themes/default/images/loading.gif (renamed from www/images/loading.gif)bin1582 -> 1582 bytes
-rw-r--r--www/themes/default/images/logo.png (renamed from www/images/logo.png)bin2973 -> 2973 bytes
-rw-r--r--www/themes/default/images/logo_24.gif (renamed from www/images/logo_24.gif)bin1530 -> 1530 bytes
-rw-r--r--www/themes/default/images/rss.gif (renamed from www/images/rss.gif)bin401 -> 401 bytes
-rw-r--r--www/themes/default/images/thumbs_up.orig.png (renamed from www/images/thumbs_up.orig.png)bin19257 -> 19257 bytes
-rw-r--r--www/themes/default/images/vote-against-voted.png (renamed from www/images/vote-against-voted.png)bin419 -> 419 bytes
-rw-r--r--www/themes/default/images/vote-against.png (renamed from www/images/vote-against.png)bin495 -> 495 bytes
-rw-r--r--www/themes/default/images/vote-for-voted.png (renamed from www/images/vote-for-voted.png)bin415 -> 415 bytes
-rw-r--r--www/themes/default/images/vote-for.png (renamed from www/images/vote-for.png)bin625 -> 625 bytes
-rw-r--r--www/themes/default/scuttle.css (renamed from www/scuttle.css)0
19 files changed, 9 insertions, 9 deletions
diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php
index 55d6a0f..93bcf53 100644
--- a/data/templates/default/bookmarks.tpl.php
+++ b/data/templates/default/bookmarks.tpl.php
@@ -39,7 +39,7 @@ include('search.menu.php');
<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?>
<div style="width:70%;text-align:center;">
-<img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/>
+<img src="<?php echo ROOT . 'themes/' . $GLOBALS['theme']; ?>/images/logo_24.gif" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT . 'themes/' . $GLOBALS['theme']; ?>/images/logo_24.gif" width="12px"/>
</div>
<?php endif?>
@@ -70,7 +70,7 @@ if ($userservice->isLoggedOn()) {
) {
echo ' <a href="'. createURL('tagcommondescriptionedit', $currenttag).'" title="'.T_('Edit the common description of this tag').'">';
echo !is_array($cDescription) || strlen($cDescription['cdDescription'])==0?T_('Edit the common description of this tag'):'';
- echo ' <img src="'.ROOT.'images/b_edit.png" /></a>';
+ echo ' <img src="'.ROOT . 'themes/' . $GLOBALS['theme'] . '/images/b_edit.png" /></a>';
} else if (isset($hash)) {
echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $hash).'" title="'.T_('Edit the common description of this bookmark').'">';
echo T_('Edit the common description of this bookmark').'</a>)';
@@ -95,7 +95,7 @@ if($userservice->isLoggedOn()) {
if($currenttag!= '') {
echo ' <a href="'. createURL('tagedit', $currenttag).'" title="'.T_('Edit your personal description of this tag').'" >';
echo strlen($pDescription['tDescription'])==0?T_('Edit your personal description of this tag'):'';
- echo ' <img src="'.ROOT.'images/b_edit.png" /></a>';
+ echo ' <img src="' . ROOT . 'themes/' . $GLOBALS['theme'] . '/images/b_edit.png" /></a>';
}
}
?></p>
@@ -221,7 +221,7 @@ if ($currenttag!= '') {
for ($i = 0; $i < $size; $i++) {
$brss = '<a style="background:#FFFFFF" href="'. htmlspecialchars($rsschannels[$i][1]) . '"'
. ' title="' . htmlspecialchars($rsschannels[$i][0]) . '">'
- . '<img src="' . ROOT . 'images/rss.gif" width="16" height="16" alt="' . htmlspecialchars($rsschannels[$i][0]) .'"/>'
+ . '<img src="' . ROOT . 'themes/' . $GLOBALS['theme'] . '/images/rss.gif" width="16" height="16" alt="' . htmlspecialchars($rsschannels[$i][0]) .'"/>'
. '</a>';
}
@@ -363,7 +363,7 @@ if ($currenttag!= '') {
// Admin specific design
if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) {
$adminBgClass = ' class="adminBackground"';
- $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
+ $adminStar = ' <img src="' . ROOT . 'themes/' . $GLOBALS['theme'] . '/images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
} else {
$adminBgClass = '';
$adminStar = '';
diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index bdd4b1a..6ad2df2 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -4,8 +4,8 @@
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
<title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title>
- <link rel="icon" type="image/png" href="<?php echo ROOT ?>icon.png" />
- <link rel="stylesheet" type="text/css" href="<?php echo ROOT ?>scuttle.css" />
+ <link rel="icon" type="image/png" href="<?php echo ROOT ?>themes/<?php echo $GLOBALS['theme']; ?>/icon.png" />
+ <link rel="stylesheet" type="text/css" href="<?php echo ROOT ?>themes/<?php echo $GLOBALS['theme']; ?>/scuttle.css" />
<link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>"/>
<?php
if (isset($rsschannels)) {
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index c166755..4f9d3b7 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -62,7 +62,7 @@ function isAvailable(input, response){
username = username.trim();
var availability = document.getElementById("availability");
if (username != '') {
- usernameField.style.backgroundImage = 'url(<?php echo ROOT; ?>images/loading.gif)';
+ usernameField.style.backgroundImage = 'url(<?php echo ROOT . 'themes/' . $GLOBALS['theme']; ?>/images/loading.gif)';
if (response != '') {
usernameField.style.backgroundImage = 'none';
if (response == 'true') {
@@ -92,7 +92,7 @@ function useAddress(ele) {
function getTitle(input, response){
var title = document.getElementById('titleField');
if (title.value == '') {
- title.style.backgroundImage = 'url(<?php echo ROOT; ?>images/loading.gif)';
+ title.style.backgroundImage = 'url(<?php echo ROOT . 'themes/' . $GLOBALS['theme']; ?>/images/loading.gif)';
if (response != null) {
title.style.backgroundImage = 'none';
title.value = response;
diff --git a/www/icon.png b/www/themes/default/icon.png
index be864a7..be864a7 100644
--- a/www/icon.png
+++ b/www/themes/default/icon.png
Binary files differ
diff --git a/www/images/b_edit.png b/www/themes/default/images/b_edit.png
index 05711a0..05711a0 100644
--- a/www/images/b_edit.png
+++ b/www/themes/default/images/b_edit.png
Binary files differ
diff --git a/www/images/bg_admin.png b/www/themes/default/images/bg_admin.png
index c707779..c707779 100644
--- a/www/images/bg_admin.png
+++ b/www/themes/default/images/bg_admin.png
Binary files differ
diff --git a/www/images/bg_bar.png b/www/themes/default/images/bg_bar.png
index 7152ba1..7152ba1 100644
--- a/www/images/bg_bar.png
+++ b/www/themes/default/images/bg_bar.png
Binary files differ
diff --git a/www/images/bg_header.png b/www/themes/default/images/bg_header.png
index 6fa4161..6fa4161 100644
--- a/www/images/bg_header.png
+++ b/www/themes/default/images/bg_header.png
Binary files differ
diff --git a/www/images/bg_sidebar.png b/www/themes/default/images/bg_sidebar.png
index 0edb153..0edb153 100644
--- a/www/images/bg_sidebar.png
+++ b/www/themes/default/images/bg_sidebar.png
Binary files differ
diff --git a/www/images/loading.gif b/www/themes/default/images/loading.gif
index 859126e..859126e 100644
--- a/www/images/loading.gif
+++ b/www/themes/default/images/loading.gif
Binary files differ
diff --git a/www/images/logo.png b/www/themes/default/images/logo.png
index 4afe565..4afe565 100644
--- a/www/images/logo.png
+++ b/www/themes/default/images/logo.png
Binary files differ
diff --git a/www/images/logo_24.gif b/www/themes/default/images/logo_24.gif
index d5af64d..d5af64d 100644
--- a/www/images/logo_24.gif
+++ b/www/themes/default/images/logo_24.gif
Binary files differ
diff --git a/www/images/rss.gif b/www/themes/default/images/rss.gif
index 094ba10..094ba10 100644
--- a/www/images/rss.gif
+++ b/www/themes/default/images/rss.gif
Binary files differ
diff --git a/www/images/thumbs_up.orig.png b/www/themes/default/images/thumbs_up.orig.png
index 1a89d0e..1a89d0e 100644
--- a/www/images/thumbs_up.orig.png
+++ b/www/themes/default/images/thumbs_up.orig.png
Binary files differ
diff --git a/www/images/vote-against-voted.png b/www/themes/default/images/vote-against-voted.png
index 740dfc8..740dfc8 100644
--- a/www/images/vote-against-voted.png
+++ b/www/themes/default/images/vote-against-voted.png
Binary files differ
diff --git a/www/images/vote-against.png b/www/themes/default/images/vote-against.png
index f15ea4d..f15ea4d 100644
--- a/www/images/vote-against.png
+++ b/www/themes/default/images/vote-against.png
Binary files differ
diff --git a/www/images/vote-for-voted.png b/www/themes/default/images/vote-for-voted.png
index 5abd43e..5abd43e 100644
--- a/www/images/vote-for-voted.png
+++ b/www/themes/default/images/vote-for-voted.png
Binary files differ
diff --git a/www/images/vote-for.png b/www/themes/default/images/vote-for.png
index 5973ae9..5973ae9 100644
--- a/www/images/vote-for.png
+++ b/www/themes/default/images/vote-for.png
Binary files differ
diff --git a/www/scuttle.css b/www/themes/default/scuttle.css
index 9e87857..9e87857 100644
--- a/www/scuttle.css
+++ b/www/themes/default/scuttle.css