Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-27 17:05:29 +01:00
parent 99f6ac8f1a 9f53365648
commit 5fa514b6fa
56 changed files with 3747 additions and 3338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/options/settings.jade
+10
View File
@@ -116,6 +116,16 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
ng-disabled='dayStart == user.preferences.dayStart')
=env.t('saveCustomDayStart')
hr
h5=env.t('timezone')
.form-horizontal
.form-group
.col-sm-12
p!=env.t('timezoneUTC', {utc: "{{ user.preferences.timezoneOffset | timezoneOffsetToUtc }}"})
br
p!=env.t('timezoneInfo')
.personal-options.col-md-6
.panel.panel-default
.panel-heading
website/views/options/social/challenge-box.jade
+2 -1
View File
@@ -10,7 +10,8 @@
table.table.table-striped
tr(ng-repeat='challenge in group.challenges')
td
a(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}}
a(ui-sref='options.social.challenges.detail({cid:challenge._id, groupIdFilter: group._id})')
markdown(text='challenge.name')
div(ng-if='group.challenges.length == 0')
p
| 
website/views/options/social/challenges.jade
+26 -23
View File
@@ -139,32 +139,34 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
placeholder=env.t('challengeTitle'), required='required',
ng-disabled='insufficientGemsForTavernChallenge()')
.form-group
input.form-control(type='text', minlength="3", maxlength="16",
ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required
ng-disabled='insufficientGemsForTavernChallenge()')
| 
a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags',
popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
=env.t('moreInfo')
.form-group
textarea.form-control(cols='3', placeholder=env.t('challengeDescr'), ng-model='newChallenge.description'
ng-disabled='insufficientGemsForTavernChallenge()')
.form-group
.input-group
span.input-group-addon
.Pet_Currency_Gem1x
input.form-control(type='number', placeholder=env.t('prize'),
ng-disabled='insufficientGemsForTavernChallenge()'
min="{{newChallenge.group=='habitrpg' ? 1 : 0}}",
max="{{maxPrize}}", ng-model='newChallenge.prize')
a.hint(popover="{{newChallenge.group=='habitrpg' ? env.t('prizePopTavern') : env.t('prizePop')}}",
popover-trigger='mouseenter', popover-placement='right')
=env.t('moreInfo')
.pull-right(ng-show='newChallenge.group=="habitrpg"')
!=env.t('publicChallenges')
.row
.form-group.col-md-6.col-sm-12
input.form-control(type='text', minlength="3",
ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required
ng-disabled='insufficientGemsForTavernChallenge()')
| 
a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags',
popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
=env.t('moreInfo')
.row
.form-group.col-md-6.col-sm-12
.input-group
span.input-group-addon
.Pet_Currency_Gem1x
input.form-control(type='number', placeholder=env.t('prize'),
ng-disabled='insufficientGemsForTavernChallenge()'
min="{{newChallenge.group=='habitrpg' ? 1 : 0}}",
max="{{maxPrize}}", ng-model='newChallenge.prize')
a.hint(popover="{{newChallenge.group=='habitrpg' ? env.t('prizePopTavern') : env.t('prizePop')}}",
popover-trigger='mouseenter', popover-placement='right')
=env.t('moreInfo')
div(ng-show='newChallenge.group=="habitrpg"')
!=env.t('publicChallenges')
.form-group(ng-if='user.contributor.admin')
.checkbox
@@ -203,7 +205,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
a.btn.btn-sm.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)')
span.glyphicon.glyphicon-ok
=env.t('join')
a.accordion-toggle(id="{{challenge._id}}" ng-click='toggle(challenge._id)') {{challenge.name}}
a.accordion-toggle(id="{{challenge._id}}" ng-click='toggle(challenge._id)')
markdown(text='challenge.name')
.panel-body(ng-class='{collapse: !$stateParams.cid == challenge._id}')
.accordion-inner(ng-if='$stateParams.cid == challenge._id')
div(ui-view)