Merge branch 'devel' of https://github.com/ppoulard/wekan into ppoulard-devel

This commit is contained in:
Lauri Ojansivu 2018-07-05 23:22:57 +03:00
commit b1b9170afe
6 changed files with 24 additions and 0 deletions

View file

@ -85,3 +85,4 @@ browser-policy
eluck:accounts-lockout
rzymek:fullcalendar
momentjs:moment@2.22.2
atoy40:accounts-cas

View file

@ -9,6 +9,7 @@ aldeed:simple-schema@1.5.3
alethes:pages@1.8.6
allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2
atoy40:accounts-cas@0.0.2
audit-argument-checks@1.0.7
autoupdate@1.3.12
babel-compiler@6.24.7

View file

@ -17,6 +17,9 @@ template(name="userFormsLayout")
img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
section.auth-dialog
+Template.dynamic(template=content)
if isCas
.at-form
button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
div.at-form-lang
select.select-lang.js-userform-set-language
each languages

View file

@ -39,6 +39,16 @@ Template.userFormsLayout.helpers({
const curLang = T9n.getLanguage() || 'en';
return t9nTag === curLang;
},
isCas() {
return Meteor.settings.public &&
Meteor.settings.public.cas &&
Meteor.settings.public.cas.loginUrl;
},
casSignInLabel() {
return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
},
});
Template.userFormsLayout.events({
@ -47,6 +57,13 @@ Template.userFormsLayout.events({
T9n.setLanguage(i18nTagToT9n(i18nTag));
evt.preventDefault();
},
'click button#cas'() {
Meteor.loginWithCas(function() {
if (FlowRouter.getRouteName() === 'atSignIn') {
FlowRouter.go('/');
}
});
},
});
Template.defaultLayout.events({

View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn" : "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
settings.json Normal file
View file

@ -0,0 +1 @@
{}