Merge pull request #79 from lainchan/clean_prod_vichan_update

Merge vichan changes from upstream and changes directly applied to the site.

3 files changed, 18 insertions, 9 deletions

diff --git a/templates/themes/recent/recent.css b/templates/themes/recent/recent.css
index 1ec5dc50..2559bcc3 100644
--- a/templates/themes/recent/recent.css
+++ b/templates/themes/recent/recent.css
@@ -44,14 +44,14 @@ body
 	color: #7fdd57;
 	border: 0px solid #060;
 	float: left;
-	width: 300px;
+	width: 50%;
 }
 .box.right {
 	background: #0b000f;
 	color: #7fdd57;
 	border: 0px solid #006;
 	float: right;
-	width: 436px;
+	width: 50%;
 }
 
 .box h2 {
@@ -170,3 +170,7 @@ div.ban h2:not(:nth-child(1))
 {
 	border-top: 0px solid #0b000f;
 }
+
+div.footer{
+clear:both;
+}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index 763f8bec..45b627d8 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -9,6 +9,7 @@
 	<link rel="stylesheet" media="screen" href="https://lainchan.org/stylesheets/font-awesome/css/font-awesome.min.css"/>
 
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
+	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
 </head>
 <body>
 	<div class="bar top">
@@ -22,12 +23,14 @@
 	</header>
 <br>
 
+		<center>
     <img alt="mascot" class="lain_banner"src="static/lain_banner1.png"/>
+		</center>
 
  <br>
 
-     <div class="ban" id="global">      <h2>CYBERPUNK IS DEAD</h2>  Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting!    </div> 
-
+     <div class="ban" id="global2">      <h2>CYBERPUNK IS DUCK</h2>  Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting!    </div> 
+	<center>    <img alt="mascot" class="lain_banner" src="static/duck.png"></center>
     <br>
 
 	<div class="ban" id="global">
@@ -65,13 +68,14 @@
 			</ul>
 		</div>
 	</div>
-
+	<div class="footer">
 	<footer>
         <center>
         	<a href="mailto:admin@lainchan.org?Subject=Hello" target="_top">admin@lainchan.org</a>
         </center>
 
 	</footer>
+	</div>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index f44e2529..d4d4e9b8 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -19,16 +19,17 @@
 			global $config, $_theme;
 			
 			if ($action == 'all') {
-				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . "stylesheets/" . $settings['css']);
 			}
 			
 			$this->excluded = explode(' ', $settings['exclude']);
 			
 			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete') {
-				if ($config['smart_build']) {
+				$action = generation_strategy('sb_recent', array());
+				if ($action == 'delete') {
 					file_unlink($config['dir']['home'] . $settings['html']);
 				}
-				else {
+				elseif ($action == 'rebuild') {
 					file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
 				}
 			}
@@ -64,7 +65,7 @@
 				if (isset($post['files']))
 					$files = json_decode($post['files']);
 
-                if ($files[0]->file == 'deleted') continue;
+                if ($files[0]->file == 'deleted' || $files[0]->thumb == 'file') continue;
 				
 				// board settings won't be available in the template file, so generate links now
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res']