From d3fb010a8fd2862ed6619b9cbdefb22aa9bace9c Mon Sep 17 00:00:00 2001
From: "Michael D. Reiley" <mreiley@omegasdg.com>
Date: Tue, 20 Sep 2011 12:49:07 -0700
Subject: [PATCH 1/4] New "Categories" theme, modifications for support.

---
 inc/config.php                        |  11 ++
 inc/functions.php                     |  10 ++
 templates/themes/categories/info.php  |  30 ++++++
 templates/themes/categories/theme.php | 144 ++++++++++++++++++++++++++
 templates/themes/categories/thumb.png | Bin 0 -> 8442 bytes
 5 files changed, 195 insertions(+)
 create mode 100644 templates/themes/categories/info.php
 create mode 100644 templates/themes/categories/theme.php
 create mode 100644 templates/themes/categories/thumb.png

diff --git a/inc/config.php b/inc/config.php
index 0a8b982d..1b36f210 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -710,6 +710,17 @@
 	// 'status' => 'http://status.example.org/'
 	//);
 	
+	// Categories
+	// Required for the Categories theme. Array of the names of board groups in order, from $config['boards'].
+	//$config['categories'] = Array('groupname', 'name', 'anothername', 'kangaroos');
+	
+	// Custom_categories
+	// Optional for the Categories theme. Array of name => (title, url) groups for categories with non-board links.
+	//$config['custom_categories'] = Array( 'Links' =>
+	//	Array('Tinyboard' => 'http://tinyboard.org',
+	//	'AnotherName' => 'url')
+	//);
+	
 	// Set custom locations for stylesheets, scripts and maybe a banner.
 	// This can be good for load balancing across multiple servers or hostnames.
 	// $config['url_stylesheet'] = 'http://static.example.org/style.css'; // main/base stylesheet
diff --git a/inc/functions.php b/inc/functions.php
index a5c8a518..7ba2278b 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -228,6 +228,16 @@
 		} else return false;
 	}
 	
+	function boardTitle($uri) {
+		$query = prepare("SELECT `title` FROM `boards` WHERE `uri` = :uri LIMIT 1");
+		$query->bindValue(':uri', $uri);
+		$query->execute() or error(db_error($query));
+		
+		if($title = $query->fetch()) {
+			return $title['title'];
+		} else return false;
+	}
+	
 	function purge($uri) {
 		global $config, $debug;
 		if(preg_match($config['url_match'], $config['root'])) {
diff --git a/templates/themes/categories/info.php b/templates/themes/categories/info.php
new file mode 100644
index 00000000..d0cedb13
--- /dev/null
+++ b/templates/themes/categories/info.php
@@ -0,0 +1,30 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'Categories';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 
+'Group-ordered, category-aware modification of the Frameset theme.
+
+Requires $config[\'boards\'] and $config[\'categories\'].';
+	$theme['version'] = 'v0.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Title',
+		'name' => 'title',
+		'type' => 'text'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Slogan',
+		'name' => 'subtitle',
+		'type' => 'text'
+	);
+	
+	// Unique function name for building everything
+	$theme['build_function'] = 'categories_build';
+?>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
new file mode 100644
index 00000000..c126f8da
--- /dev/null
+++ b/templates/themes/categories/theme.php
@@ -0,0 +1,144 @@
+<?php
+	require 'info.php';
+	
+	function categories_build($action, $settings) {
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- news (news has been updated)
+		//	- boards (board list changed)
+		
+		Categories::build($action, $settings);
+	}
+
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class Categories {
+		public static function build($action, $settings) {
+			global $config;
+			
+			if($action == 'all')
+				file_write($config['dir']['home'] . $config['file_index'], Categories::homepage($settings));
+			
+			if($action == 'all' || $action == 'boards')
+				file_write($config['dir']['home'] . 'sidebar.html', Categories::sidebar($settings));
+			
+			if($action == 'all' || $action == 'news')
+				file_write($config['dir']['home'] . 'news.html', Categories::news($settings));
+		}
+		
+		// Build homepage
+		public static function homepage($settings) {
+			global $config;
+			
+			// HTML5
+			return '<!DOCTYPE html><html>'
+			. '<head>'
+				. '<link rel="stylesheet" media="screen" href="' . $config['url_stylesheet'] . '"/>'
+				. '<style type="text/css">'
+					. 'iframe{border:none;margin:0;padding:0;height:99%;position:absolute}'
+					. 'iframe#sidebar{left:0;top:0;width:15%}'
+					. 'iframe#main{border-left:1px solid black;left:15%;top:0;width:85%}'
+				. '</style>'
+				. '<title>' . $settings['title'] . '</title>'
+			. '</head><body>'
+			// Sidebar
+			. '<iframe src="sidebar.html" id="sidebar" name="sidebar"></iframe>'
+			// Main
+			. '<iframe src="news.html" id="main" name="main"></iframe>'
+			// Finish page
+			. '</body></html>';
+		}
+		
+		// Build news page
+		public static function news($settings) {
+			global $config;
+			
+			// HTML5
+			$body = '<!DOCTYPE html><html>'
+			. '<head>'
+				. '<link rel="stylesheet" media="screen" href="' . $config['url_stylesheet'] . '"/>'
+				. '<title>News</title>'
+			. '</head><body>';
+			
+			$body .= '<h1>' . $settings['title'] . '</h1>'
+				. '<div class="title">' . ($settings['subtitle'] ? utf8tohtml($settings['subtitle']) : '') . '</div>';
+			
+			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
+			if($query->rowCount() == 0) {
+				$body .= '<p style="text-align:center" class="unimportant">(No news to show.)</p>';
+			} else {
+				// List news
+				while($news = $query->fetch()) {
+					$body .= '<div class="ban">' .
+					'<h2 id="' . $news['id'] . '">' .
+						($news['subject'] ?
+							$news['subject']
+						:
+							'<em>no subject</em>'
+						) .
+					'<span class="unimportant"> — by ' .
+						$news['name'] .
+					' at ' .
+						date($config['post_date'], $news['time']) .
+					'</span></h2><p>' . $news['body'] . '</p></div>';
+				}
+			}
+			
+			// Finish page
+			$body .= '</body></html>';
+			
+			return $body;
+		}
+		
+		// Build sidebar
+		public static function sidebar($settings) {
+			global $config, $board;
+			
+			$body = '<!DOCTYPE html><html>'
+			. '<head>' 
+				. '<link rel="stylesheet" media="screen" href="' . $config['url_stylesheet'] . '"/>'
+				. '<style type="text/css">'
+					. 'fieldset{margin:10px 0}'
+					. 'legend{width:100%;margin-left:-15px;background:#98E;border:1px solid white;color:white;font-weight:bold;padding:5px 5px}'
+					. 'ul{margin:0;padding:0}'
+					. 'li{list-style:none;padding:0 4px;margin: 0 4px}'
+					. 'li a.system{font-weight:bold}'
+				. '</style>'
+				. '<base target="main" />'
+				. '<title>' . $settings['title'] . '</title>'
+			. '</head><body>';
+			
+			$body .= '<fieldset><legend>' . $settings['title'] . '</legend><ul>' .
+				'<li><a class="system" href="news.html">[News]</a></li>' .
+			'</ul></fieldset>';
+			
+			for($cat = 0; $cat < count($config['categories']); $cat++) {
+				$body .= '<fieldset><legend>' . $config['categories'][$cat] . '</legend><ul>';
+				
+				foreach($config['boards'][$cat] as &$board) {
+					$body .= '<li><a href="' .
+						sprintf($config['board_path'], $board) .
+					'">' . boardTitle($board) . '</a></li>';
+				}
+				
+				$body .= '</ul></fieldset>';
+			}
+			
+			foreach($config['custom_categories'] as $name => &$group) {
+				$body .= '<fieldset><legend>' . $name . '</legend><ul>';
+				
+				foreach($group as $title => &$url) {
+					$body .= '<li><a href="' . $url .
+					'">' . $title . '</a></li>';
+				}
+				
+				$body .= '</ul></fieldset>';
+			}
+			
+			// Finish page
+			$body .= '</body></html>';
+			
+			return $body;
+		}
+	};
+	
+?>
diff --git a/templates/themes/categories/thumb.png b/templates/themes/categories/thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..4326ee35b6487df7a7b4da57bfc1c01b6620eec8
GIT binary patch
literal 8442
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

literal 0
HcmV?d00001


From 33a6d69c06fc7015febfbb04140ef12630910d35 Mon Sep 17 00:00:00 2001
From: "Michael D. Reiley" <mreiley@omegasdg.com>
Date: Thu, 22 Sep 2011 00:10:06 -0700
Subject: [PATCH 2/4] Small fix for unicode oops in two themes.

---
 templates/themes/categories/theme.php | 2 +-
 templates/themes/frameset/theme.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index c126f8da..f625fe79 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -75,7 +75,7 @@
 						:
 							'<em>no subject</em>'
 						) .
-					'<span class="unimportant"> — by ' .
+					'<span class="unimportant"> &mdash; by ' .
 						$news['name'] .
 					' at ' .
 						date($config['post_date'], $news['time']) .
diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php
index 3724e02e..d626103a 100644
--- a/templates/themes/frameset/theme.php
+++ b/templates/themes/frameset/theme.php
@@ -75,7 +75,7 @@
 						:
 							'<em>no subject</em>'
 						) .
-					'<span class="unimportant"> — by ' .
+					'<span class="unimportant"> &mdash; by ' .
 						$news['name'] .
 					' at ' .
 						date($config['post_date'], $news['time']) .

From c210cdbfea79834873a78f114f5c33e161cfe140 Mon Sep 17 00:00:00 2001
From: "Michael D. Reiley" <mreiley@omegasdg.com>
Date: Thu, 22 Sep 2011 14:47:19 -0700
Subject: [PATCH 3/4] Categories theme v0.2

---
 templates/themes/categories/info.php  |   4 ++--
 templates/themes/categories/theme.php |  12 +++++++++++-
 templates/themes/categories/thumb.png | Bin 8442 -> 9965 bytes
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/themes/categories/info.php b/templates/themes/categories/info.php
index d0cedb13..3718344c 100644
--- a/templates/themes/categories/info.php
+++ b/templates/themes/categories/info.php
@@ -5,10 +5,10 @@
 	$theme['name'] = 'Categories';
 	// Description (you can use Tinyboard markup here)
 	$theme['description'] = 
-'Group-ordered, category-aware modification of the Frameset theme.
+'Group-ordered, category-aware modification of the Frameset theme, with removable sidebar frame.
 
 Requires $config[\'boards\'] and $config[\'categories\'].';
-	$theme['version'] = 'v0.1';
+	$theme['version'] = 'v0.2';
 	
 	// Theme configuration	
 	$theme['config'] = Array();
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index f625fe79..393ad5bd 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -59,7 +59,11 @@
 				. '<title>News</title>'
 			. '</head><body>';
 			
-			$body .= '<h1>' . $settings['title'] . '</h1>'
+			$boardlist = createBoardlist();
+			
+			$body .= $boardlist['top']
+				
+			. '<h1>' . $settings['title'] . '</h1>'
 				. '<div class="title">' . ($settings['subtitle'] ? utf8tohtml($settings['subtitle']) : '') . '</div>';
 			
 			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
@@ -105,10 +109,16 @@
 				. '</style>'
 				. '<base target="main" />'
 				. '<title>' . $settings['title'] . '</title>'
+				. '<script type="text/javascript">'
+					. 'function removeFrames() {'
+					. 'parent.window.location = "' . $config['root'] . 'news.html"'
+					. '}'
+				. '</script>'
 			. '</head><body>';
 			
 			$body .= '<fieldset><legend>' . $settings['title'] . '</legend><ul>' .
 				'<li><a class="system" href="news.html">[News]</a></li>' .
+				'<li><a class="system" href="javascript:removeFrames()">[Remove Frames]</a></li>' .
 			'</ul></fieldset>';
 			
 			for($cat = 0; $cat < count($config['categories']); $cat++) {
diff --git a/templates/themes/categories/thumb.png b/templates/themes/categories/thumb.png
index 4326ee35b6487df7a7b4da57bfc1c01b6620eec8..35d747e2a138d7e0bf999ef0de942c94586be2b2 100644
GIT binary patch
delta 9908
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

delta 8373
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


From a59b915b0a94fe621503deeeca5eef17c5fababc Mon Sep 17 00:00:00 2001
From: "Michael D. Reiley" <mreiley@omegasdg.com>
Date: Thu, 22 Sep 2011 15:07:25 -0700
Subject: [PATCH 4/4] Categories theme v0.2.1 (Frame removal works correctly.)

---
 templates/themes/categories/info.php  |  2 +-
 templates/themes/categories/theme.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/themes/categories/info.php b/templates/themes/categories/info.php
index 3718344c..0090f39d 100644
--- a/templates/themes/categories/info.php
+++ b/templates/themes/categories/info.php
@@ -8,7 +8,7 @@
 'Group-ordered, category-aware modification of the Frameset theme, with removable sidebar frame.
 
 Requires $config[\'boards\'] and $config[\'categories\'].';
-	$theme['version'] = 'v0.2';
+	$theme['version'] = 'v0.2.1';
 	
 	// Theme configuration	
 	$theme['config'] = Array();
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 393ad5bd..de1b4a5b 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -39,6 +39,11 @@
 					. 'iframe#main{border-left:1px solid black;left:15%;top:0;width:85%}'
 				. '</style>'
 				. '<title>' . $settings['title'] . '</title>'
+				. '<script type="text/javascript">'
+					. 'function removeFrames() {'
+					. 'window.location = document.getElementById("main").contentWindow.location.href'
+					. '}'
+				. '</script>'
 			. '</head><body>'
 			// Sidebar
 			. '<iframe src="sidebar.html" id="sidebar" name="sidebar"></iframe>'
@@ -109,16 +114,11 @@
 				. '</style>'
 				. '<base target="main" />'
 				. '<title>' . $settings['title'] . '</title>'
-				. '<script type="text/javascript">'
-					. 'function removeFrames() {'
-					. 'parent.window.location = "' . $config['root'] . 'news.html"'
-					. '}'
-				. '</script>'
 			. '</head><body>';
 			
 			$body .= '<fieldset><legend>' . $settings['title'] . '</legend><ul>' .
 				'<li><a class="system" href="news.html">[News]</a></li>' .
-				'<li><a class="system" href="javascript:removeFrames()">[Remove Frames]</a></li>' .
+				'<li><a class="system" href="javascript:parent.removeFrames()">[Remove Frames]</a></li>' .
 			'</ul></fieldset>';
 			
 			for($cat = 0; $cat < count($config['categories']); $cat++) {