mirror of
https://github.com/wekan/wekan.git
synced 2025-12-21 09:50:13 +01:00
"Auto List Width" is now at "List ☰ Set Width" popup.
Thanks to xet7 ! Fixes https://github.com/wekan/wekan/pull/5628
This commit is contained in:
parent
14c9b70149
commit
a862486ec3
5 changed files with 20 additions and 21 deletions
|
|
@ -23,10 +23,6 @@ template(name="boardHeaderBar")
|
||||||
span
|
span
|
||||||
= currentBoard.stars
|
= currentBoard.stars
|
||||||
|
|
||||||
a.board-header-btn.js-auto-width-board(
|
|
||||||
title="{{#if isAutoWidth}}{{_ 'click-to-disable-auto-width'}}{{else}}{{_ 'click-to-enable-auto-width'}}{{/if}}")
|
|
||||||
i.fa(class="fa-solid fa-{{#if isAutoWidth}}compress{{else}}expand{{/if}}")
|
|
||||||
|
|
||||||
a.board-header-btn.js-keyboard-shortcuts-toggle(
|
a.board-header-btn.js-keyboard-shortcuts-toggle(
|
||||||
title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
|
title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
|
||||||
i.fa(class="fa-solid fa-keyboard")
|
i.fa(class="fa-solid fa-keyboard")
|
||||||
|
|
@ -75,10 +71,6 @@ template(name="boardHeaderBar")
|
||||||
span
|
span
|
||||||
= currentBoard.stars
|
= currentBoard.stars
|
||||||
|
|
||||||
a.board-header-btn.js-auto-width-board(
|
|
||||||
title="{{#if isAutoWidth}}{{_ 'click-to-disable-auto-width'}}{{else}}{{_ 'click-to-enable-auto-width'}}{{/if}}")
|
|
||||||
i.fa(class="fa-solid fa-{{#if isAutoWidth}}compress{{else}}expand{{/if}}")
|
|
||||||
|
|
||||||
a.board-header-btn.js-keyboard-shortcuts-toggle(
|
a.board-header-btn.js-keyboard-shortcuts-toggle(
|
||||||
title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
|
title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
|
||||||
i.fa(class="fa-solid fa-keyboard")
|
i.fa(class="fa-solid fa-keyboard")
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,6 @@ BlazeComponent.extendComponent({
|
||||||
return user && user.hasStarred(boardId);
|
return user && user.hasStarred(boardId);
|
||||||
},
|
},
|
||||||
|
|
||||||
isAutoWidth() {
|
|
||||||
const boardId = Utils.getCurrentBoardId();
|
|
||||||
const user = ReactiveCache.getCurrentUser();
|
|
||||||
return user && user.isAutoWidth(boardId);
|
|
||||||
},
|
|
||||||
|
|
||||||
isKeyboardShortcuts() {
|
isKeyboardShortcuts() {
|
||||||
const user = ReactiveCache.getCurrentUser();
|
const user = ReactiveCache.getCurrentUser();
|
||||||
return user && user.isKeyboardShortcuts();
|
return user && user.isKeyboardShortcuts();
|
||||||
|
|
@ -83,10 +77,6 @@ BlazeComponent.extendComponent({
|
||||||
'click .js-star-board'() {
|
'click .js-star-board'() {
|
||||||
ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
|
ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
|
||||||
},
|
},
|
||||||
'click .js-auto-width-board'() {
|
|
||||||
dragscroll.reset();
|
|
||||||
ReactiveCache.getCurrentUser().toggleAutoWidth(Utils.getCurrentBoardId());
|
|
||||||
},
|
|
||||||
'click .js-keyboard-shortcuts-toggle'() {
|
'click .js-keyboard-shortcuts-toggle'() {
|
||||||
ReactiveCache.getCurrentUser().toggleKeyboardShortcuts();
|
ReactiveCache.getCurrentUser().toggleKeyboardShortcuts();
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -194,6 +194,11 @@ template(name="setListWidthPopup")
|
||||||
input.list-constraint-value(type="number" value="{{ listConstraintValue }}" min="100")
|
input.list-constraint-value(type="number" value="{{ listConstraintValue }}" min="100")
|
||||||
input.list-width-apply(type="submit" value="{{_ 'apply'}}")
|
input.list-width-apply(type="submit" value="{{_ 'apply'}}")
|
||||||
input.list-width-error
|
input.list-width-error
|
||||||
|
br
|
||||||
|
a.js-auto-width-board(
|
||||||
|
title="{{#if isAutoWidth}}{{_ 'click-to-disable-auto-width'}}{{else}}{{_ 'click-to-enable-auto-width'}}{{/if}}")
|
||||||
|
i.fa(class="fa-solid fa-{{#if isAutoWidth}}compress{{else}}expand{{/if}}")
|
||||||
|
span {{_ 'auto-list-width'}}
|
||||||
|
|
||||||
template(name="listWidthErrorPopup")
|
template(name="listWidthErrorPopup")
|
||||||
.list-width-invalid
|
.list-width-invalid
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { ReactiveCache } from '/imports/reactiveCache';
|
import { ReactiveCache } from '/imports/reactiveCache';
|
||||||
import { TAPi18n } from '/imports/i18n';
|
import { TAPi18n } from '/imports/i18n';
|
||||||
|
import dragscroll from '@wekanteam/dragscroll';
|
||||||
|
|
||||||
let listsColors;
|
let listsColors;
|
||||||
Meteor.startup(() => {
|
Meteor.startup(() => {
|
||||||
|
|
@ -155,7 +156,7 @@ Template.listActionPopup.helpers({
|
||||||
|
|
||||||
isWatching() {
|
isWatching() {
|
||||||
return this.findWatcher(Meteor.userId());
|
return this.findWatcher(Meteor.userId());
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Template.listActionPopup.events({
|
Template.listActionPopup.events({
|
||||||
|
|
@ -377,9 +378,19 @@ BlazeComponent.extendComponent({
|
||||||
return ReactiveCache.getCurrentUser().getListConstraint(board, list._id);
|
return ReactiveCache.getCurrentUser().getListConstraint(board, list._id);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isAutoWidth() {
|
||||||
|
const boardId = Utils.getCurrentBoardId();
|
||||||
|
const user = ReactiveCache.getCurrentUser();
|
||||||
|
return user && user.isAutoWidth(boardId);
|
||||||
|
},
|
||||||
|
|
||||||
events() {
|
events() {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
|
'click .js-auto-width-board'() {
|
||||||
|
dragscroll.reset();
|
||||||
|
ReactiveCache.getCurrentUser().toggleAutoWidth(Utils.getCurrentBoardId());
|
||||||
|
},
|
||||||
'click .list-width-apply': this.applyListWidth,
|
'click .list-width-apply': this.applyListWidth,
|
||||||
'click .list-width-error': Popup.open('listWidthError'),
|
'click .list-width-error': Popup.open('listWidthError'),
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -266,8 +266,9 @@
|
||||||
"checklists": "Checklists",
|
"checklists": "Checklists",
|
||||||
"click-to-star": "Click to star this board.",
|
"click-to-star": "Click to star this board.",
|
||||||
"click-to-unstar": "Click to unstar this board.",
|
"click-to-unstar": "Click to unstar this board.",
|
||||||
"click-to-enable-auto-width": "Click to enable auto list width.",
|
"click-to-enable-auto-width": "Auto list width disabled. Click to enable.",
|
||||||
"click-to-disable-auto-width": "Click to disable auto list width.",
|
"click-to-disable-auto-width": "Auto list width enabled. Click to disable.",
|
||||||
|
"auto-list-width": "Auto list width",
|
||||||
"clipboard": "Clipboard or drag & drop",
|
"clipboard": "Clipboard or drag & drop",
|
||||||
"close": "Close",
|
"close": "Close",
|
||||||
"close-board": "Close Board",
|
"close-board": "Close Board",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue