enable triple-pane theme; fix theme system not working

7 files changed, 56 insertions, 16 deletions

diff --git a/functions.php b/functions.php
index 6d72c6873..a6977b2a2 100644
--- a/functions.php
+++ b/functions.php
@@ -2044,9 +2044,9 @@
 		}
 
 		if ($theme_path) {
-			if (is_file("$t/theme.ini")) {
-				$ini = parse_ini_file("$t/theme.ini", true);
-				if ($ini['theme']['version'] > THEME_VERSION_REQUIRED) {
+			if (is_file("$theme_path/theme.ini")) {
+				$ini = parse_ini_file("$theme_path/theme.ini", true);
+				if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
 					return $theme_path;
 				}
 			}
@@ -2068,6 +2068,20 @@
 		return '';
 	}
 
+	function print_theme_includes($link) {
+
+		$t = get_user_theme_path($link);
+		$time = time();
+
+		if ($t) {
+			print "<link rel=\"stylesheet\" type=\"text/css\" 
+				href=\"$t/theme.css?$time \">";
+			if (file_exists("$t/theme.js")) {
+				print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
+					</script>";
+			}
+		}
+	}
 
 	function get_all_themes() {
 		$themes = glob("themes/*");
@@ -2079,7 +2093,7 @@
 		foreach ($themes as $t) {
 			if (is_file("$t/theme.ini")) {
 				$ini = parse_ini_file("$t/theme.ini", true);
-				if ($ini['theme']['version'] > THEME_VERSION_REQUIRED && 
+				if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED && 
 							!$ini['theme']['disabled']) {
 					$entry = array();
 					$entry["path"] = $t;
diff --git a/prefs.php b/prefs.php
index 5bedfb8a3..eda3cd0f9 100644
--- a/prefs.php
+++ b/prefs.php
@@ -27,10 +27,7 @@
 	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
 
-	<?php	$user_theme = get_user_theme_path($link);
-		if ($user_theme) { ?>
-		<link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css"/>
-	<?php } ?>
+	<?php print_theme_includes($link) ?>
 	
 	<?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
 	<?php if ($user_css_url) { ?>
diff --git a/themes/triple-pane/theme.css b/themes/triple-pane/theme.css
index 4a188a57f..593ff955a 100644
--- a/themes/triple-pane/theme.css
+++ b/themes/triple-pane/theme.css
@@ -1,4 +1,13 @@
-div.headlines_normal {
+#content-insert {
+	border-left-width : 1px;
+	border-bottom-width : 0px;
+}
+
+#headlines-frame {
+	border-right-width : 1px;
+}
+
+/* div.headlines_normal {
 	position : absolute;
 	border-width : 1px 1px 0px 0px;
 	right : 400px;
@@ -66,7 +75,7 @@ span.headlineInnerTitle {
 	bottom : 0px;
 	top : 0px; 
 
-}
+} */
 
 
 /*#footer, #prefFooter {
diff --git a/themes/triple-pane/theme.ini b/themes/triple-pane/theme.ini
index 5e9feb9c3..5aae72442 100644
--- a/themes/triple-pane/theme.ini
+++ b/themes/triple-pane/theme.ini
@@ -1,5 +1,5 @@
 [theme]
 name=Triple-Pane
 author=seeker
-version=1.0
-options=horiz_resize,hide_footer
+version=1.1
+options=
diff --git a/themes/triple-pane/theme.js b/themes/triple-pane/theme.js
new file mode 100644
index 000000000..088055306
--- /dev/null
+++ b/themes/triple-pane/theme.js
@@ -0,0 +1,14 @@
+function themeBeforeLayout() {
+	$("headlines-wrap-inner").setAttribute("design", 'sidebar');
+	$("content-insert").setAttribute("region", "trailing");
+	$("content-insert").setStyle({
+		width: '50%',
+		height: 'auto'});
+}
+
+function themeAfterLayout() {
+	$("headlines-toolbar").setStyle({
+		'border-right-width': '1px',
+		'border-color': '#88b0f0',
+		});
+}
diff --git a/tt-rss.js b/tt-rss.js
index 8121e94bc..f408197d2 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -282,9 +282,18 @@ function init() {
 		dojo.require("dijit.form.Select");
 		dojo.require("dojo.parser");
 
+		if (typeof themeBeforeLayout == 'function') {
+			themeBeforeLayout();
+		}
+
 		dojo.addOnLoad(function() {
 			updateFeedList();
 			closeArticlePanel();
+
+			if (typeof themeAfterLayout == 'function') {
+				themeAfterLayout();
+			}
+
 		});
 
 		if (!genericSanityCheck()) 
diff --git a/tt-rss.php b/tt-rss.php
index 5791bd76c..b1f43506f 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -30,10 +30,7 @@
 
 	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
 
-	<?php	$user_theme = get_user_theme_path($link);
-		if ($user_theme) { ?>
-			<link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
-	<?php } ?>
+	<?php print_theme_includes($link) ?>
 
 	<?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
 	<?php if ($user_css_url) { ?>