aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-06 22:36:46 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-06 22:36:46 -0700
commit5bc7c0e7988765998d44f005a9e7121848888660 (patch)
tree6e918268bda874e13112b60e70e78192fccb9fd5
parent3c05af6553ae1bef3a59c5f58aa7551021e34363 (diff)
downloadvolse-hubzilla-5bc7c0e7988765998d44f005a9e7121848888660.tar.gz
volse-hubzilla-5bc7c0e7988765998d44f005a9e7121848888660.tar.bz2
volse-hubzilla-5bc7c0e7988765998d44f005a9e7121848888660.zip
add endless scroll to viewconnections module
-rw-r--r--mod/viewconnections.php35
-rwxr-xr-xview/tpl/viewcontact_template.tpl7
-rw-r--r--view/tpl/viewcontactsajax.tpl3
3 files changed, 37 insertions, 8 deletions
diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index ee68c2149..ef6681e64 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -28,6 +28,10 @@ function viewconnections_content(&$a) {
return;
}
+ if(! $_REQUEST['aj'])
+ $_SESSION['return_url'] = $a->query_string;
+
+
$is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false);
$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
@@ -54,7 +58,7 @@ function viewconnections_content(&$a) {
intval($a->pager['start'])
);
- if(! $r) {
+ if((! $r) && (! $_REQUEST['aj'])) {
info( t('No connections.') . EOL );
return $o;
}
@@ -81,13 +85,30 @@ function viewconnections_content(&$a) {
}
- $tpl = get_markup_template("viewcontact_template.tpl");
- $o .= replace_macros($tpl, array(
- '$title' => t('View Connections'),
- '$contacts' => $contacts,
- '$paginate' => paginate($a),
- ));
+ if($_REQUEST['aj']) {
+ if($contacts) {
+ $o = replace_macros(get_markup_template('viewcontactsajax.tpl'),array(
+ '$contacts' => $contacts
+ ));
+ }
+ else {
+ $o = '<div id="content-complete"></div>';
+ }
+ echo $o;
+ killme();
+ }
+ else {
+ $o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+ $tpl = get_markup_template("viewcontact_template.tpl");
+ $o .= replace_macros($tpl, array(
+ '$title' => t('View Connections'),
+ '$contacts' => $contacts,
+// '$paginate' => paginate($a),
+ ));
+ }
+ if(! $contacts)
+ $o .= '<div id="content-complete"></div>';
return $o;
}
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
index cde24525c..83cd80959 100755
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -1,10 +1,15 @@
<div class="generic-content-wrapper generic-content-wrapper-styled">
<h3>{{$title}}</h3>
+
+<div id="connections-wrapper">
{{foreach $contacts as $contact}}
{{include file="contact_template.tpl"}}
{{/foreach}}
-
+<div id="page-end"></div>
+</div>
<div id="view-contact-end"></div>
{{$paginate}}
</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/viewcontactsajax.tpl b/view/tpl/viewcontactsajax.tpl
new file mode 100644
index 000000000..68be228be
--- /dev/null
+++ b/view/tpl/viewcontactsajax.tpl
@@ -0,0 +1,3 @@
+{{foreach $contacts as $contact}}
+{{include file="contact_template.tpl"}}
+{{/foreach}}