diff --git a/lib/API.php b/lib/API.php
index 1ceef3aa3d924c58c38bee36d66cc9653401257c..60c6333529952c650f79427b62f6b54d30a9f58f 100644
--- a/lib/API.php
+++ b/lib/API.php
@@ -581,7 +581,7 @@ class API {
'required' => FALSE,
'default' => '0',
'values' => '0, 1, 2',
- 'description' => '0 - show all; 1 - only federations with feed problems including close to expiry; 2 - show only federations with expiry time below the set valid_sec value'],
+ 'description' => '0 - show all; 1 - only federations with feed problems and these with feeds close to expiry; 2 - show only federations with expiry time below the set valid_sec value'],
[
'arg' => 'valid_sec',
'required' => FALSE,
diff --git a/page-logic/issues.php b/page-logic/issues.php
index c9189a07341b9cf5ff82db0504f2b037468c2def..ad9fe821bfc54b9c2c23576dfd6e1f7767e08d23 100644
--- a/page-logic/issues.php
+++ b/page-logic/issues.php
@@ -16,7 +16,7 @@ function prepareFederationFields($federation) {
$out = [
'fed' => $federation['code'],
'name' => $federation['name'],
- 'countries' => $federation['countries'],
+// 'countries' => $federation['countries'],
'color' => $federation['valid_sec'] < ISSUES_ALERT_THRESHOLD ? "red" : "#F1893B",
'creationinstant' => [
'value' => $federation['creationinstant'],
@@ -52,6 +52,9 @@ function prepareFederationFields($federation) {
'value' => $federation['valid_sec'],
],
];
+ if (isset($federation['countries']) && count($federation['countries']) > 0 ) {
+ $out['countries'] = $federation['countries'];
+ }
return($out);
}
diff --git a/templates/common/menu.html b/templates/common/menu.html
index c81c4e71d81c3b0c834383f22ee0bc8d02ed7cbf..5781139a657e73bde530d15981e55d50f545b26e 100644
--- a/templates/common/menu.html
+++ b/templates/common/menu.html
@@ -5,7 +5,7 @@
<ul class="et-submenu">
<li class="et-submenu-option"><a href="{{ constant('PARTICIPATING_FEDERATIONS_URL') }}">Member Federations</a></li>
<li class="et-submenu-option"><a href="{{ constant('WHATS_NEW_URL') }}">Recent Changes</a></li>
- <li class="et-submenu-option"><a href="{{ constant('GOVERNANCE_URL') }}">Steering Group</a></li>
+ <li class="et-submenu-option"><a href="{{ constant('GOVERNANCE_URL') }}">Assembly</a></li>
</ul>
</li>
<li class="et-option et-has-children"><span>Joining</span>
@@ -34,6 +34,7 @@
<li class="et-option no-children"><a href="{{ constant('DOCUMENTS_URL') }}">Policy framework</a></li>
<li class="et-option et-has-children"><span>Operations</span>
<ul class="et-submenu">
+ <li class="et-submenu-option"><a href="{{ constant('ISSUES_URL') }}">Current issues</a></li>
<li class="et-submenu-option"><a href="{{ constant('OPS_DESC_URL') }}">Operational documentation</a></li>
<li class="et-submenu-option"><a href="{{ constant('METADATA_URL') }}">eduGAIN metadata</a></li>
<li class="et-submenu-option"><a href="{{ constant('SYSTEM_UPDATES') }}">System status</a></li>
diff --git a/templates/documents.html b/templates/documents.html
index d5f6618d012271f5db5109d56820a58022128f45..1f75ae62d8665ff9f2c8ed478b3b95f60ba766bf 100644
--- a/templates/documents.html
+++ b/templates/documents.html
@@ -11,12 +11,11 @@
interfederation.
</p>
<p>
-Version 4 of the eduGAIN Consitution was approved by the eduGAIN Executive in September 2024 and the new version will become effective from 1st January 2024
+Version 4 of the eduGAIN Consitution was approved by the eduGAIN Executive in September 2023 and become effective from 1st January 2024
</p>
<ul>
<li><a href="/doc/eduGAIN-Constitution-v4-final.pdf" target="_blank"><img src="images/icpdf.png" ALT="PDF" style="vertical-align:middle">eduGAIN Constitution (v4)</a>
<li><a href="/doc/eduGAIN-Declaration-v2bis-web.pdf" target="_blank"><img src="images/icpdf.png" ALT="PDF" style="vertical-align:middle">eduGAIN Declaration</a>
- <li><a href="/doc/eduGAIN-Constitution-v3ter-web.pdf" target="_blank"><img src="images/icpdf.png" ALT="PDF" style="vertical-align:middle">eduGAIN Constitution (v3)</a>
<li><a href="/doc/eduGAIN-saml-profile.pdf" target="_blank"><img src="images/icpdf.png" ALT="PDF" style="vertical-align:middle">eduGAIN SAML profile</a>
<li><a href="https://wiki.geant.org/display/eduGAIN/Metadata+Aggregation+Practice+Statement" target="_blank">Metadata Aggregation Practice Statement (WIKI)</a>
<li><a href="https://wiki.geant.org/display/eduGAIN/Best+Current+Practice" target="_blank">Best Current Practice (WIKI)</a>
diff --git a/templates/joining_checklist.html b/templates/joining_checklist.html
index 3bd9bd8b6436f4615b917c6d9525657149d556d8..599b97d291e0ac499bf86dc1cf34973d39ae3d13 100644
--- a/templates/joining_checklist.html
+++ b/templates/joining_checklist.html
@@ -88,7 +88,9 @@ Please send names and e-mail addresses to the <a href="mailto:{{ constant('SUPPO
<h3>Federation page</h3>
<div>
<p>
-Provide a URL pointing to the main (English if exists) page of your Federation.
+Provide a URL pointing to the main page of your Federation (preferably in English).
+
+
</p>
</div>
diff --git a/templates/metadata.html b/templates/metadata.html
index b8920b43dd60da2057f45da4559f42820e138774..c4f2bb7cba1cb55b4c07ff0d34f45b8dba099c34 100644
--- a/templates/metadata.html
+++ b/templates/metadata.html
@@ -17,17 +17,12 @@ Should an error persist beyond the validUntil period of the copy, the data of th
<h3>Metadata signing</h3>
<p>The eduGAIN metadata aggregate signature may be validated with the certificate available for download <a href="mds-v2.cer"><b>here</b></a>. This key was generated during a public <a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Key+Signing+Ceremony+2022">Key Signing Ceremony</a> held in Stockholm on 2022-03-08.</p>
-<p><strong>Make sure that you update to using this key and feed ASAP as the old feed will not be avaliable after 2022-07-01 00:00 UTC.</strong></p>
<h3>Signing certificate fingerprints</h3>
<dl>
-<dt>SHA-1</dt><dd> 5A:D7:3F:8A:C1:0C:74:56:41:77:45:45:EB:92:76:1F:3D:0D:E6:7C
<dt>SHA-256</dt><dd> BD:21:40:48:9A:9B:D7:40:44:DD:68:05:34:F7:78:88:A9:C1:3B:0A:C1:7C:4F:3A:03:6E:0F:EC:6D:89:99:95
</dl>
-<h1>The old feeds</h1>
-The old feeds (using the previous and now expired certificate) were removed on My 31st 2023.
-
<!-- <h2>Pre-production feed</h2>
Whenever the aggregator software is updated in a way that introduces changes to the eduGAIN metadata aggregate, a pre-production feed will be made available for testing. Typically the testing period will be two weeks. The test feed will be availabe at <a href=https://mds.edugain.org/edugain-v1-1-beta.xml">https://mds.edugain.org/edugain-v1-1-beta.xml</a>.
-->
diff --git a/templates/operations.html b/templates/operations.html
index 0470ac33a66fe5b8d39c1d99bb1b80717d584b7a..768696b00f3bc56c11f7dde49c58ebeb32dae58d 100644
--- a/templates/operations.html
+++ b/templates/operations.html
@@ -9,10 +9,10 @@
<dt>Operational Practice Statement (SAML profile)</dt>
<dd>Provides a detailed description of service elementes and procedures used in operationg eduGAIN. It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Operational+Practice+Statement+-+SAML+profile" target="_blank">here</a>.</dd>
-<dt>Metadata Aggregation Pracice Statement</dt>
+<dt>Metadata Aggregation Practice Statement</dt>
<dd>Describes details of metadata validation and aggregation. It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Metadata+Aggregation+Practice+Statement" target="_blank">here</a>.</dd>
<dt>Best Current Practice document</dt><!-- comment -->
-<dd>Lists conditions which are additionally checked by the validator failure to comply with these will result in a validateor error It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Best+Current+Practice" target="_blank">here</a>.
+<dd>Lists conditions which are additionally checked by the validator, failure to comply with these will result in a validator warning It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Best+Current+Practice" target="_blank">here</a>.
See also <a href="https://technical.edugain.org/api.php?action=validator_warnings&format=print_r">https://technical.edugain.org/api.php?action=validator_warnings&format=print_r</a>.</dd>
<dt>Alerts</dt>
<dd>Whenever the aggregator finds a problem it issues a warning which is delivered by email to the federation contact address. Details are described in a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Metadata+aggregation+-+alerts" target="_blank">here</a>.