From 25b63cfacd40747e3baef43a645a644ce60565e5 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 23:37:54 +0530 Subject: [PATCH 1/2] Made daniel's text in the inn based on current rest status of the user. --- website/views/options/social/tavern.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index 54657ecff8..768f746e74 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -14,14 +14,14 @@ h3.popover-title a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel') .popover-content - =env.t('danielText') + span(ng-hide='user.preferences.sleep')=env.t('danielText') + span(ng-show='user.preferences.sleep')=env.t('innText',{name:"{{user.profile.name}}"}) div button.btn.btn-lg.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})') span(ng-show='user.preferences.sleep')=env.t('innCheckOut') span(ng-hide='user.preferences.sleep')=env.t('innCheckIn') - =env.t('danielText2') - .alert.alert-info(ng-show='user.preferences.sleep') - =env.t('innText',{name:"{{user.profile.name}}"}) + span(ng-hide='user.preferences.sleep')=env.t('danielText2') + // Resources .panel.panel-default From d482fdcea5b458a0453a8b0f03ef6746b7bedac5 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 5 May 2015 19:45:05 -0500 Subject: [PATCH 2/2] Refactor tavern view --- website/views/options/social/tavern.jade | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index 768f746e74..bfe065697a 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -14,13 +14,10 @@ h3.popover-title a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel') .popover-content - span(ng-hide='user.preferences.sleep')=env.t('danielText') - span(ng-show='user.preferences.sleep')=env.t('innText',{name:"{{user.profile.name}}"}) - div - button.btn.btn-lg.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})') - span(ng-show='user.preferences.sleep')=env.t('innCheckOut') - span(ng-hide='user.preferences.sleep')=env.t('innCheckIn') - span(ng-hide='user.preferences.sleep')=env.t('danielText2') + | {{user.preferences.sleep ? env.t('innText',{name: user.profile.name}) : env.t('danielText')}} + button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})') + | {{user.preferences.sleep ? env.t('innCheckOut') : env.t('innCheckIn')}} + span(ng-if='!user.preferences.sleep')=env.t('danielText2') // Resources