Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

20 files changed, 19 insertions, 3 deletions

diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php
index b4f44ca..8e5d92c 100644
--- a/www/ajaxGetTitle.php
+++ b/www/ajaxGetTitle.php
@@ -38,9 +38,12 @@ function getTitle($url) {
 		preg_match_all('/<title>(.*)<\/title>/si', $html, $matches);
 		$title = $matches[1][0];
 
+		$encoding = 'utf-8';
 		// Get encoding from charset attribute
 		preg_match_all('/<meta.*charset=([^;"]*)">/i', $html, $matches);
-		$encoding = strtoupper($matches[1][0]);
+		if (isset($matches[1][0])) {
+			$encoding = strtoupper($matches[1][0]);
+		}
 
 		// Convert to UTF-8 from the original encoding
 		if (function_exists("mb_convert_encoding")) {
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index 3ca41ec..de97fd2 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -3,6 +3,7 @@ $GLOBALS['saveInLastUrl'] = false;
 $httpContentType = 'text/javascript';
 require_once 'www-header.php';
 require_once 'SemanticScuttle/functions.php';
+$theme = new SemanticScuttle_Model_Theme($GLOBALS['theme']);
 $player_root = ROOT .'includes/player/';
 ?>
 
@@ -62,7 +63,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 $theme->resource('images/loading.gif'); ?>)';
         if (response != '') {
             usernameField.style.backgroundImage = 'none';
             if (response == 'true') {
@@ -110,7 +111,7 @@ function getNewPrivateKey(input, response){
 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 $theme->resource('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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
diff --git a/www/themes/testdummy/images/logo.png b/www/themes/testdummy/images/logo.png
new file mode 100644
index 0000000..4a8f8ba
--- /dev/null
+++ b/www/themes/testdummy/images/logo.png
diff --git a/www/themes/testdummy/scuttle.css b/www/themes/testdummy/scuttle.css
new file mode 100644
index 0000000..c62cd19
--- /dev/null
+++ b/www/themes/testdummy/scuttle.css
@@ -0,0 +1,12 @@
+@import url(../default/scuttle.css);
+
+body {
+    background-color: #FEA;
+}
+
+html > body h1 {
+    background: url('images/logo.png') no-repeat 10px;
+}
+div#header {
+    background: #FEA;
+}