sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-02 20:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minification fix hide features (#8544)

Browse source 
* Added minification fix

* Hid settings for features we will not release yet

* Hid repeatables UI

* Removed extra file

* Removed repeats every from weekly

* Added start date back

* Hid counter reset when advance is collpased
This commit is contained in:
Keith Holliday 2017-03-08 18:50:57 -07:00 committed by GitHub
parent 1082359f2c
commit 11c8f2a775
5 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/client-old/js/controllers/tasksCtrl.js
View file

@ -43,9 +43,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
$modal.open({
templateUrl: 'modals/task-notes.html',
controller: function ($scope, task) {
controller: ['$scope', 'task', function ($scope, task) {
$scope.task = task;
},
}],
resolve: {
task: function() {
return task;

14
website/views/options/settings/settings.jade
View file

@ -1,4 +1,4 @@
script(type='text/ng-template', id='partials/options.settings.settings.html')
script(type='text/ng-template', id='partials/options.settings.settings.html')
.container-fluid
.row
.personal-options.col-md-6
@ -64,13 +64,13 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
.checkbox
label=env.t('suppressStreakModal')
input(type='checkbox', ng-model='user.preferences.suppressModals.streak', ng-change='set({"preferences.suppressModals.streak": user.preferences.suppressModals.streak?true: false})')
.checkbox
label=env.t('confirmScoreNotes')
input(type='checkbox', ng-model='user.preferences.tasks.confirmScoreNotes', ng-change='set({"preferences.tasks.confirmScoreNotes": user.preferences.tasks.confirmScoreNotes ? true: false})')
//- .checkbox
//- label=env.t('confirmScoreNotes')
//- input(type='checkbox', ng-model='user.preferences.tasks.confirmScoreNotes', ng-change='set({"preferences.tasks.confirmScoreNotes": user.preferences.tasks.confirmScoreNotes ? true: false})')
.checkbox
label=env.t('groupTasksByChallenge')
input(type='checkbox', ng-model='user.preferences.tasks.groupByChallenge', ng-change='set({"preferences.tasks.groupByChallenge": user.preferences.tasks.groupByChallenge ? true: false})')
//- .checkbox
//- label=env.t('groupTasksByChallenge')
//- input(type='checkbox', ng-model='user.preferences.tasks.groupByChallenge', ng-change='set({"preferences.tasks.groupByChallenge": user.preferences.tasks.groupByChallenge ? true: false})')
hr

4
website/views/shared/tasks/edit/dailies/repeat_options.jade
View file

@ -1,9 +1,7 @@
.form-group
.form-group(ng-if='task._edit.frequency !== "weekly"')
legend.option-title
span.hint(popover-trigger='mouseenter', popover-title=env.t('repeatHelpTitle'),
popover='{{env.t(task._edit.frequency + "RepeatHelpContent")}}')=env.t('repeatEvery')
// If frequency is daily
ng-form.form-group(name='everyX')
.input-group
input.form-control(type='number', ng-model='task._edit.everyX', min='0', ng-disabled='!canEdit(task)', required)

2
website/views/shared/tasks/edit/habits/frequency.jade
View file

@ -1,4 +1,4 @@
fieldset.option-group.counter_period(ng-if='task.type === "habit" && canEdit(task)')
fieldset.option-group.counter_period(ng-if='task.type === "habit" && canEdit(task) && task._edit._advanced')
.form-group
legend.option-title=env.t('counterPeriod')
select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')

23
website/views/shared/tasks/edit/repeatables.jade
View file

@ -2,22 +2,21 @@ fieldset.option-group.advanced-option(ng-show="task.type === 'daily'")
legend.option-title
span.hint(popover-title=env.t('startDateHelpTitle'), popover=env.t("startDateHelp"), popover-trigger='mouseenter')
=env.t('startDate')
input.form-control(type='text', ng-model='task._edit.startDate',
datepicker-popup='{{::user.preferences.dateFormat}}', is-open='datepickerOpened',
ng-click='datepickerOpened = true', ng-disabled='!canEdit(task)')
br
select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
option(value='daily')=env.t('daily')
option(value='weekly')=env.t('weekly')
option(value='monthly')=env.t('monthly')
option(value='yearly')=env.t('yearly')
//- select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
//- option(value='weekly')=env.t('repeatWeek')
//- option(value='daily')=env.t('repeatDays')
//- option(value='daily')=env.t('daily')
//- option(value='weekly')=env.t('weekly')
//- option(value='monthly')=env.t('monthly')
//- option(value='yearly')=env.t('yearly')
select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
option(value='weekly')=env.t('repeatWeek')
option(value='daily')=env.t('repeatDays')
include ./dailies/repeat_options
@ -30,6 +29,6 @@ fieldset.option-group.advanced-option(ng-show="task.type === 'daily'")
input(type="radio", ng-model='task._edit.repeatsOn', value='dayOfWeek')
=env.t('dayOfWeek')
.form-group
legend.option-title=env.t('summary')
div {{summary}}
//- .form-group
//- legend.option-title=env.t('summary')
//- div {{summary}}