diff --git a/ext/random_list/main.php b/ext/random_list/main.php index 42e2273c..c9671309 100644 --- a/ext/random_list/main.php +++ b/ext/random_list/main.php @@ -13,56 +13,42 @@ class RandomList extends Extension { public function onPageRequest(PageRequestEvent $event) { global $config, $page; - - if($event->page_matches("random")) { - // set vars - $page->title = "Random Images"; - $images_per_page = $config->get_int("random_images_list_count", 12); - $random_images = array(); - $random_html = "Refresh the page to view more images -
"; - // generate random images - for ($i = 0; $i < $images_per_page; $i++) - array_push($random_images, Image::by_random()); + if($event->page_matches("random")) { + // set vars + $page->title = "Random Images"; + $images_per_page = $config->get_int("random_images_list_count", 12); + $random_images = array(); + $random_html = "Refresh the page to view more images +
"; - // create html to display images - foreach ($random_images as $image) - $random_html .= $this->build_random_html($image); - - // display it - $random_html .= "
"; - $page->add_block(new Block("Random Images", $random_html)); + // generate random images + for ($i = 0; $i < $images_per_page; $i++) + array_push($random_images, Image::by_random()); + + // create html to display images + foreach ($random_images as $image) + $random_html .= $this->theme->build_thumb_html($image); + + // display it + $random_html .= "
"; + $page->add_block(new Block("Random Images", $random_html)); } } - - public function onInitExt(InitExtEvent $event) { - global $config; - $config->set_default_int("random_images_list_count", 12); - } - - public function onSetupBuilding(SetupBuildingEvent $event) { - $sb = new SetupBlock("Random Images List"); - - // custom headers - $sb->add_int_option("random_images_list_count", - "Amount of Random images to display "); - - $event->panel->add_block($sb); - } - - private function build_random_html(Image $image, $query=null) { - $i_id = int_escape($image->id); - $h_view_link = make_link("post/view/$i_id", $query); - $h_thumb_link = $image->get_thumb_link(); - $h_tip = html_escape($image->get_tooltip()); - $tsize = get_thumbnail_size($image->width, $image->height); - return " - - - "; + public function onInitExt(InitExtEvent $event) { + global $config; + $config->set_default_int("random_images_list_count", 12); + } + + public function onSetupBuilding(SetupBuildingEvent $event) { + $sb = new SetupBlock("Random Images List"); + + // custom headers + $sb->add_int_option("random_images_list_count", + "Amount of Random images to display "); + + $event->panel->add_block($sb); } } ?> diff --git a/ext/random_list/theme.php b/ext/random_list/theme.php new file mode 100644 index 00000000..bbfbff5c --- /dev/null +++ b/ext/random_list/theme.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/lib/jquery.lazyload.min.js b/lib/jquery.lazyload.min.js deleted file mode 100644 index ac769a99..00000000 --- a/lib/jquery.lazyload.min.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 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("").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); diff --git a/lib/shimmie.js b/lib/shimmie.js index c3b663e9..4169a7b2 100644 --- a/lib/shimmie.js +++ b/lib/shimmie.js @@ -16,11 +16,6 @@ $(document).ready(function() { selectFirst: false }); - $("IMG.lazy").show().lazyload({ - //effect: "fadeIn", - threshold: 200 - }); - $("TABLE.sortable").tablesorter(); $(".shm-clink").each(function(idx, elm) {