diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:26:48 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:26:48 +0200 |
commit | 4a77bc930fdf8e9d951a8d1aa8395f79dc014655 (patch) | |
tree | b4219c1ac395ea9838ca18d39f34d279639a14d4 /client/components/main | |
parent | 8d512451610677ab668de596f4b13d0473b47cdc (diff) | |
parent | 29c3080eb6b925e0fe8308b721dca25cbeb34e73 (diff) | |
download | wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.tar.gz wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.tar.bz2 wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.zip |
Merge branch 'devel' into edge
Diffstat (limited to 'client/components/main')
-rw-r--r-- | client/components/main/header.jade | 65 | ||||
-rw-r--r-- | client/components/main/layouts.jade | 6 |
2 files changed, 33 insertions, 38 deletions
diff --git a/client/components/main/header.jade b/client/components/main/header.jade index e21ce096..c0781303 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -4,39 +4,38 @@ template(name="header") list all starred boards with a link to go there. This is inspired by the Reddit "subreddit" bar. The first link goes to the boards page. - unless isSandstorm - if currentUser - #header-quick-access(class=currentBoard.colorClass) - if isMiniScreen - ul - li - a(href="{{pathFor 'home'}}") - span.fa.fa-home + if currentUser + #header-quick-access(class=currentBoard.colorClass) + if isMiniScreen + ul + li + a(href="{{pathFor 'home'}}") + span.fa.fa-home - if currentList - each currentBoard.lists - li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}") - a.js-select-list - = title - #header-new-board-icon - else - ul - li - a(href="{{pathFor 'home'}}") - span.fa.fa-home - | {{_ 'all-boards'}} - each currentUser.starredBoards - li.separator - - li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") - a(href="{{pathFor 'board' id=_id slug=slug}}") + if currentList + each currentBoard.lists + li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}") + a.js-select-list = title - else - li.current {{_ 'quick-access-description'}} + #header-new-board-icon + else + ul + li + a(href="{{pathFor 'home'}}") + span.fa.fa-home + | {{_ 'all-boards'}} + each currentUser.starredBoards + li.separator - + li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") + a(href="{{pathFor 'board' id=_id slug=slug}}") + = title + else + li.current {{_ 'quick-access-description'}} - a#header-new-board-icon.js-create-board - i.fa.fa-plus(title="Create a new board") + a#header-new-board-icon.js-create-board + i.fa.fa-plus(title="Create a new board") - +headerUserBar + +headerUserBar #header(class=currentBoard.colorClass) //- @@ -52,13 +51,9 @@ template(name="header") On sandstorm, the logo shouldn't be clickable, because we only have one page/document on it, and we don't want to see the home page containing the list of all boards. - if isSandstorm - .wekan-logo + unless currentSetting.hideLogo + a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") - else - unless currentSetting.hideLogo - a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") - img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") if appIsOffline +offlineWarning diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index f2c40b9f..50585aa4 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -14,13 +14,13 @@ head template(name="userFormsLayout") section.auth-layout - unless currentSetting.hideLogo - h1.at-form-landing-logo - img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") if currentSetting.hideLogo h1 br br + else + h1.at-form-landing-logo + img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") section.auth-dialog +Template.dynamic(template=content) if currentSetting.displayAuthenticationMethod |