Reorganize thread view, a=chris

diff --git a/controllers/components/social_component.php b/controllers/components/social_component.php
index 34b060274..e4141499d 100644
--- a/controllers/components/social_component.php
+++ b/controllers/components/social_component.php
@@ -788,6 +788,8 @@ class SocialComponent extends Component implements CrawlConstants
                 $pages[$group['JOIN_DATE']] = $page;
             }
         }
+        $pub_clause = array('pub_date', "=", "", "DESC");
+        $sort = "krsort";
         if($just_thread) {
             $thread_parent = $group_model->getGroupItem($just_thread);
             if(isset($thread_parent["TYPE"]) &&
@@ -802,12 +804,14 @@ class SocialComponent extends Component implements CrawlConstants
                         $page_info["GROUP_ID"];
                 }
             }
+            $pub_clause = array('pub_date', "=", "", "ASC");
+            $sort = "ksort";
         }
         $search_array = array(
             array("parent_id", "=", $just_thread, ""),
             array("group_id", "=", $just_group_id, ""),
             array("user_id", "=", $just_user_id, ""),
-            array('pub_date', "=", "", "DESC"));
+            $pub_clause);
         $for_group = ($just_group_id) ? $just_group_id : -1;
         $item_count = $group_model->getGroupItemCount($search_array, $user_id,
             $for_group);
@@ -855,7 +859,7 @@ class SocialComponent extends Component implements CrawlConstants
             $pages[$item["PUBDATE"] . "$j"] = $page;
             $j++;
         }
-        krsort($pages);
+        $sort($pages);
         $data['SUBTITLE'] = "";
         if($just_thread != "" && isset($page[self::TITLE])) {
             $title = $page[self::TITLE];
@@ -873,7 +877,7 @@ class SocialComponent extends Component implements CrawlConstants
             $data['ADD_PAGING_QUERY'] = "&just_user_id=$just_user_id";
             $data['JUST_USER_ID'] = $just_user_id;
         }
-        $pages = array_slice($pages, $limit , $results_per_page - 1);
+        $pages = array_slice($pages, $limit , $results_per_page);
         $data['TOTAL_ROWS'] = $item_count + $groups_count;
         $data['LIMIT'] = $limit;
         $data['RESULTS_PER_PAGE'] = $results_per_page;
diff --git a/views/elements/groupfeed_element.php b/views/elements/groupfeed_element.php
index 4e68ce448..ceefba1bb 100644
--- a/views/elements/groupfeed_element.php
+++ b/views/elements/groupfeed_element.php
@@ -165,7 +165,7 @@ class GroupfeedElement extends Element implements CrawlConstants
                             "{$data['PAGES'][0]['PARENT_ID']},".
                             "{$data['PAGES'][0]['GROUP_ID']}"); ?>)'><?php
                         e(tl('groupfeed_element_comment'));?></button>
-                <div id='add-comment'></div>
+                <div></div>
                 </div>
                 <?php
             } else if(isset($data['JUST_GROUP_ID']) &&
@@ -290,8 +290,18 @@ class GroupfeedElement extends Element implements CrawlConstants
             </div>
             <?php
             } //end foreach
-            ?>
-            <?php
+            if(isset($data['JUST_THREAD'])) {
+                ?>
+                <div class='button-group-result'>
+                <button class="button-box" onclick='comment_form(<?php
+                        e("\"add-comment\", ".
+                            "{$data['PAGES'][0]['PARENT_ID']},".
+                            "{$data['PAGES'][0]['GROUP_ID']}"); ?>)'><?php
+                        e(tl('groupfeed_element_comment'));?></button>
+                <div id='add-comment'></div>
+                </div>
+                <?php
+            }
             $this->view->helper("pagination")->render($paging_query,
                 $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS']);
             ?>
@@ -357,6 +367,7 @@ class GroupfeedElement extends Element implements CrawlConstants
                     ?></button>' +
                     '<div>&nbsp;</div>'+
                     '</form>';
+                elt('comment-' + id).focus();
             } else {
                 elt(id).innerHTML = "";
             }