catalog theme: integrate with the styling framework of tinyboard; allow for js

4 files changed, 9 insertions, 57 deletions

diff --git a/templates/themes/catalog/catalog.css b/templates/themes/catalog/catalog.css
deleted file mode 100644
index c24b9d62..00000000
--- a/templates/themes/catalog/catalog.css
+++ /dev/null
@@ -1,42 +0,0 @@
-img {
-	float:none!important;
-	margin: auto;
-	margin-bottom: 12px;
-	max-height: 150px;
-	max-width: 200px;
-	box-shadow: 0 0 4px rgba(0, 0, 0, 0.55);
-	border: 2px solid rgba(153, 153, 153, 0);
-}
-
-/*
-img:hover {
-	border: 2px solid rgba(153, 153, 153, 0.27);
-}
-*/
-
-div.thread {
-	display: inline-block;
-	vertical-align: top;
-	margin-bottom:25px;
-	margin-left: 20px;
-	margin-right: 15px;
-	text-align:center;
-	font-weight:normal;
-	width:205px;      
-	overflow:hidden;
-	position: relative;
-	font-size:11px;
-	padding: 15px;
-	background: rgba(182, 182, 182, 0.12);
-	border: 2px solid rgba(111, 111, 111, 0.34);
-	max-height:300px;
-}
-
-div.thread:hover {
-    background: #D6DAF0;
-    border-color: #B7C5D9;
-}
-
-strong {
-    display: block;
-}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 7b8c075a..d6b76eff 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -3,18 +3,19 @@
 <html>
 <head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+	<script type='text/javascript'>
+		active_page = "catalog";
+	</script>
+	{% include 'header.html' %}
 	<title>{{ settings.title }}</title>
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
-	<link rel="stylesheet" media="screen" href="{{ config.root }}{{ settings.css }}"/>
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
 </head>
-<body>
+<body class="theme-catalog">
 	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }} (<a href="{{link}}">/{{ board }}/</a>)</h1>
 		<div class="subtitle">{{ settings.subtitle }}</div>
 	</header>
-	
+	<hr/>
 	<ul>
 	{% for post in recent_posts %}
 		<div class="thread">
@@ -31,6 +32,9 @@
 	
 	<hr/>
 	<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+        <script type="text/javascript">
+                ready();
+        </script>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/catalog/info.php b/templates/themes/catalog/info.php
index c68c9e09..32695b4d 100644
--- a/templates/themes/catalog/info.php
+++ b/templates/themes/catalog/info.php
@@ -31,14 +31,6 @@
 	);
 	
 	$theme['config'][] = Array(
-		'title' => 'CSS file',
-		'name' => 'css',
-		'type' => 'text',
-		'default' => 'catalog.css',
-		'comment' => '(eg. "catalog.css")'
-	);
-	
-	$theme['config'][] = Array(
 		'title' => 'Update on new posts',
 		'name' => 'update_on_posts',
 		'type' => 'checkbox',
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 424a813b..d3a837ca 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -14,8 +14,6 @@
 		$boards = explode(' ', $settings['boards']);
 				
 		if ($action == 'all') {
-			copy('templates/themes/catalog/catalog.css', $config['dir']['home'] . $settings['css']);
-			
 			foreach ($boards as $board) {
 				$b = new Catalog();
 				$b->build($settings, $board);