From 4e28ef4a6fa4679b14790416396bae49d60936c5 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 12 Feb 2020 16:13:15 +0000
Subject: [PATCH] Add missing headers in core module federation homepage & fix
style of lookup form
---
.../core/templates/frontpage_federation.twig | 30 +++++++++----------
modules/core/www/frontpage_federation.php | 1 +
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 35acde2d6..68642316b 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -6,6 +6,7 @@
{% include "@core/_frontpage_menu.twig" %}
{% if metaentries.hosted is iterable and metaentries.hosted is not empty %}
+ <h2>{% trans %}Hosted entities{% endtrans %}</h2>
<dl>
{% for key, set in metaentries.hosted %}
{% set metadataset = attribute(set, 'metadata-set') %}
@@ -32,6 +33,7 @@
{% endif %}
{% if metaentries.remote is iterable and metaentries.remote is not empty %}
+ <h2>{% trans %}Trusted entities{% endtrans %}</h2>
{% for key, set in metaentries.remote %}
<fieldset class="fancyfieldset">
<legend>{{ mtype[key]|trans }} (Trusted)</legend>
@@ -64,21 +66,19 @@
</ul>
{% if isadmin %}
- <fieldset class="fancyfieldset">
- <legend>Lookup metadata</legend>
- <form action="{{ metadata_url }}" method="get">
- <p>Look up metadata for entity:
- <select name="set">
- {% if metaentries.remote is defined and metaentries.remote is not empty %}
- {% for key, set in metaentries.remote %}
- <option value="{{ key|escape('html') }}">{{ mtype[key]|trans }}</option>
- {% endfor %}
- {% endif %}
- </select>
- <input type="text" name="entityid" />
- <button class="btn" type="submit">Lookup </button>
- </p>
- </form>
+ <form action="{{ metadata_url }}" method="get" class="pure-form">
+ <p>Look up metadata for entity:
+ <select name="set">
+ {% if metaentries.remote is defined and metaentries.remote is not empty %}
+ {% for key, set in metaentries.remote %}
+ <option value="{{ key|escape('html') }}">{{ mtype[key]|trans }}</option>
+ {% endfor %}
+ {% endif %}
+ </select>
+ <input type="text" name="entityid" class="edge">
+ <button class="pure-button pure-button-red" type="submit">Lookup</button>
+ </p>
+ </form>
</fieldset>
{% endif %}
{% endblock %}
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 72e98ea8c..3f399e7d8 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -44,6 +44,7 @@ $allLinks = [
$metadataHosted = [];
\SimpleSAML\Module::callHooks('metadata_hosted', $metadataHosted);
+var_dump($metadataHosted);
$metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
--
GitLab