diff --git a/.gitignore b/.gitignore index d5e68ae74f68f03ecef05d3baa1279c1ef2fe035..7c2145f7ba3607f359e09946e574c887f10c97d6 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 5cfb974b9d8bd91a49bb471a6b98dee26ad37301..7a6705b9cb2bcf70b57dde431137aad5d8da58d6 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 ea464b7caa868809f7d1b6f2deaa86715cdd6b8c..8c8f6c012863e0ccad3abbfe928f3dc17c677d62 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 a11c56a18886b0eb58efa87bb4880f0c9fa60621..c297d5500365c6f6ba0e7be64190a179e3d87ba7 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 0000000000000000000000000000000000000000..3f8684c702d2cdb8a66ba20c49c72950703dd032 --- /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 Binary files /dev/null and b/www/assets/icons/favicon.ico differ 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 Binary files /dev/null and b/www/assets/icons/ssplogo-fish-small.png differ diff --git a/www/assets/js/post.js b/www/assets/js/post.js new file mode 100644 index 0000000000000000000000000000000000000000..043bec73322079eb6d6e8bfd9f39bbb3b654615f --- /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(); +};