From aa38894529d883ea3a588e5aa87969501c0c149e Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Mon, 24 Feb 2020 16:07:07 +0000
Subject: [PATCH] Re-add some missing resources but now in Twig assets dir
post.* has been added directly under assets for now, tried it
via webpack but this added a several times overhead to these
very small files, so this seemed the cleanest solution for now.
But might be improved upon.
---
.gitignore | 2 ++
templates/_footer.twig | 2 +-
templates/base.twig | 2 +-
templates/post.twig | 6 +++---
www/assets/css/post.css | 3 +++
www/assets/icons/favicon.ico | Bin 0 -> 1150 bytes
www/assets/icons/ssplogo-fish-small.png | Bin 0 -> 3012 bytes
www/assets/js/post.js | 7 +++++++
8 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 www/assets/css/post.css
create mode 100644 www/assets/icons/favicon.ico
create mode 100644 www/assets/icons/ssplogo-fish-small.png
create mode 100644 www/assets/js/post.js
diff --git a/.gitignore b/.gitignore
index d5e68ae74..7c2145f7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@
/cert/
/www/assets/fonts/*
/www/assets/js/*.js
+!/www/assets/js/post.js
/www/assets/js/*.map
/www/assets/css/*.css
+!/www/assets/css/post.css
/www/assets/css/*.map
.phpunit.result.cache
diff --git a/templates/_footer.twig b/templates/_footer.twig
index 5cfb974b9..7a6705b9c 100644
--- a/templates/_footer.twig
+++ b/templates/_footer.twig
@@ -4,7 +4,7 @@
</div>
<div class="logo-footer-right show-for-large">
<div class="logo-footer">
- <img class="pure-img" src="/{{ baseurlpath }}resources/icons/ssplogo-fish-small.png" alt="Small fish logo">
+ <img class="pure-img" src="{{ asset("icons/ssplogo-fish-small.png") }}" alt="Small fish logo">
</div>
</div>
</div>
diff --git a/templates/base.twig b/templates/base.twig
index ea464b7ca..8c8f6c012 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1.0">
<title>{{ pagetitle }}</title>
<link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}">
- <link rel="icon" href="/{{ baseurlpath }}resources/icons/favicon.ico">
+ <link rel="icon" href="{{ asset("icons/favicon.ico") }}">
{% if isRTL %}
<link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}">
{% endif %}
diff --git a/templates/post.twig b/templates/post.twig
index a11c56a18..c297d5500 100644
--- a/templates/post.twig
+++ b/templates/post.twig
@@ -4,10 +4,10 @@
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'">
- <link rel="icon" href="/{{ baseurlpath }}resources/icons/favicon.ico">
+ <link rel="icon" href="{{ asset("icons/favicon.ico") }}">
<title>{% trans %}Sending message{% endtrans %}</title>
- <link rel="stylesheet" href="/{{ baseurlpath }}resources/post.css">
- <script src="/{{ baseurlpath }}resources/post.js"></script>
+ <link rel="stylesheet" href="{{ asset("css/post.css") }}">
+ <script src="{{ asset("js/post.js") }}"></script>
</head>
<body>
<form method="post" action="{{ destination }}">
diff --git a/www/assets/css/post.css b/www/assets/css/post.css
new file mode 100644
index 000000000..3f8684c70
--- /dev/null
+++ b/www/assets/css/post.css
@@ -0,0 +1,3 @@
+input#postLoginSubmitButton {
+ display:none;
+}
diff --git a/www/assets/icons/favicon.ico b/www/assets/icons/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ddded01e615a2a4cf9ff0e335dd23e5e19d0f09c
GIT binary patch
literal 1150
zcmbu7&1)J#7{({Met)ekHex`7homP@frwB_4t|^p1;I;m&&9u>|3D6fo;;QO6`sUP
z@KTf<#ES<p2zshmG_ze@Klbf2QEan}r;I#~^UUvgcjp}$JHkg*8NN^1jl$SF#@KrZ
z7M!h*Njiv#9TEa>p)b%ibbN@D`QZI-w|kP!W_h7d;4YWz30_3T$~>@Fi9~|WW-}5>
zCX*unLB`5Fux>?BjBd9}?RJ|S4u=lUD`Tx5IA0(T=%i99Z9E>+WHO;#F2}uI?-+Y$
zR$i<zqBfiDE9MNcKZ?cTe7RiGYPBLw)2LFZnE8C(3<iT8Fg9xqzu*5@DwT|QJkDdW
zm_D6Ofow;)TwY-RXE+>wz?sB3lGxeb8`f{o>xF5W&w<TmvrBHLUGFYLM)quY3hqZA
zjYiaLHmP2(zsP4YnHiW8bOL=6b*xfV^%gx|`Fy@#9*>7N8jXF8TCHZHC%WBkU!zAG
z)QDU2VvQmGvPaP8NF<`STCIJJYPCw~bb5~Z-(*><hi6^mOp9KxM}xtDoKEKw*;~|h
zT3Oi|+%e8E=bV#a7=+%7zMsojnFsbV8jb!L4u{n5_X+o^!Ml>NhdlK34)5@U_x>FU
jg}xu+UgtArCjMz1Vr=1J>|W^OPWZisOzi#7iYxmI6vcIT
literal 0
HcmV?d00001
diff --git a/www/assets/icons/ssplogo-fish-small.png b/www/assets/icons/ssplogo-fish-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a20f4fe8e272398d8027ac8d9b93bfde1f1836c
GIT binary patch
literal 3012
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
GLSTZkQpw@~
literal 0
HcmV?d00001
diff --git a/www/assets/js/post.js b/www/assets/js/post.js
new file mode 100644
index 000000000..043bec733
--- /dev/null
+++ b/www/assets/js/post.js
@@ -0,0 +1,7 @@
+/**
+ * Automatically click the input button to redirect the user to
+ * the SSO
+ */
+window.onload = function () {
+ document.getElementById('postLoginSubmitButton').click();
+};
--
GitLab