Merge branch 'master' of github.com:shish/shimmie2

contrib/admin/main.php

@@ -105,7 +105,7 @@ class AdminPage extends Extension {
 		$query = $_POST['query'];
 		assert(strlen($query) > 1);
 
-		log_warning("Mass deleting: $query");
+		log_warning("admin", "Mass deleting: $query");
 		foreach(Image::find_images(0, 1000000, Tag::explode($query)) as $image) {
 			send_event(new ImageDeletionEvent($image));
 		}

core/basethemelet.class.php

@@ -34,6 +34,7 @@ class BaseThemelet {
 		$h_view_link = make_link('post/view/'.$i_id, $query);
 		$h_thumb_link = $image->get_thumb_link();
 		$h_tip = html_escape($image->get_tooltip());
+		$base = get_base_href();
 		
 		// If file is flash or svg then sets thumbnail to max size.
 		if($image->ext === 'swf' || $image->ext === 'svg'){
@@ -44,7 +45,8 @@ class BaseThemelet {
 		}
 
 		return '<a href="'.$h_view_link.'" class="thumb">'.
-		       '<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'">'.
+		       '<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" class="lazy" data-original="'.$h_thumb_link.'" src="'.$base.'/lib/static/grey.gif">'.
+		       '<noscript><img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'"></noscript>'.
 			   "</a>\n";
 	}
 

core/page.class.php

@@ -306,6 +306,7 @@ class Page {
 		// store local copy for speed.
 		$autocache_css = $config->get_bool("autocache_css");
 		$autocache_js  = $config->get_bool("autocache_js");
+		$theme_name = $config->get_string('theme', 'default');
 		
 		if (!$autocache_css && !$autocache_js) {
 			return false;	// caching disabled
@@ -352,8 +353,21 @@ class Page {
 				$replace = 'url("../../${1}")';
 				$contents_from_extensions = preg_replace($pattern, $replace, $contents_from_extensions);
 			}
-			// Combine the two
-			$data = $contents_from_lib .' '. $contents_from_extensions;
+			// Get CSS from theme
+			$contents_from_theme = '';
+			$css_files = glob("themes/$theme_name/style.css");
+			if($css_files) {
+				foreach($css_files as $css_file) {
+					$contents_from_theme .= file_get_contents($css_file);
+				}
+				//      Can't directly cache the CSS files, as they might have relative locations to images, etc. in them.
+				//      We have to adjust the URLs accordingly before saving the cached file.
+				$pattern = '/url[\s]*\([\s]*["\']?([^"\'\)]+)["\']?[\s]*\)/';
+				$replace = 'url("../../${1}")';
+				$contents_from_theme = preg_replace($pattern, $replace, $contents_from_theme);
+			}
+			// Combine the three
+			$data = $contents_from_lib .' '. $contents_from_extensions .' '. $contents_from_theme;
 			
 			// Minify the CSS if enabled.
 			if($config->get_bool("autocache_min_css")) {
@@ -387,7 +401,13 @@ class Page {
 				foreach($css_files as $css_file) {
 					$this->add_html_header('<link rel="stylesheet" href="'.$data_href.'/'.$css_file.'" type="text/css">');
 				}
-			}	
+			}
+			$css_files = glob("themes/$theme_name/style.css");
+			if($css_files) {
+				foreach($css_files as $css_file) {
+					$this->add_html_header('<link rel="stylesheet" href="'.$data_href.'/'.$css_file.'" type="text/css">');
+				}
+			}
 		}
 		
 		

ext/comment/main.php

@@ -168,7 +168,7 @@ class CommentList extends Extension {
 			$recent = $database->cache->get("recent_comments");
 			if(empty($recent)) {
 				$recent = $this->get_recent_comments($cc);
-				$database->cache->set("recent_comments", $recent, 600);
+				$database->cache->set("recent_comments", $recent, 60);
 			}
 			if(count($recent) > 0) {
 				$this->theme->display_recent_comments($recent);

lib/jquery.lazyload.min.js

@@ -0,0 +1,15 @@
+/*
+ * Lazy Load - jQuery plugin for lazy loading images
+ *
+ * Copyright (c) 2007-2012 Mika Tuupola
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://www.appelsiini.net/projects/lazyload
+ *
+ * Version:  1.7.2
+ *
+ */
+(function(a,b){$window=a(b),a.fn.lazyload=function(c){function f(){var b=0;d.each(function(){var c=a(this);if(e.skip_invisible&&!c.is(":visible"))return;if(!a.abovethetop(this,e)&&!a.leftofbegin(this,e))if(!a.belowthefold(this,e)&&!a.rightoffold(this,e))c.trigger("appear");else if(++b>e.failure_limit)return!1})}var d=this,e={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null};return c&&(undefined!==c.failurelimit&&(c.failure_limit=c.failurelimit,delete c.failurelimit),undefined!==c.effectspeed&&(c.effect_speed=c.effectspeed,delete c.effectspeed),a.extend(e,c)),$container=e.container===undefined||e.container===b?$window:a(e.container),0===e.event.indexOf("scroll")&&$container.bind(e.event,function(a){return f()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,c.one("appear",function(){if(!this.loaded){if(e.appear){var f=d.length;e.appear.call(b,f,e)}a("<img />").bind("load",function(){c.hide().attr("src",c.data(e.data_attribute))[e.effect](e.effect_speed),b.loaded=!0;var f=a.grep(d,function(a){return!a.loaded});d=a(f);if(e.load){var g=d.length;e.load.call(b,g,e)}}).attr("src",c.data(e.data_attribute))}}),0!==e.event.indexOf("scroll")&&c.bind(e.event,function(a){b.loaded||c.trigger("appear")})}),$window.bind("resize",function(a){f()}),f(),this},a.belowthefold=function(c,d){var e;return d.container===undefined||d.container===b?e=$window.height()+$window.scrollTop():e=$container.offset().top+$container.height(),e<=a(c).offset().top-d.threshold},a.rightoffold=function(c,d){var e;return d.container===undefined||d.container===b?e=$window.width()+$window.scrollLeft():e=$container.offset().left+$container.width(),e<=a(c).offset().left-d.threshold},a.abovethetop=function(c,d){var e;return d.container===undefined||d.container===b?e=$window.scrollTop():e=$container.offset().top,e>=a(c).offset().top+d.threshold+a(c).height()},a.leftofbegin=function(c,d){var e;return d.container===undefined||d.container===b?e=$window.scrollLeft():e=$container.offset().left,e>=a(c).offset().left+d.threshold+a(c).width()},a.inviewport=function(b,c){return!a.rightofscreen(b,c)&&!a.leftofscreen(b,c)&&!a.belowthefold(b,c)&&!a.abovethetop(b,c)},a.extend(a.expr[":"],{"below-the-fold":function(c){return a.belowthefold(c,{threshold:0,container:b})},"above-the-top":function(c){return!a.belowthefold(c,{threshold:0,container:b})},"right-of-screen":function(c){return a.rightoffold(c,{threshold:0,container:b})},"left-of-screen":function(c){return!a.rightoffold(c,{threshold:0,container:b})},"in-viewport":function(c){return!a.inviewport(c,{threshold:0,container:b})},"above-the-fold":function(c){return!a.belowthefold(c,{threshold:0,container:b})},"right-of-fold":function(c){return a.rightoffold(c,{threshold:0,container:b})},"left-of-fold":function(c){return!a.rightoffold(c,{threshold:0,container:b})}})})(jQuery,window)

lib/shimmie.css

@@ -15,3 +15,4 @@ TABLE.form TBODY TH {text-align: right; padding-right: 4px; width: 1%;}
 *[onclick],H3[class~="shm-toggler"] {cursor: pointer;}
 IMG {border: none;}
 FORM {margin: 0px;}
+IMG.lazy {display: none;}

lib/shimmie.js

@@ -14,6 +14,11 @@ $(document).ready(function() {
 		selectFirst: false
 	});
 
+	$("IMG.lazy").show().lazyload({ 
+		//effect: "fadeIn",
+		threshold: 200
+	});
+
 	$("TABLE.sortable").tablesorter();
 
 	$(".shm-clink").each(function(idx, elm) {