Merge branch 'master' into 'master'

Master

See merge request !29

lib/API.php

@@ -91,6 +91,7 @@ class API {
             'show_list',
             'new_entities',
             'only_errors',
+            'only_issues',
             'url_type',
             'mod_time',
             'lang',
@@ -301,6 +302,11 @@ class API {
                     $optValue = 0;
                 }
                 break;
+            case 'only_issues':
+                if ($optValue != 1 && $optValue != 2) {
+                    $optValue = 0;
+                }
+                break;
             case 'details':
                 if ($optValue != 1) {
                     $optValue = 0;
@@ -577,11 +583,11 @@ class API {
                 $this->addStdArgument('fed_id'),
                 $this->addStdArgument('reg_auth'),
                 [
-                    'arg' => 'only_errors',
+                    'arg' => 'only_issues',
                     'required' => FALSE,
                     'default' => '0',
                     'values' => '0, 1, 2',
-                    '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'],
+                    'description' => '0 - show all; 1 - only federations with feed issues 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,
@@ -603,7 +609,7 @@ class API {
                    when no federation code is present an array of code-indexed participating federations with details as described above'
             ],
             'examples' => [
-                ['opt' => ['only_errors'=>1,], 'title' => 'only fedrations with problems',],
+                ['opt' => ['only_issues'=>1,], 'title' => 'only fedrations with issues',],
                 ['opt' => ['fed_id' => 'PIONIER-ID',],'title' => 'show status of PIONIER.Id',],
                 ['opt' => ['fed_id' => 'PIONIER-ID',], 'format' => 'json', 'title' => 'show status of PIONIER.Id in JSON',]
             ]
@@ -613,7 +619,7 @@ class API {
         }
         $edugain = new eduGAIN(5, $this->fed_id, true);
         $edugain->load_federations_state();
-        if ($this->opts['only_errors'] > 0) {
+        if ($this->opts['only_issues'] > 0) {
             $out = [];
             if ($this->opts['valid_sec'] > 0) {
                 $sec = $this->opts['valid_sec'];
@@ -621,12 +627,12 @@ class API {
                 $sec = VALIDITY_WARNING_THRESHOLD;
             }
             foreach ($edugain->FEDS as $fed) {
-                if ($this->opts['only_errors'] == 2) {
+                if ($this->opts['only_issues'] == 2) {
                     if ($fed['valid_sec'] < $sec) {
                         $out[$fed['code']] = $fed;
                     }
                 }
-                if ($this->opts['only_errors'] == 1) {
+                if ($this->opts['only_issues'] == 1) {
                     if ($fed['valid_sec'] < $sec || $fed['feed_problem'] > 0 ) {
                         $out[$fed['code']] = $fed;
                     }

page-logic/manage.php

@@ -227,8 +227,8 @@ $rows[] = $edugainGUI->row('eduGAIN declaration', 'EDECL', 'edecl');
 $rows[] = $edugainGUI->row('Federation URL', 'I', 'url', '', 0, 0, 4);
 $rows[] = $edugainGUI->row('Registration practice', 'POL', 'registration');
 $rows[] = $edugainGUI->row('Contact email', 'I', 'contact_email', '', 0, 0, 4);
-$rows[] = $edugainGUI->row('TSG delegate', 'PERS', 'tsg_delegate');
-$rows[] = $edugainGUI->row('TSG deputy', 'PERS', 'tsg_deputy');
+$rows[] = $edugainGUI->row('Delegate', 'PERS', 'tsg_delegate');
+$rows[] = $edugainGUI->row('Deputy', 'PERS', 'tsg_deputy');
 $rows[] = $edugainGUI->row('Security contact', 'SIRTFI', 'security_contact');
 $rows[] = $edugainGUI->row('Policy', 'POL', 'policy');
 $rows[] = $edugainGUI->row('Policy in English', 'C', 'policy_english');

page-logic/status.php

@@ -163,7 +163,7 @@ $data = [];
 $data['participants'] = $participants;
 $data['votingOnly'] = $votingOnly;
 $data['candidates'] = $candidates;
-if (isset($_GET['problems'])) {
+if (isset($_GET['issues'])) {
     $data['problem_switch'] = 1;
 } else {
     $data['problem_switch'] = 0;

templates/governance.html

 {% extends 'common/master.html' %}
-{% set breadcrumb = ['Participants', 'Steering Group'] %}
+{% set breadcrumb = ['Participants', 'Assembly'] %}
 {% set half_of_feds = (tsg.FEDS | length)/2 | round %}
 
 {% block title %}eduGAIN Steering Group{% endblock title %}
@@ -7,7 +7,7 @@
 {% block main_body %}
 
 <div class="central-section">
-<p>eduGAIN is governed by the Steering Group (SG) formed by delegates from all participant federations. The <a href="documents">eduGAIN Constitution</a> outlines the governance of the service. The names and contact details of SG members and their deputies are given in the list below.</p>
+<p>eduGAIN is governed by the Assembly formed by delegates from all participant federations. The <a href="documents">eduGAIN Constitution</a> outlines the governance of the service. The names and contact details of Assembly members and their deputies are given in the list below.</p>
 </div>
 
 <div class="central-section">

templates/joining_checklist.html

@@ -79,7 +79,7 @@ the primary channel being signed mail.
 <h3>Governance delegate and deputy</h3>
 <div>
 <p>
-eduGAIN is governed by the Steering Group.
+eduGAIN is governed by the Assembly.
 Each partcipating federation must delegate two members - a delegate and a deputy.
 Please send names and e-mail addresses to the <a href="mailto:{{ constant('SUPPORT_EMAIL') }}"><span>{{ constant('SUPPORT_EMAIL') }}</span></a>.
 </p>

templates/operations.html

@@ -12,7 +12,7 @@
 <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 validator warning 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>.

templates/status.html

@@ -20,7 +20,7 @@
 	</div>
         <div>
             <input type="checkbox" id="problem_filter" />
-            <label for="include_problems">Limit to current feed problems</label>
+            <label for="include_issues">Limit to current feed issues</label>
         </div>
 </div>