Skip to content

Commit a3fad3c

Browse files
jmgasperjmgasper
authored
Merge pull request #69 from topcoder-platform/issues-476
Issues-477: renamed 'challenge discussions' to 'challenge forums'
2 parents 8cb90a2 + 92c5d00 commit a3fad3c

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎class.groups.plugin.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class GroupsPlugin extends Gdn_Plugin {
3434
const ROLE_TOPCODER_MANAGER = 'Connect Manager';
3535

3636
const UI = [
37-
'challenge' => ['BreadcrumbLevel1Title' => 'Challenge Discussions',
37+
'challenge' => ['BreadcrumbLevel1Title' => 'Challenge Forums',
3838
'BreadcrumbLevel1Url' => self::ROUTE_CHALLENGE_GROUPS,
3939
'CreateGroupTitle' => 'Create Challenge',
4040
'EditGroupTitle' => 'Edit Challenge',
4141
'TypeName' => 'challenge'],
42-
'regular' => ['BreadcrumbLevel1Title' => 'Group Discussions',
42+
'regular' => ['BreadcrumbLevel1Title' => 'Group Forums',
4343
'BreadcrumbLevel1Url' => self::ROUTE_REGULAR_GROUPS,
4444
'CreateGroupTitle' => 'Create Group',
4545
'EditGroupTitle' => 'Edit Group',
@@ -811,7 +811,7 @@ private function getTopcoderProjectRoles($user, $resources = null, $roleResource
811811
private function addGroupLinkToMenu($sender) {
812812
if(Gdn::session()->isValid()) {
813813

814-
echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'challenge').'">'. anchor('Challenge Discussions', GroupsPlugin::ROUTE_CHALLENGE_GROUPS).'</li>';
814+
echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'challenge').'">'. anchor('Challenge Forums', GroupsPlugin::ROUTE_CHALLENGE_GROUPS).'</li>';
815815
// echo '<li class="'.$this->getMenuItemCssClassFromQuery($sender, 'regular').'">'. anchor('Group Discussions', GroupsPlugin::ROUTE_REGULAR_GROUPS).'</li>';
816816
// echo '<li class="'.$this->getMenuItemCssClassFromRequestMethod($sender, 'mine').'">'. anchor('My Challenges & Groups', GroupsPlugin::ROUTE_MY_GROUPS).'</li>';
817817
}

‎controllers/class.groupcontroller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ public function discussions($GroupID='',$Page = false) {
637637

638638
$Group = $this->GroupModel->getByGroupID($GroupID);
639639
$this->setData('Group',$Group);
640-
$this->setData('Breadcrumbs', [['Name' => t('Challenge Discussions'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
640+
$this->setData('Breadcrumbs', [['Name' => t('Challenge Forums'), 'Url' => GroupsPlugin::GROUPS_ROUTE],
641641
['Name' => $Group->Name, 'Url' => GroupsPlugin::GROUP_ROUTE.$Group->GroupID], ['Name' => t('Discussions')]]);
642642

643643
// Check for the feed keyword.

‎controllers/class.groupscontroller.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,34 +47,34 @@ public function initialize() {
4747
public function setFilterPageData($filter) {
4848
if($filter == 'challenge') {
4949
$this->View = 'index';
50-
$this->title('Challenge Discussions');
51-
$this->setData('Title', 'Challenge Discussions');
50+
$this->title('Challenge Forums');
51+
$this->setData('Title', 'Challenge Forums');
5252
$this->setData('ShowAddButton', false);
5353
$this->setData('AddButtonTitle', 'Challenge');
5454
$this->setData('AddButtonLink', '/group/add?type=challenge');
5555
$this->setData('AvailableGroupTitle', 'Available Challenges');
56-
$this->setData('MyGroupButtonTitle', 'All Challenge Discussions');
57-
$this->setData('AllGroupButtonTitle', 'All Available Challenge Discussions');
56+
$this->setData('MyGroupButtonTitle', 'All Challenge Forums');
57+
$this->setData('AllGroupButtonTitle', 'All Available Challenge Forums');
5858
$this->SetData('MyGroupButtonLink', '/groups/mine/?filter=challenge');
5959
$this->setData('AllGroupButtonLink', '/groups/all/?filter=challenge');
6060
$this->setData('NoGroups', 'No challenges were found.');
6161
$this->setData('Breadcrumbs', [
62-
['Name' => 'Challenge Discussions', 'Url' => GroupsPlugin::ROUTE_CHALLENGE_GROUPS]]);
62+
['Name' => 'Challenge Forums', 'Url' => GroupsPlugin::ROUTE_CHALLENGE_GROUPS]]);
6363
} else if($filter == 'regular' ) {
6464
$this->View = 'index';
6565
$this->title('Groups');
6666
$this->setData('Title', 'My Groups');
6767
$this->setData('ShowAddButton', true);
6868
$this->setData('AddButtonTitle', 'Group');
6969
$this->setData('AddButtonLink', '/group/add?type=regular');
70-
$this->setData('MyGroupButtonTitle', 'All Group Discussions');
71-
$this->setData('AllGroupButtonTitle', 'All Available Group Discussions');
72-
$this->setData('AvailableGroupTitle', 'Available Group Discussions');
70+
$this->setData('MyGroupButtonTitle', 'All Group Forums');
71+
$this->setData('AllGroupButtonTitle', 'All Available Group Forums');
72+
$this->setData('AvailableGroupTitle', 'Available Group Forums');
7373
$this->SetData('MyGroupButtonLink', '/groups/mine/?filter=regular');
7474
$this->setData('AllGroupButtonLink', '/groups/all/?filter=regular');
7575
$this->setData('NoGroups','No groups were found.');
7676
$this->setData('Breadcrumbs', [
77-
['Name' => t('Groups'), 'Url' => GroupsPlugin::ROUTE_REGULAR_GROUPS]]);
77+
['Name' => t('Group Forums'), 'Url' => GroupsPlugin::ROUTE_REGULAR_GROUPS]]);
7878
}
7979
}
8080

@@ -196,10 +196,10 @@ private function mygroups($Page = false, $filter = '') {
196196
//['Name' => 'Group Discussions', 'Url' => '/groups/'.$queryString],
197197
['Name' => $title, 'Url' => '/groups/mine/'.$queryString]]);
198198
} else if($filter == 'challenge'){
199-
$title = 'Challenge Discussions';
200-
$noDataText = 'No Challenge discussions were found.';
199+
$title = 'Challenge Forums';
200+
$noDataText = 'No Challenge forums were found.';
201201
$this->setData('Breadcrumbs', [
202-
//['Name' => 'Challenge Discussions', 'Url' => '/groups/'.$queryString],
202+
//['Name' => 'Challenge Forums', 'Url' => '/groups/'.$queryString],
203203
['Name' => $title, 'Url' => '/groups/mine/'.$queryString]]);
204204

205205
}

‎views/groups/mine.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
include_once $this->fetchViewLocation('helper_functions');
55

6-
echo '<h1 class="H HomepageTitle">Challenge Discussions</h1>';
6+
echo '<h1 class="H HomepageTitle">Challenge Forums</h1>';
77
if ($this->data('ChallengeGroups')) {
88

99
?>
@@ -15,11 +15,11 @@
1515
<?php
1616
if ($this->data('CountOfChallengeGroups') > 0) {
1717
?>
18-
<div class="MoreWrap"> <?php echo anchor('All Challenge Discussions('.$this->data('CountOfChallengeGroups').')', '/groups/mine?filter=challenge', 'MoreWrap');?></div>
18+
<div class="MoreWrap"> <?php echo anchor('All Challenge Forums('.$this->data('CountOfChallengeGroups').')', '/groups/mine?filter=challenge', 'MoreWrap');?></div>
1919
<?php
2020
} else {
2121
?>
22-
<div class="Empty"><?php echo t('No Challenge discussions were found.'); ?></div>
22+
<div class="Empty"><?php echo t('No Challenge Forums were found.'); ?></div>
2323
<?php
2424
}
2525
?>
@@ -39,11 +39,11 @@
3939
<?php
4040
if ($this->data('CountOfRegularGroups') > 0) {
4141
?>
42-
<div class="MoreWrap"> <?php echo anchor('All Group Discussions('.$this->data('CountOfRegularGroups').')', '/groups/mine/?filter=regular', 'MoreWrap');?></div>
42+
<div class="MoreWrap"> <?php echo anchor('All Group Forums('.$this->data('CountOfRegularGroups').')', '/groups/mine/?filter=regular', 'MoreWrap');?></div>
4343
<?php
4444
} else {
4545
?>
46-
<div class="Empty"><?php echo t('No Group discussions were found.'); ?></div>
46+
<div class="Empty"><?php echo t('No Group Forums were found.'); ?></div>
4747
<?php
4848
}
4949
?>

0 commit comments

Comments
 (0)