Merge pull request #55 from topcoder-platform/issues-384

Issues-386: design tweaks

Author: jmgasper

class.groups.plugin.php

@@ -34,7 +34,7 @@ class GroupsPlugin extends Gdn_Plugin {
     const ROLE_TOPCODER_MANAGER = 'Connect Manager';
 
     const UI = [
-        'challenge' => ['BreadcrumbLevel1Title' => 'Challenges',
+        'challenge' => ['BreadcrumbLevel1Title' => 'Challenge Discussions',
             'BreadcrumbLevel1Url' =>  self::ROUTE_CHALLENGE_GROUPS,
             'CreateGroupTitle' => 'Create Challenge',
             'EditGroupTitle' => 'Edit Challenge',
@@ -349,7 +349,7 @@ public function base_discussionOptionsDropdown_handler($sender, $args){
         }
     }
 
-    public function base_afterDiscussionFilters_handler($sender){
+    public function base_beforeUserLinksDiscussionFilters_handler($sender){
         $this->addGroupLinkToMenu($sender);
     }
 
@@ -819,8 +819,8 @@ private function getTopcoderProjectRoles($user, $resources = null, $roleResource
     private function addGroupLinkToMenu($sender) {
         if(Gdn::session()->isValid()) {
 
-            echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'challenge').'">'. anchor('Challenges', GroupsPlugin::ROUTE_CHALLENGE_GROUPS).'</li>';
-            echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'regular').'">'. anchor('Groups', GroupsPlugin::ROUTE_REGULAR_GROUPS).'</li>';
+            echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'challenge').'">'. anchor('Challenge Discussions', GroupsPlugin::ROUTE_CHALLENGE_GROUPS).'</li>';
+           // echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'regular').'">'. anchor('Groups', GroupsPlugin::ROUTE_REGULAR_GROUPS).'</li>';
            // echo '<li class="'.$this->getMenuItemCssClassFromRequestMethod($sender, 'mine').'">'. anchor('My Challenges & Groups', GroupsPlugin::ROUTE_MY_GROUPS).'</li>';
         }
     }

controllers/class.groupcontroller.php

@@ -51,7 +51,7 @@ public function initialize() {
         // Add modules
         $this->addModule('NewDiscussionModule');
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('CategoriesModule');
+        //$this->addModule('CategoriesModule');
         $this->addModule('BookmarkedModule');
     }
 
@@ -573,7 +573,7 @@ public function discussions($GroupID='',$Page = false) {
 
         $Group = $this->GroupModel->getByGroupID($GroupID);
         $this->setData('Group',$Group);
-        $this->setData('Breadcrumbs', [['Name' => t('Challenges'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
+        $this->setData('Breadcrumbs', [['Name' => t('Challenge Discussions'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
             ['Name' => $Group->Name, 'Url' => GroupsPlugin::GROUP_ROUTE.$Group->GroupID], ['Name' => t('Discussions')]]);
 
         // Check for the feed keyword.
@@ -683,7 +683,7 @@ public function announcement($GroupID=''){
         }
 
         $this->setData('Breadcrumbs',
-            [['Name' => t('Challenges'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
+            [['Name' => t('Challenge Discussions'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
                 ['Name' => $Group->Name, 'Url' => GroupsPlugin::GROUP_ROUTE.$Group->GroupID], ['Name' => t('New Announcement')]]);
         $this->title('New Announcement');
         $this->setDiscussionData($Group, 2);
@@ -703,7 +703,7 @@ public function discussion($GroupID=''){
             throw permissionException();
         }
 
-        $this->setData('Breadcrumbs',   [['Name' => t('Challenges'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
+        $this->setData('Breadcrumbs',   [['Name' => t('Challenge Discussions'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
             ['Name' => $Group->Name, 'Url' => GroupsPlugin::GROUP_ROUTE.$Group->GroupID], ['Name' => t('New Discussion')]]);
         $this->title('New Discussion');
         $this->setDiscussionData($Group, 1);

controllers/class.groupscontroller.php

@@ -39,15 +39,15 @@ public function initialize() {
         // Add modules
         $this->addModule('NewDiscussionModule');
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('CategoriesModule');
+        //$this->addModule('CategoriesModule');
         $this->addModule('BookmarkedModule');
         $this->fireEvent('AfterInitialize');
     }
 
     public function setFilterPageData($filter) {
         if($filter == 'challenge') {
             $this->View = 'index';
-            $this->title('Challenges');
+            $this->title('Challenge Discussions');
             $this->setData('Title', 'My Challenges');
             $this->setData('ShowAddButton', false);
             $this->setData('AddButtonTitle', 'Challenge');
@@ -59,7 +59,7 @@ public function setFilterPageData($filter) {
             $this->setData('AllGroupButtonLink', '/groups/all/?filter=challenge');
             $this->setData('NoGroups', 'No challenges were found.');
             $this->setData('Breadcrumbs', [
-                ['Name' => 'Challenges', 'Url' => GroupsPlugin::ROUTE_CHALLENGE_GROUPS]]);
+                ['Name' => 'Challenge Discussions', 'Url' => GroupsPlugin::ROUTE_CHALLENGE_GROUPS]]);
         } else if($filter == 'regular' ) {
             $this->View = 'index';
             $this->title('Groups');