Adding a sort by recency to the community page

pistruiatul · Nov 20, 2012 · 523ad26 · 523ad26
1 parent 0f1a6b1
commit 523ad26
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/www/hooks/add_new_link.php b/www/hooks/add_new_link.php
@@ -58,7 +58,9 @@ function addLinkToNewsQueue($link, $uid, $userDisplayName, $origin) {
 
 
 if (addLinkToNewsQueue($link, $uid, $userDisplayName, $origin)) {
-  echo "Link-ul este acum în coada de moderare. <br>Poți verifica statusul " .
+  echo "Link-ul este acum în coada de moderare. ".
+       "Aprobarea durează <b>maxim 5 minute</b>.".
+       "<br>Poți verifica statusul " .
        "resurselor trimise de tine pe " .
        "<a href='/?cid=profile'>pagina ta de profil</a>";
 } else {

diff --git a/www/hp-includes/news.php b/www/hp-includes/news.php
@@ -282,7 +282,7 @@ function extractDomainFromLink($link) {
  * @return unknown_type
  */
 function getMostRecentUgcLinks($count, $restrict_to_ids=NULL, $uid=0,
-                               $since=0, $linkId=NULL) {
+                               $since=0, $linkId=NULL, $order_by=NULL) {
   $where_clause = '';
   if ($restrict_to_ids) {
     $ids = implode(",", $restrict_to_ids);
@@ -298,6 +298,10 @@ function getMostRecentUgcLinks($count, $restrict_to_ids=NULL, $uid=0,
     $where_clause = "AND a.id = {$linkId}";
   }
 
+  if (!$order_by) {
+    $order_by = "a.score DESC, a.votes DESC, a.time DESC";
+  }
+
   $s = mysql_query("
     SELECT
         a.id, a.title, a.link, a.time, a.place, a.photo, p.idperson,
@@ -309,7 +313,7 @@ function getMostRecentUgcLinks($count, $restrict_to_ids=NULL, $uid=0,
       {$where_clause}
       {$user_restrict}
     GROUP BY a.id
-    ORDER BY a.score DESC, a.votes DESC, a.time DESC
+    ORDER BY {$order_by}
     LIMIT 0, $count");
 
   $news = array();

diff --git a/www/my_account.php b/www/my_account.php
@@ -52,7 +52,8 @@ function getMostRecentNewPeople() {
 
 $t->assign('followed_people', followedPeopleAsArray());
 
-$t->assign('links', getMostRecentUgcLinks(100, NULL, $uid));
+$t->assign('links', getMostRecentUgcLinks(30, NULL, $uid, 0, NULL,
+                                          "a.time DESC"));
 
 $t->display('my_account_summary.tpl');
 

diff --git a/www/pages/misc/community.php b/www/pages/misc/community.php
@@ -29,7 +29,15 @@
     $people_restrict = NULL;
   }
 
-  $t->assign('news', getMostRecentUgcLinks(30, $people_restrict, 0));
+  if (isSet($_GET["sort"])) {
+    $t->assign('news', getMostRecentUgcLinks(30, $people_restrict, 0,
+                                             0, NULL, "a.time DESC"));
+    $t->assign('sort', 'time');
+  } else {
+    $t->assign('news', getMostRecentUgcLinks(30, $people_restrict, 0));
+  }
+
+
 
   $t->display('pages_misc_community.tpl');
 }

diff --git a/www/styles.css b/www/styles.css
@@ -339,7 +339,7 @@ body {
 }
 
 .recent_news_block .black_link a:visited {
-  color: #999;
+  color: #666;
 }
 
 .news_list_mention {

diff --git a/www/templates/pages_misc_community.tpl b/www/templates/pages_misc_community.tpl
@@ -10,7 +10,16 @@
   <div class="big">
     <b>Resurse adăugate și votate de comunitatea Hărții Politicii</b>
   </div>
-  <br>
+
+  <span class="gray">Ordonează după</span>:
+    {if $sort=='time'}
+      <a href="/?cid=comunitate">număr voturi</a> |
+      recență
+    {else}
+      număr voturi |
+      <a href="/?cid=comunitate&sort=1">recență</a>
+    {/if}
+  <br><br>
   <div class="bigger_news_list">
     {include file="news_list_ugc.tpl" news=$news}
   </div>