summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2020-09-02 11:52:29 +0200
committerAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2020-09-02 15:22:39 +0200
commita4a9f0767d34c59083015fa036ac05b4d8515776 (patch)
treeb660a029aed7ff8edf920e6c24ddceb089f62d0a
parent9e8b1731a334bb1d07a071c44c368c5f77139cd4 (diff)
downloadwekan-a4a9f0767d34c59083015fa036ac05b4d8515776.tar.gz
wekan-a4a9f0767d34c59083015fa036ac05b4d8515776.tar.bz2
wekan-a4a9f0767d34c59083015fa036ac05b4d8515776.zip
Login: Add spline logo and accounts link
-rw-r--r--.meteor/packages1
-rw-r--r--.meteor/versions1
-rw-r--r--client/components/main/layouts.jade13
-rw-r--r--client/components/main/layouts.js2
-rw-r--r--public/spline.pngbin0 -> 3227 bytes
5 files changed, 14 insertions, 3 deletions
diff --git a/.meteor/packages b/.meteor/packages
index 82ac8a5a..539a4639 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -96,3 +96,4 @@ easylogic:summernote
cfs:filesystem
ostrio:cookies
tmeasday:check-npm-versions
+aldeed:template-extension
diff --git a/.meteor/versions b/.meteor/versions
index 54875c9f..10e9c431 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -6,6 +6,7 @@ aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.4
+aldeed:template-extension@4.1.0
allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2
audit-argument-checks@1.0.7
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 08dfc58c..f8e84b93 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -19,10 +19,12 @@ head
template(name="userFormsLayout")
section.auth-layout
- section.auth-dialog
- if isLoading
+ if isLoading
+ section.auth-dialog
+loader
- else
+ else
+ img.at-form-landing-logo(src="/spline.png")
+ section.auth-dialog
+Template.dynamic(template=content)
if currentSetting.displayAuthenticationMethod
+connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
@@ -34,6 +36,11 @@ template(name="userFormsLayout")
else
option(value="{{tag}}") {{name}}
+template(name="overrideAtTitle")
+ div.at-title
+ h3 {{title}} {{t9n 'with'}}
+ a.at-link(href="https://accounts.spline.de") spline account
+
template(name="defaultLayout")
+header
#content
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index f51b03c3..bd0e7a21 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -114,6 +114,8 @@ Template.userFormsLayout.events({
},
});
+Template.overrideAtTitle.replaces('atTitle');
+
Template.defaultLayout.events({
'click .js-close-modal': () => {
Modal.close();
diff --git a/public/spline.png b/public/spline.png
new file mode 100644
index 00000000..2b93b5f0
--- /dev/null
+++ b/public/spline.png
Binary files differ