pagination in keyword match

diff --git a/mod/match.php b/mod/match.php
index 58c81a0cdd4b43238f31b25426d1bcbff2e2120a..f3c78bc7dcd082e9bc1c6b45f93af0607a9c2183 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -3,9 +3,12 @@
 
 function match_content(&$a) {
 
+       $o = '';
        if(! local_user())
                return;
 
+       $o .= '<h2>' . t('Profile Keyword Match') . '</h2>';
+
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
@@ -21,16 +24,25 @@ function match_content(&$a) {
        $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
        if($tags) {
                $params['s'] = $tags;
-
+               if($a->pager['page'] != 1)
+                       $params['p'] = $a->pager['page'];
 
                $x = post_url('http://dir.friendika.com/msearch', $params);
 
                $j = json_decode($x);
 
-               if(count($j)) {
-                       foreach($j as $jj) {
+               if($j->total) {
+                       $a->set_pager_total($j->total);
+                       $a->set_pager_itemspage($j->items_page);
+               }
 
-                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" />' . $jj->name . '</a>';
+               if(count($j->results)) {
+                       foreach($j->results as $jj) {
+                               $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
+                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" /></a></div>';
+                               $o .= '<div class="profile-match-break"></div>';
+                               $o .= '<div class="profile-match-name"><a href="' . $jj->url . '">' . $jj->name . '</a></div>';
+                               $o .= '<div class="profile-match-end"></div></div>';
                        }
                }
                else {
@@ -38,5 +50,7 @@ function match_content(&$a) {
                }               
 
        }
+
+       $o .= paginate($a);
        return $o;
 }
\ No newline at end of file

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0c3cade9e55d425d2b3fb229529c60b34bc27c7c..db73886e2fc077073a5a4a744acfbf2b7d204a6d 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2144,3 +2144,21 @@ a.mail-list-link {
        clear: both;
 }
 
+.profile-match-photo {
+       float: left;
+       text-align: center;
+       width: 120px;
+}
+
+.profile-match-name {
+       float: left;
+       text-align: center;
+       width: 120px;
+       overflow: clip;
+}
+
+.profile-match-break,
+.profile-match-end {
+       clear: both;
+}
+

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 030b878bfe2f9b7ee16157076e07fa4fb343d6ce..69dee0dc9a3d301e3b05ae227b4d25a926e3002a 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2169,3 +2169,22 @@ a.mail-list-link {
        clear: both;
 }
 
+
+.profile-match-photo {
+       float: left;
+       text-align: center;
+       width: 120px;
+}
+
+.profile-match-name {
+       float: left;
+       text-align: center;
+       width: 120px;
+       overflow: clip;
+}
+
+.profile-match-break,
+.profile-match-end {
+       clear: both;
+}
+