3 files changed, 20 insertions, 17 deletions

diff --git a/templates/themes/ukko/info.php b/templates/themes/ukko/info.php
index 34d59d4e..45a687fc 100644
--- a/templates/themes/ukko/info.php
+++ b/templates/themes/ukko/info.php
@@ -1,40 +1,41 @@
 <?php
-	$theme = Array();
+	$theme = array();
 	
 	// Theme name
-	$theme['name'] = 'Ukko';
+	$theme['name'] = 'Overboard (Ukko)';
 	// Description (you can use Tinyboard markup here)
 	$theme['description'] = 'Board with threads and messages from all boards';
-	$theme['version'] = 'v0.1';
+	$theme['version'] = 'v0.2';
 	
 	// Theme configuration	
-	$theme['config'] = Array();
+	$theme['config'] = array();
 	
-	$theme['config'][] = Array(
+	$theme['config'][] = array(
 		'title' => 'Board name',
 		'name' => 'title',
 		'type' => 'text',
 		'default' => 'Ukko'
 	);
-	$theme['config'][] = Array(
+	$theme['config'][] = array(
 		'title' => 'Board URI',
 		'name' => 'uri',
 		'type' => 'text',
+		'default' => '*',
 		'comment' => '(ukko for example)'
 	);	
-	$theme['config'][] = Array(
+	$theme['config'][] = array(
 		'title' => 'Subtitle',
 		'name' => 'subtitle',
 		'type' => 'text',
 		'comment' => '(%s = thread limit. for example "%s freshly bumped threads")'
 	);		
-	$theme['config'][] = Array(
+	$theme['config'][] = array(
 		'title' => 'Excluded boards',
 		'name' => 'exclude',
 		'type' => 'text',
 		'comment' => '(space seperated)'
 	);
-	$theme['config'][] = Array(
+	$theme['config'][] = array(
 		'title' => 'Number of threads',
 		'name' => 'thread_limit',
 		'type' => 'text',
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 1ca00014..5d887227 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -4,7 +4,9 @@
 	function ukko_build($action, $settings) {
 		$ukko = new ukko();
 		$ukko->settings = $settings;
-		$ukko->build();
+		
+		file_write($settings['uri'] . '/index.html', $ukko->build());
+		file_write($settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));
 	}
 	
 	class ukko {
@@ -85,17 +87,17 @@
 			}
 
 			$body .= '<script> var overflow = ' . json_encode($overflow) . '</script>';
-			$body .= '<script type="text/javascript" src="ukko.js"></script>';
+			$body .= '<script type="text/javascript" src="/'.$this->settings['uri'].'/ukko.js"></script>';
 
-			file_write($this->settings['uri'] . '/index.html', Element('index.html', array(
+			return Element('index.html', array(
 				'config' => $config,
 				'board' => $board,
 				'no_post_form' => true,
 				'body' => $body,
-				'boardlist' => createBoardlist($mod)
-			)));
-
-			file_write($this->settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));			
+				'mod' => $mod,
+				'boardlist' => createBoardlist($mod),
+		                'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
+			));
 		}
 		
 	};
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 490f67f0..b2668e0b 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -58,7 +58,7 @@ $(document).ready(function() {
 			$('.pages').show().html(_("No more threads to display"));
 		}
 		while($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading && overflow.length > 0) {
-			var page = '../' + overflow[0].board + '/' + overflow[0].page;
+			var page = modRoot + overflow[0].board + '/' + overflow[0].page;
 			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
 			if (thread.length > 0 && thread.attr("data-cached") !== 'yes') { // already present
 				overflow.shift();