From 634a515ec15baff240a2e41603d576c1c5dc88c7 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 14 Jul 2020 12:43:34 +0000
Subject: reduce result sets and work around a regression in justifiedGallery

---
 Zotlabs/Module/Articles.php  | 2 +-
 Zotlabs/Module/Cards.php     | 2 +-
 Zotlabs/Module/Channel.php   | 2 +-
 Zotlabs/Module/Directory.php | 2 +-
 Zotlabs/Module/Dirsearch.php | 2 +-
 Zotlabs/Module/Moderate.php  | 2 +-
 Zotlabs/Module/Network.php   | 2 +-
 Zotlabs/Module/Photos.php    | 4 ++--
 Zotlabs/Module/Pubstream.php | 2 +-
 Zotlabs/Module/Search.php    | 2 +-
 include/help.php             | 2 +-
 include/items.php            | 4 ++--
 view/css/default.css         | 2 +-
 view/js/main.js              | 2 +-
 view/tpl/photo_album.tpl     | 2 +-
 view/tpl/photos_recent.tpl   | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
index 2c43b4764..3f726ebb9 100644
--- a/Zotlabs/Module/Articles.php
+++ b/Zotlabs/Module/Articles.php
@@ -149,7 +149,7 @@ class Articles extends Controller {
 		}
 		
 		$itemspage = get_pconfig(local_channel(),'system','itemspage');
-		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
 		
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
index 3f0e93de5..c44f7942b 100644
--- a/Zotlabs/Module/Cards.php
+++ b/Zotlabs/Module/Cards.php
@@ -145,7 +145,7 @@ class Cards extends Controller {
 
 
 		$itemspage = get_pconfig(local_channel(),'system','itemspage');
-		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
 
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 08de059a8..9c8cddab3 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -334,7 +334,7 @@ class Channel extends Controller {
 
 
 			$itemspage = get_pconfig(local_channel(),'system','itemspage');
-			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
 			if($noscript_content || $load) {
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 3eafd9f71..e1bf0f6cf 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -14,7 +14,7 @@ require_once('include/html2plain.php');
 class Directory extends Controller {
 
 	function init() {
-		App::set_pager_itemspage(60);
+		App::set_pager_itemspage(30);
 	
 		if(local_channel() && x($_GET,'ignore')) {
 			q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
index 62af75f4c..c15b13a90 100644
--- a/Zotlabs/Module/Dirsearch.php
+++ b/Zotlabs/Module/Dirsearch.php
@@ -11,7 +11,7 @@ require_once('include/dir_fns.php');
 class Dirsearch extends Controller {
 
 	function init() {
-		App::set_pager_itemspage(60);
+		App::set_pager_itemspage(30);
 	
 	}
 	
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
index f1bff3c50..b66b052a6 100644
--- a/Zotlabs/Module/Moderate.php
+++ b/Zotlabs/Module/Moderate.php
@@ -16,7 +16,7 @@ class Moderate extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		\App::set_pager_itemspage(60);
+		\App::set_pager_itemspage(30);
 		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));               
 
 		//show all items
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index adfdc011b..fe1aa4386 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -452,7 +452,7 @@ class Network extends \Zotlabs\Web\Controller {
 		}
 		else {
 			$itemspage = get_pconfig(local_channel(),'system','itemspage');
-			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 		}
 	
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index fae8c17f6..649e753ad 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -708,7 +708,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			]);
 
 			if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
-				\App::set_pager_itemspage(60);
+				\App::set_pager_itemspage(30);
 				$album = $x['display_path'];
 			} 
 			else {
@@ -1289,7 +1289,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
 
-		\App::set_pager_itemspage(60);
+		\App::set_pager_itemspage(30);
 		
 		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path 
 			FROM photo p 
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
index 92ef44696..76a3e0d9e 100644
--- a/Zotlabs/Module/Pubstream.php
+++ b/Zotlabs/Module/Pubstream.php
@@ -169,7 +169,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			$pager_sql = '';
 		}
 		else {
-			\App::set_pager_itemspage(20);
+			\App::set_pager_itemspage(10);
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 		}
 	
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 686afb2d2..d586ae12f 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -159,7 +159,7 @@ class Search extends \Zotlabs\Web\Controller {
 	
 		if(($update) && ($load)) {
 			$itemspage = get_pconfig(local_channel(),'system','itemspage');
-			\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+			\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 	
 			// in case somebody turned off public access to sys channel content with permissions
diff --git a/include/help.php b/include/help.php
index e82fa96da..affe64495 100644
--- a/include/help.php
+++ b/include/help.php
@@ -223,7 +223,7 @@ function find_doc_file($s) {
  */
 function search_doc_files($s) {
 
-	\App::set_pager_itemspage(60);
+	\App::set_pager_itemspage(30);
 	$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 
 	$regexop = db_getfunc('REGEXP');
diff --git a/include/items.php b/include/items.php
index 7df5e35fe..dc76af31b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4536,8 +4536,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		// only setup pagination on initial page view
 		$pager_sql = '';
 	} else {
-		$itemspage = (($channel) ? get_pconfig($uid,'system','itemspage') : 20);
-		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		$itemspage = (($channel) ? get_pconfig($uid,'system','itemspage') : 10);
+		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 	}
 
diff --git a/view/css/default.css b/view/css/default.css
index bd0f14ba2..10cd25d25 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -26,7 +26,7 @@ main {
 	position: relative;
 	flex: 1;
 	order: 2;
-	padding: 4.5rem 7px 200px 7px;
+	padding: 4.5rem 7px 500px 7px;
 	min-width: 0;
 }
 
diff --git a/view/js/main.js b/view/js/main.js
index 56ecc4d97..d0eda4e71 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1082,7 +1082,7 @@ function justifyPhotos(id) {
 	justifiedGalleryActive = true;
 	$('#' + id).show();
 	$('#' + id).justifiedGallery({
-		selector: 'a, div:not(#page-end)',
+		selector: 'a',
 		margins: 3,
 		border: 0
 	}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index de59809f4..eb16bcc98 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -23,7 +23,7 @@
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<div id="page-end"></div>
+			<span id="page-end"></span>
 		</div>
 	</div>
 </div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index d24b362f8..1e2f22e33 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -14,7 +14,7 @@
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<div id="page-end"></div>
+			<span id="page-end"></span>
 		</div>
 	</div>
 </div>
-- 
cgit v1.2.3