krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

small design tweaks, fix #1682

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-01 18:33:50 +01:00
parent cc5126f09b
commit 3562079ba6
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/css/challenges.styl
View File

@@ -5,3 +5,9 @@ ul.challenge-accordion-header-specs
background-color: darken($neutral, 10%) background-color: darken($neutral, 10%)
margin: 2px 5px margin: 2px 5px
float:left float:left
#create-challenge-btn
margin-bottom: 10px
#challenges-filters h3
margin-top: 0px;

9
public/js/controllers/challengesCtrl.js
View File

@@ -67,6 +67,7 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica
challenge.$save(function(_challenge){ challenge.$save(function(_challenge){
if (isNew) { if (isNew) {
Notification.text('Challenge Created'); Notification.text('Challenge Created');
$state.go('options.social.challenges.detail', {cid: _challenge._id});
$scope.discard(); $scope.discard();
$scope.challenges = Challenges.Challenge.query(); $scope.challenges = Challenges.Challenge.query();
User.sync(); User.sync();
@@ -129,6 +130,14 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica
} }
$scope.toggle = function(id){
if($state.includes('options.social.challenges.detail', {cid: id})){
$state.go('options.social.challenges')
}else{
$state.go('options.social.challenges.detail', {cid: id});
}
}
//------------------------------------------------------------ //------------------------------------------------------------
// Tasks // Tasks
//------------------------------------------------------------ //------------------------------------------------------------

7
views/options/social/challenges.jade
View File

@@ -40,7 +40,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht
script(type='text/ng-template', id='partials/options.social.challenges.html') script(type='text/ng-template', id='partials/options.social.challenges.html')
.row-fluid .row-fluid
.span2.well .span2.well#challenges-filters
h3 Filter:
h4 Groups h4 Groups
label.checkbox(ng-repeat='group in groups') label.checkbox(ng-repeat='group in groups')
input(type='checkbox', ng-model='search.group[group._id]') input(type='checkbox', ng-model='search.group[group._id]')
@@ -57,7 +58,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
| Either | Either
.span10 .span10
// Creation form // Creation form
button.btn.btn-success(ng-click='create()', ng-hide='newChallenge') Create Challenge button.btn.btn-success#create-challenge-btn(ng-click='create()', ng-hide='newChallenge') Create Challenge
.create-challenge-from.well(ng-if='newChallenge') .create-challenge-from.well(ng-if='newChallenge')
form(ng-submit='save(newChallenge)') form(ng-submit='save(newChallenge)')
div div
@@ -107,7 +108,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
a.btn.btn-small.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)') a.btn.btn-small.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)')
i.icon-ok i.icon-ok
| Join | Join
a.accordion-toggle(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}} a.accordion-toggle(ng-click='toggle(challenge._id)') {{challenge.name}}
.accordion-body(ng-class='{collapse: !$stateParams.cid == challenge._id}') .accordion-body(ng-class='{collapse: !$stateParams.cid == challenge._id}')
.accordion-inner(ng-if='$stateParams.cid == challenge._id') .accordion-inner(ng-if='$stateParams.cid == challenge._id')
div(ui-view) div(ui-view)