diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 0e683a91a4..885eb9dddc 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -77,5 +77,6 @@ "streakCoins": "Streak Bonus!", "pushTaskToTop": "Push task to top", "pushTaskToBottom": "Push task to bottom", - "emptyTask": "Enter the task's title first." + "emptyTask": "Enter the task's title first.", + "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies." } diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl index 59ea60e0e7..59cd9271c4 100644 --- a/website/public/css/tasks.styl +++ b/website/public/css/tasks.styl @@ -188,6 +188,11 @@ for $stage in $stages .empty-task-notification height: 100%; +// message in Dailies column when Resting in Inn +// ------------------------ +.dailiesRestingInInn + clear: both + // an individual task entry // ------------------------ .task diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade index 6e4bb99574..99be13b414 100644 --- a/website/views/shared/tasks/lists.jade +++ b/website/views/shared/tasks/lists.jade @@ -70,6 +70,8 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") span(ng-if='!list.bulk')=env.t('addmultiple') span(ng-if='list.bulk')=env.t('addsingle') + div.dailiesRestingInInn(ng-if='::list.type == "daily" && user.preferences.sleep')=env.t('dailiesRestingInInn') + mixin taskColumnTabs(position) // Habits Tabs div(ng-if='::main && list.type=="habit"', class='tabbable tabs-below')