mirror of
https://github.com/wekan/wekan.git
synced 2025-09-22 01:50:48 +02:00
Moved Public/Archive/Templates/etc options to click right top username Member Settings menu, where My Cards also is.
Thanks to xet7 !
This commit is contained in:
parent
a0b72d0287
commit
0592b0c56a
6 changed files with 44 additions and 27 deletions
|
@ -60,10 +60,10 @@ template(name="boardList")
|
||||||
|
|
||||||
template(name="boardListHeaderBar")
|
template(name="boardListHeaderBar")
|
||||||
h1 {{_ title }}
|
h1 {{_ title }}
|
||||||
.board-header-btns.right
|
//.board-header-btns.right
|
||||||
a.board-header-btn.js-open-archived-board
|
// a.board-header-btn.js-open-archived-board
|
||||||
i.fa.fa-archive
|
// i.fa.fa-archive
|
||||||
span {{_ 'archives'}}
|
// span {{_ 'archives'}}
|
||||||
a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
|
// a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
|
||||||
i.fa.fa-clone
|
// i.fa.fa-clone
|
||||||
span {{_ 'templates'}}
|
// span {{_ 'templates'}}
|
||||||
|
|
|
@ -38,10 +38,10 @@ template(name="header")
|
||||||
span.fa.fa-home
|
span.fa.fa-home
|
||||||
| {{_ 'all-boards'}}
|
| {{_ 'all-boards'}}
|
||||||
li.separator -
|
li.separator -
|
||||||
li
|
//li
|
||||||
a(href="{{pathFor 'public'}}")
|
// a(href="{{pathFor 'public'}}")
|
||||||
span.fa.fa-globe
|
// span.fa.fa-globe
|
||||||
| {{_ 'public'}}
|
// | {{_ 'public'}}
|
||||||
each currentUser.starredBoards
|
each currentUser.starredBoards
|
||||||
li.separator -
|
li.separator -
|
||||||
li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
|
li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
|
||||||
|
|
|
@ -17,11 +17,12 @@ template(name="swimlaneFixedHeader")
|
||||||
unless currentUser.isCommentOnly
|
unless currentUser.isCommentOnly
|
||||||
if currentUser.isBoardAdmin
|
if currentUser.isBoardAdmin
|
||||||
a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
|
a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
|
||||||
a.fa.fa-navicon.js-open-swimlane-menu.swimlane-header-menu-icon
|
a.fa.fa-navicon.js-open-swimlane-menu
|
||||||
if isMiniScreenOrShowDesktopDragHandles
|
unless isMiniScreen
|
||||||
|
if showDesktopDragHandles
|
||||||
|
a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
|
||||||
|
if isMiniScreen
|
||||||
a.swimlane-header-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle
|
a.swimlane-header-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle
|
||||||
else
|
|
||||||
a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
|
|
||||||
|
|
||||||
template(name="editSwimlaneTitleForm")
|
template(name="editSwimlaneTitleForm")
|
||||||
.list-composer
|
.list-composer
|
||||||
|
|
|
@ -85,6 +85,7 @@
|
||||||
.swimlane-header-menu
|
.swimlane-header-menu
|
||||||
position: absolute
|
position: absolute
|
||||||
padding: 5px 5px
|
padding: 5px 5px
|
||||||
|
font-size: 22px
|
||||||
|
|
||||||
.swimlane-header-plus-icon
|
.swimlane-header-plus-icon
|
||||||
margin-left: 5px
|
margin-left: 5px
|
||||||
|
|
|
@ -12,11 +12,35 @@ template(name="headerUserBar")
|
||||||
|
|
||||||
template(name="memberMenuPopup")
|
template(name="memberMenuPopup")
|
||||||
ul.pop-over-list
|
ul.pop-over-list
|
||||||
|
if currentUser.isAdmin
|
||||||
|
li
|
||||||
|
a.js-go-setting(href="{{pathFor 'setting'}}")
|
||||||
|
i.fa.fa-lock
|
||||||
|
| {{_ 'admin-panel'}}
|
||||||
with currentUser
|
with currentUser
|
||||||
|
li
|
||||||
|
a(href="{{pathFor 'home'}}")
|
||||||
|
span.fa.fa-home
|
||||||
|
| {{_ 'all-boards'}}
|
||||||
li
|
li
|
||||||
a.js-my-cards(href="{{pathFor 'my-cards'}}")
|
a.js-my-cards(href="{{pathFor 'my-cards'}}")
|
||||||
i.fa.fa-list
|
i.fa.fa-list
|
||||||
| {{_ 'my-cards'}}
|
| {{_ 'my-cards'}}
|
||||||
|
li
|
||||||
|
a(href="{{pathFor 'public'}}")
|
||||||
|
span.fa.fa-globe
|
||||||
|
| {{_ 'public'}}
|
||||||
|
li
|
||||||
|
a.board-header-btn.js-open-archived-board
|
||||||
|
i.fa.fa-archive
|
||||||
|
span {{_ 'archives'}}
|
||||||
|
unless currentUser.isWorker
|
||||||
|
ul.pop-over-list
|
||||||
|
li
|
||||||
|
a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
|
||||||
|
i.fa.fa-clone
|
||||||
|
| {{_ 'templates'}}
|
||||||
|
hr
|
||||||
li
|
li
|
||||||
a.js-edit-profile
|
a.js-edit-profile
|
||||||
i.fa.fa-user
|
i.fa.fa-user
|
||||||
|
@ -38,18 +62,6 @@ template(name="memberMenuPopup")
|
||||||
a.js-change-language
|
a.js-change-language
|
||||||
i.fa.fa-flag
|
i.fa.fa-flag
|
||||||
| {{_ 'changeLanguagePopup-title'}}
|
| {{_ 'changeLanguagePopup-title'}}
|
||||||
if currentUser.isAdmin
|
|
||||||
li
|
|
||||||
a.js-go-setting(href="{{pathFor 'setting'}}")
|
|
||||||
i.fa.fa-lock
|
|
||||||
| {{_ 'admin-panel'}}
|
|
||||||
unless currentUser.isWorker
|
|
||||||
hr
|
|
||||||
ul.pop-over-list
|
|
||||||
li
|
|
||||||
a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
|
|
||||||
i.fa.fa-clone
|
|
||||||
| {{_ 'templates'}}
|
|
||||||
unless isSandstorm
|
unless isSandstorm
|
||||||
hr
|
hr
|
||||||
ul.pop-over-list
|
ul.pop-over-list
|
||||||
|
|
|
@ -28,6 +28,9 @@ Template.memberMenuPopup.events({
|
||||||
'click .js-my-cards'() {
|
'click .js-my-cards'() {
|
||||||
Popup.close();
|
Popup.close();
|
||||||
},
|
},
|
||||||
|
'click .js-open-archived-board'() {
|
||||||
|
Modal.open('archivedBoards');
|
||||||
|
},
|
||||||
'click .js-edit-profile': Popup.open('editProfile'),
|
'click .js-edit-profile': Popup.open('editProfile'),
|
||||||
'click .js-change-settings': Popup.open('changeSettings'),
|
'click .js-change-settings': Popup.open('changeSettings'),
|
||||||
'click .js-change-avatar': Popup.open('changeAvatar'),
|
'click .js-change-avatar': Popup.open('changeAvatar'),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue