From 5bd0459cc25183ecc779103fb56e14eb6707095d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 25 Mar 2020 13:35:54 +0200 Subject: Hide duplicate "Hide system messages" at Change Settings/Member Settings, because it's also on card slider. Thanks to notohiro and xet7 ! Closes #2837 --- client/components/users/userHeader.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'client/components/users/userHeader.jade') diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 9306d21d..1cd9da6b 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -98,12 +98,12 @@ template(name="changeLanguagePopup") template(name="changeSettingsPopup") ul.pop-over-list - li - a.js-toggle-system-messages - i.fa.fa-comments-o - | {{_ 'hide-system-messages'}} - if hiddenSystemMessages - i.fa.fa-check + //li + // a.js-toggle-system-messages + // i.fa.fa-comments-o + // | {{_ 'hide-system-messages'}} + // if hiddenSystemMessages + // i.fa.fa-check li a.js-toggle-desktop-drag-handles i.fa.fa-arrows -- cgit v1.2.3-1-g7c22 From 8e14459cff4da1391f536dfbc6441abb21e9c215 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 22 Apr 2020 14:44:08 +0200 Subject: Implement option to change the first day of week in user settings Implements #2535. --- client/components/users/userHeader.jade | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'client/components/users/userHeader.jade') diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 1cd9da6b..3747d882 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -117,6 +117,17 @@ template(name="changeSettingsPopup") | {{_ 'show-cards-minimum-count'}} input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") + li + label.bold + i.fa.fa-calendar + | {{_ 'start-day-of-week'}} + select#start-day-of-week.inline-input.left + each day in weekDays startDayOfWeek + if day.isSelected + option(selected="true", value="#{day.value}") #{day.name} + else + option(value="#{day.value}") #{day.name} + input.js-apply-start-day-of-week.left(type="submit" value="{{_ 'apply'}}") template(name="userDeletePopup") unless currentUser.isWorker -- cgit v1.2.3-1-g7c22 From 52f884f2b1bdbf89eeafc355129bb7bfdbe978fc Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 22 Apr 2020 19:42:10 +0200 Subject: Use only one 'Apply' button for applying the user settings --- client/components/users/userHeader.jade | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'client/components/users/userHeader.jade') diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 3747d882..d0adf29d 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -112,13 +112,11 @@ template(name="changeSettingsPopup") i.fa.fa-check unless currentUser.isWorker li - label.bold + label.bold.clear i.fa.fa-sort-numeric-asc | {{_ 'show-cards-minimum-count'}} input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") - input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") - li - label.bold + label.bold.clear i.fa.fa-calendar | {{_ 'start-day-of-week'}} select#start-day-of-week.inline-input.left @@ -127,7 +125,7 @@ template(name="changeSettingsPopup") option(selected="true", value="#{day.value}") #{day.name} else option(value="#{day.value}") #{day.name} - input.js-apply-start-day-of-week.left(type="submit" value="{{_ 'apply'}}") + input.js-apply-user-settings.left(type="submit" value="{{_ 'apply'}}") template(name="userDeletePopup") unless currentUser.isWorker -- cgit v1.2.3-1-g7c22