mirror of
https://github.com/wekan/wekan.git
synced 2026-02-04 07:31:47 +01:00
Merge remote-tracking branch 'origin/feature-accessibility'
This commit is contained in:
commit
a4ec20a7c8
143 changed files with 784 additions and 140 deletions
74
client/components/main/accessibility.css
Normal file
74
client/components/main/accessibility.css
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
.my-cards-board-wrapper {
|
||||
border-radius: 0 0 4px 4px;
|
||||
min-width: 400px;
|
||||
margin-bottom: 2rem;
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
border-width: 2px;
|
||||
border-style: solid;
|
||||
border-color: #a2a2a2;
|
||||
}
|
||||
.my-cards-board-title {
|
||||
font-size: 1.4rem;
|
||||
font-weight: bold;
|
||||
padding: 0.5rem;
|
||||
background-color: #808080;
|
||||
color: #fff;
|
||||
}
|
||||
.my-cards-swimlane-title {
|
||||
font-size: 1.1rem;
|
||||
font-weight: bold;
|
||||
padding: 0.5rem;
|
||||
padding-bottom: 0.4rem;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
text-align: center;
|
||||
}
|
||||
.swimlane-default-color {
|
||||
background-color: #d3d3d3;
|
||||
}
|
||||
.my-cards-list-title {
|
||||
font-weight: bold;
|
||||
font-size: 1.1rem;
|
||||
text-align: center;
|
||||
margin-bottom: 0.7rem;
|
||||
}
|
||||
.my-cards-list-wrapper {
|
||||
margin: 1rem;
|
||||
border-radius: 5px;
|
||||
display: inline-grid;
|
||||
min-width: 250px;
|
||||
max-width: 350px;
|
||||
}
|
||||
.my-cards-card-wrapper {
|
||||
margin-top: 0;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.my-cards-dueat-list-wrapper {
|
||||
max-width: 500px;
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
}
|
||||
.my-cards-board-table thead {
|
||||
border-bottom: 3px solid #4d4d4d;
|
||||
background-color: transparent;
|
||||
}
|
||||
.my-cards-board-table th,
|
||||
.my-cards-board-table td {
|
||||
border: 0;
|
||||
}
|
||||
.my-cards-board-table tr {
|
||||
border-bottom: 2px solid #a2a2a2;
|
||||
}
|
||||
.my-cards-card-title-table {
|
||||
font-weight: bold;
|
||||
padding-left: 2px;
|
||||
max-width: 243px;
|
||||
}
|
||||
.my-cards-board-badge {
|
||||
width: 36px;
|
||||
height: 24px;
|
||||
float: left;
|
||||
border-radius: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
8
client/components/main/accessibility.jade
Normal file
8
client/components/main/accessibility.jade
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
template(name="accessibilityHeaderBar")
|
||||
if currentUser
|
||||
h1
|
||||
| {{_ 'accessibility-title'}}
|
||||
|
||||
template(name="accessibility")
|
||||
if currentUser
|
||||
| {{_ 'accessibility-content'}}
|
||||
11
client/components/main/accessibility.js
Normal file
11
client/components/main/accessibility.js
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
import { ReactiveCache } from '/imports/reactiveCache';
|
||||
import { TAPi18n } from '/imports/i18n';
|
||||
|
||||
BlazeComponent.extendComponent({
|
||||
onCreated() {
|
||||
this.error = new ReactiveVar('');
|
||||
this.loading = new ReactiveVar(false);
|
||||
|
||||
Meteor.subscribe('setting');
|
||||
},
|
||||
}).register('accessibility');
|
||||
|
|
@ -72,26 +72,31 @@
|
|||
padding: 0 0.5rem;
|
||||
}
|
||||
.setting-content .content-body .main-body ul li .admin-announcement,
|
||||
.setting-content .content-body .main-body ul li .admin-accessibility,
|
||||
.setting-content .content-body .main-body ul li .invite-people,
|
||||
.setting-content .content-body .main-body ul li .layout {
|
||||
padding-left: 20px;
|
||||
}
|
||||
.setting-content .content-body .main-body ul li .admin-announcement li,
|
||||
.setting-content .content-body .main-body ul li .admin-accessibility li,
|
||||
.setting-content .content-body .main-body ul li .invite-people li,
|
||||
.setting-content .content-body .main-body ul li .layout li {
|
||||
min-width: 500px;
|
||||
}
|
||||
.setting-content .content-body .main-body ul li .admin-announcement li ul.no-margin-bottom,
|
||||
.setting-content .content-body .main-body ul li .admin-accessibility li ul.no-margin-bottom,
|
||||
.setting-content .content-body .main-body ul li .invite-people li ul.no-margin-bottom,
|
||||
.setting-content .content-body .main-body ul li .layout li ul.no-margin-bottom {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.setting-content .content-body .main-body ul li .admin-announcement li .bg-white a,
|
||||
.setting-content .content-body .main-body ul li .admin-accessibility li .bg-white a,
|
||||
.setting-content .content-body .main-body ul li .invite-people li .bg-white a,
|
||||
.setting-content .content-body .main-body ul li .layout li .bg-white a {
|
||||
background: #f7f7f7;
|
||||
}
|
||||
.setting-content .content-body .main-body ul li .admin-announcement li .bg-white a.is-checked,
|
||||
.setting-content .content-body .main-body ul li .admin-accessibility li .bg-white a.is-checked,
|
||||
.setting-content .content-body .main-body ul li .invite-people li .bg-white a.is-checked,
|
||||
.setting-content .content-body .main-body ul li .layout li .bg-white a.is-checked {
|
||||
background: #fff;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ template(name="setting")
|
|||
a.js-setting-menu(data-id="announcement-setting")
|
||||
i.fa.fa-bullhorn
|
||||
| {{_ 'admin-announcement'}}
|
||||
li
|
||||
a.js-setting-menu(data-id="accessibility-setting")
|
||||
i.fa.fa-universal-access
|
||||
| {{_ 'accessibility'}}
|
||||
li
|
||||
a.js-setting-menu(data-id="layout-setting")
|
||||
i.fa.fa-object-group
|
||||
|
|
@ -52,6 +56,8 @@ template(name="setting")
|
|||
+tableVisibilityModeSettings
|
||||
else if announcementSetting.get
|
||||
+announcementSettings
|
||||
else if accessibilitySetting.get
|
||||
+accessibilitySettings
|
||||
else if layoutSetting.get
|
||||
+layoutSettings
|
||||
else if webhookSetting.get
|
||||
|
|
@ -181,6 +187,29 @@ template(name='announcementSettings')
|
|||
li
|
||||
button.js-announcement-save.primary {{_ 'save'}}
|
||||
|
||||
template(name='accessibilitySettings')
|
||||
ul#accessibility-setting.setting-detail
|
||||
li
|
||||
a.flex.js-toggle-accessibility
|
||||
.materialCheckBox(class="{{#if currentAccessibility.enabled}}is-checked{{/if}}")
|
||||
|
||||
span {{_ 'admin-accessibility-active'}}
|
||||
li
|
||||
.title {{_ 'accessibility-title'}}
|
||||
.form-group
|
||||
input.wekan-form-control#accessibility-title(type="text", placeholder="" value="{{currentSetting.accessibilityTitle}}")
|
||||
li
|
||||
.accessibility-content(class="{{#if currentAccessibility.enabled}}{{else}}hide{{/if}}")
|
||||
ul
|
||||
li
|
||||
.title {{_ 'admin-accessibility-title'}}
|
||||
textarea#admin-accessibility.wekan-form-control= currentAccessibility.accessibilityTitle
|
||||
li
|
||||
.title {{_ 'admin-accessibility-content'}}
|
||||
textarea#admin-accessibility.wekan-form-control= currentAccessibility.accessibilityContent
|
||||
li
|
||||
button.js-accessibility-save.primary {{_ 'save'}}
|
||||
|
||||
template(name='layoutSettings')
|
||||
ul#layout-setting.setting-detail
|
||||
li
|
||||
|
|
|
|||
|
|
@ -89,6 +89,9 @@ BlazeComponent.extendComponent({
|
|||
toggleHideBoardMemberList() {
|
||||
$('#hide-board-member-list').toggleClass('is-checked');
|
||||
},
|
||||
toggleAccessibilityPageEnabled() {
|
||||
$('#accessibility-page-enabled').toggleClass('is-checked');
|
||||
},
|
||||
toggleDisplayAuthenticationMethod() {
|
||||
$('#display-authentication-method').toggleClass('is-checked');
|
||||
},
|
||||
|
|
@ -239,7 +242,13 @@ BlazeComponent.extendComponent({
|
|||
const displayAuthenticationMethod =
|
||||
$('input[name=displayAuthenticationMethod]:checked').val() === 'true';
|
||||
const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
|
||||
|
||||
const accessibilityPageEnabled = $('input[name=accessibilityPageEnabled]:checked').val() === 'true';
|
||||
const accessibilityTitle = $('#accessibility-title')
|
||||
.val()
|
||||
.trim();
|
||||
const accessibilityContent = $('#accessibility-content')
|
||||
.val()
|
||||
.trim();
|
||||
const spinnerName = $('#spinnerName').val();
|
||||
|
||||
try {
|
||||
|
|
@ -263,6 +272,9 @@ BlazeComponent.extendComponent({
|
|||
oidcBtnText,
|
||||
mailDomainName,
|
||||
legalNotice,
|
||||
accessibilityPageEnabled,
|
||||
accessibilityTitle,
|
||||
accessibilityContent,
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
|
|
@ -301,6 +313,7 @@ BlazeComponent.extendComponent({
|
|||
'click a.js-toggle-hide-logo': this.toggleHideLogo,
|
||||
'click a.js-toggle-hide-card-counter-list': this.toggleHideCardCounterList,
|
||||
'click a.js-toggle-hide-board-member-list': this.toggleHideBoardMemberList,
|
||||
'click a.js-toggle-accessibility-page-enabled': this.toggleAccessibilityPageEnabled,
|
||||
'click button.js-save-layout': this.saveLayout,
|
||||
'click a.js-toggle-display-authentication-method': this
|
||||
.toggleDisplayAuthenticationMethod,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue