aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-05 21:48:13 -0700
committerfriendica <info@friendica.com>2014-08-05 21:48:13 -0700
commitdc98e6c0e9403066c95cebe1d7eb919281a9e1cd (patch)
tree6b97baf78fc01a3beff0dfbf1f39f0a084881856
parent1f415d983081170ec707e0f72d99efc12e7cde4a (diff)
downloadvolse-hubzilla-dc98e6c0e9403066c95cebe1d7eb919281a9e1cd.tar.gz
volse-hubzilla-dc98e6c0e9403066c95cebe1d7eb919281a9e1cd.tar.bz2
volse-hubzilla-dc98e6c0e9403066c95cebe1d7eb919281a9e1cd.zip
scrolling directory
-rw-r--r--mod/directory.php13
-rw-r--r--view/js/main.js2
-rw-r--r--view/tpl/directajax.tpl6
-rwxr-xr-xview/tpl/directory_header.tpl4
4 files changed, 18 insertions, 7 deletions
diff --git a/mod/directory.php b/mod/directory.php
index e80e9661d..d71a5584a 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -199,12 +199,15 @@ function directory_content(&$a) {
$a->data['directory_keywords'] = $j['keywords'];
}
-// logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
-
-
- if($dynamic) {
+ logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DEBUG);
+ if($_REQUEST['aj']) {
+ $o = replace_macros(get_markup_template('directajax.tpl'),array(
+ '$entries' => $entries
+ ));
+ echo $o;
+ killme();
}
else {
@@ -219,7 +222,7 @@ function directory_content(&$a) {
'$submit' => t('Find')
));
- $o .= alt_pager($a,$j['records'], t('next page'), t('previous page'));
+// $o .= alt_pager($a,$j['records'], t('next page'), t('previous page'));
}
diff --git a/view/js/main.js b/view/js/main.js
index 8e05d6776..417063b5a 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -677,7 +677,7 @@ function updateConvItems(mode,data) {
bParam_page = 1;
}
- update_url = baseurl + '/directory/?f=&page=' + bParam_page;
+ update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page;
$("#page-spinner").spin('small');
update_mode = 'append';
diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl
new file mode 100644
index 000000000..208167e4a
--- /dev/null
+++ b/view/tpl/directajax.tpl
@@ -0,0 +1,6 @@
+{{foreach $entries as $entry}}
+
+{{include file="direntry.tpl"}}
+
+{{/foreach}}
+
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 5d703e2dd..2479cead3 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -11,6 +11,8 @@
{{/foreach}}
-
+<div id="page-end"></div>
<div class="directory-end"></div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>