Skip to content
Snippets Groups Projects
Commit af8e81ed authored by Thijs Kinkhorst's avatar Thijs Kinkhorst
Browse files

baseurlpath variable was missing from templates. 

re-add it and fix all templates that depended on it being unset
parent e1f9337f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 26 deletions
lib/SimpleSAML/XHTML/Template.php
+ 1
− 0
View file @ af8e81ed
......@@ -297,6 +297,7 @@ class Template extends Response
$twig->addGlobal('queryParams', $queryParams);
$twig->addGlobal('templateId', str_replace('.twig', '', $this->normalizeTemplateName($this->template)));
$twig->addGlobal('isProduction', $this->configuration->getBoolean('production', true));
$twig->addGlobal('baseurlpath', ltrim($this->configuration->getBasePath(), '/'));
// add a filter for translations out of arrays
$twig->addFilter(
......
modules/adfs/templates/postResponse.twig
+ 1
− 1
View file @ af8e81ed
<!DOCTYPE html>
<html>
<head>
<script src="{{ baseurlpath }}/assets/js/postResponse.js"></script>
<script src="/{{ baseurlpath }}module.php/adfs/assets/js/postResponse.js"></script>
</head>
<body>
<form method="post" action="{{ url }}">
......
modules/authYubiKey/templates/yubikeylogin.twig
+ 2
− 2
View file @ af8e81ed
......@@ -2,11 +2,11 @@
{% extends "base.twig" %}
{% block preload %}
<link rel="stylesheet" type="text/css" href="{{ baseurlpath }}assets/css/yubikey.css">
<link rel="stylesheet" href="/{{ baseurlpath }}module.php/authYubiKey/assets/css/yubikey.css">
{% endblock %}
{% block postload %}
<script src="{{ baseurlpath }}assets/js/autofocus.js"></script>
<script src="/{{ baseurlpath }}module.php/authYubiKey/assets/js/autofocus.js"></script>
{% endblock %}
{% block content %}
......
modules/consent/templates/consentform.twig
+ 1
− 1
View file @ af8e81ed
......@@ -2,7 +2,7 @@
{% extends "base.twig" %}
{% block preload %}
<link rel="stylesheet" type="text/css" href="{{ baseurlpath }}assets/css/consent.css" />
<link rel="stylesheet" href="/{{ baseurlpath }}module.php/consent/assets/css/consent.css">
{% endblock %}
{% block content %}
......
modules/consentAdmin/templates/consentadmin.twig
+ 3
− 3
View file @ af8e81ed
......@@ -2,11 +2,11 @@
{% extends "base.twig" %}
{% block preload %}
<link rel="stylesheet" type="text/css" href="{{ basepathurl }}assets/css/consentAdmin.css" />
<link rel="stylesheet" href="/{{ baseurlpath }}module.php/consentAdmin/assets/css/consentAdmin.css">
{% endblock %}
{% block postload %}
<script src="{{ baseurlpath }}assets/js/consentAdmin.js"></script>
<script src="/{{ baseurlpath }}module.php/consentAdmin/assets/js/consentAdmin.js"></script>
{% endblock %}
{% block content %}
......@@ -77,6 +77,6 @@
<p>{{ '{consentAdmin:consentadmin:consentadmin_description2}'|trans|raw }}</p>
<h2>Logout</h2>
<p><a href="{{ baseurlpath }}consentAdmin.php?logout=1">Logout</a></p>
<p><a href="/{{ baseurlpath }}module.php/consentAdmin/consentAdmin.php?logout=1">Logout</a></p>
{% endblock %}
modules/cron/templates/croninfo.twig
+ 1
− 1
View file @ af8e81ed
......@@ -2,7 +2,7 @@
{% extends "base.twig" %}
{% block preload %}
<link rel="stylesheet" type="text/css" href="{{ baseurlpath }}assets/css/cron.css">
<link rel="stylesheet" href="/{{ baseurlpath }}module.php/cron/assets/css/cron.css">
{% endblock %}
{% block content %}
......
modules/discopower/templates/disco.twig
+ 5
− 6
View file @ af8e81ed
......@@ -2,14 +2,13 @@
{% extends "base.twig" %}
{% block preload %}
<link href="{{ baseurlpath }}style.css" rel="stylesheet" type="text/css" media="screen" />
<link rel="stylesheet" media="screen" type="text/css" href="/resources/uitheme1.8/jquery-ui.css" />
<link rel="stylesheet" media="screen" href="/{{ baseurlpath }}resources/uitheme1.8/jquery-ui.css">
{% endblock %}
{% block postload %}
<script type="text/javascript" src="/resources/jquery-1.8.js"></script>
<script type="text/javascript" src="/resources/jquery-ui-1.8.js"></script>
<script type="text/javascript" src="{{ baseurlpath }}js/jquery.livesearch.js"></script>
<script type="text/javascript" src="{{ baseurlpath }}js/{{ score }}.js"></script>
<script src="/{{ baseurlpath }}resources/jquery-1.8.js"></script>
<script src="/{{ baseurlpath }}resources/jquery-ui-1.8.js"></script>
<script src="/{{ baseurlpath }}module.php/discopower/js/jquery.livesearch.js"></script>
<script src="/{{ baseurlpath }}module.php/discopower/js/{{ score }}.js"></script>
{{ search|raw }}
{% endblock %}
......
modules/memcacheMonitor/templates/memcachestat.twig
+ 1
− 1
View file @ af8e81ed
......@@ -2,7 +2,7 @@
{% extends "base.twig" %}
{% block preload %}
<link href="{{ baseurlpath }}assets/css/memcacheMonitor.css" rel="stylesheet" />
<link href="/{{ baseurlpath }}module.php/memcacheMonitor/assets/css/memcacheMonitor.css" rel="stylesheet">
{% endblock %}
{% block content %}
......
modules/negotiate/templates/redirect.twig
+ 1
− 1
View file @ af8e81ed
<!DOCTYPE HTML>
<html lang="en-US">
<head>
<script src="{{ baseurlpath }}/assets/js/redirect.js"></script>
<script src="/{{ baseurlpath }}modules.php/negotiate/assets/js/redirect.js"></script>
<title>Redirect to login</title>
</head>
<body>
......
modules/statistics/templates/statistics.twig
+ 5
− 5
View file @ af8e81ed
......@@ -2,14 +2,14 @@
{% extends "base.twig" %}
{% block preload %}
<link href="{{ baseurlpath }}assets/css/statistics.css" rel="stylesheet" />
<link rel="stylesheet" media="screen" type="text/css" href="/resources/uitheme1.8/jquery-ui.css" />
<link href="/{{ baseurlpath }}module.php/statistics/assets/css/statistics.css" rel="stylesheet">
<link rel="stylesheet" media="screen" href="/{{ baseurlpath }}resources/uitheme1.8/jquery-ui.css">
{% endblock %}
{% block postload %}
<script type="text/javascript" src="/resources/jquery-1.8.js"></script>
<script type="text/javascript" src="/resources/jquery-ui-1.8.js"></script>
<script type="text/javascript" src="{{ baseurlpath }}assets/js/statistics.js"></script>
<script src="/{{ baseurlpath }}resources/jquery-1.8.js"></script>
<script src="/{{ baseurlpath }}resources/jquery-ui-1.8.js"></script>
<script src="/{{ baseurlpath }}module.php/statistics/assets/js/statistics.js"></script>
{% endblock %}
{% block content %}
......
modules/statistics/templates/statmeta.twig
+ 2
− 2
View file @ af8e81ed
......@@ -2,7 +2,7 @@
{% extends "base.twig" %}
{% block preload %}
<link href="{{ baseurlpath }}assets/css/statistics.css" rel="stylesheet" />
<link href="/{{ baseurlpath }}modules.php/statistics/assets/css/statistics.css" rel="stylesheet">
{% endblock %}
{% block content %}
......@@ -35,5 +35,5 @@
<tr><td>No metadata found</td></tr>
{% endif %}
</table>
<p>[ <a href="{{ baseurlpath }}showstats.php">Show statistics</a> ]</p>
<p>[ <a href="/{{ baseurlpath }}module.php/statistics/showstats.php">Show statistics</a> ]</p>
{% endblock %}
templates/base.twig
+ 3
− 3
View file @ af8e81ed
......@@ -4,11 +4,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="initial-scale=1.0">
<title>{{ pagetitle }}</title>
<link rel="stylesheet" type="text/css" href="{{ asset("css/stylesheet.css") }}">
<link rel="icon" type="image/icon" href="/{{ baseurlpath }}resources/icons/favicon.ico">
<link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}">
<link rel="icon" href="/{{ baseurlpath }}resources/icons/favicon.ico">
{% if isRTL %}
<link rel="stylesheet" type="text/css" href="/{{ baseurlpath }}assets/css/src/default-rtl.css" />
<link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}">
{% endif %}
<meta name="robots" content="noindex, nofollow">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment