Merge pull request #197 from dBucik/test_sp

fix: 🐛 Remove fixed footer for warning_test_sp

Author: Dominik František Bučík

config-templates/module_perun.php

@@ -264,13 +264,15 @@
     ],
 
     'warning_test_sp_config' => [
+        // text to be injected into header of the page (h1 element)
         'header' => [
-            'en' => '<h3>Warning - service in test environment</h3>',
-            'cs' => '<h3>Varování - testovací služba</h3>',
+            'en' => 'Warning - service in test environment',
+            'cs' => 'Varování - testovací služba',
         ],
+        // Custom text that will be displayed between the header and continue button. Use paragraphs for formatting.
         'text' => [
-            'en' => '<p>Service is in the test environment.<br class="spacer"/>Hit the continue button.</p>',
-            'cs' => '<p>Služba je v testovacím režimu.<br class="spacer"/>Pokračujte zmáčknutím tlačítka.</p>',
+            'en' => '<p>Service is in the test environment.<br/>You can access it, but it might not work as expected.</p><p>Hit the continue button.</p>',
+            'cs' => '<p>Služba je v testovacím režimu.<br/>Služba v testovacím režimu nemusí správně fungovat.</p><p>Pokračujte zmáčknutím tlačítka.</p>',
         ],
     ],
 ];

templates/warning-test-sp-tpl.php

@@ -1,6 +1,7 @@
 <?php declare(strict_types=1);
 
 use SimpleSAML\Module;
+use SimpleSAML\Module\perun\Auth\Process\WarningTestSP;
 use SimpleSAML\XHTML\Template;
 
 /**
@@ -11,29 +12,23 @@
  * @var Template $this
  */
 
-$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' .
-    Module::getModuleUrl('perun/res/css/warning_test_sp.css') . '" />';
+$customHeaderEnabled = isset($this->data[WarningTestSP::CUSTOM_HEADER_ENABLED])
+    && $this->data[WarningTestSP::CUSTOM_HEADER_ENABLED];
+$customTextEnabled = isset($this->data[WarningTestSP::CUSTOM_TEXT_ENABLED])
+    && $this->data[WarningTestSP::CUSTOM_TEXT_ENABLED];
 
-$this->data['header'] = '';
+$this->data['header'] = $customTextEnabled ?
+    $this->t(WarningTestSP::CUSTOM_HEADER_KEY) :
+    $this->t('{perun:perun:warning-test-sp-tpl_text}');
 
 $this->includeAtTemplateBase('includes/header.php');
-$customHeaderEnabled = isset($this->data[Module\perun\Auth\Process\WarningTestSP::CUSTOM_HEADER_ENABLED])
-    && $this->data[Module\perun\Auth\Process\WarningTestSP::CUSTOM_HEADER_ENABLED];
-$customTextEnabled = isset($this->data[Module\perun\Auth\Process\WarningTestSP::CUSTOM_TEXT_ENABLED])
-    && $this->data[Module\perun\Auth\Process\WarningTestSP::CUSTOM_TEXT_ENABLED];
 ?>
 
     <form method="post" action="<?php echo Module::getModuleURL('perun/warning_test_sp_continue.php'); ?>">
-
         <input type="hidden" name="StateId" value="<?php echo $_REQUEST['StateId'] ?>">
-        <h3><?php echo $customTextEnabled ?
-                $this->t(Module\perun\Auth\Process\WarningTestSP::CUSTOM_HEADER_KEY) :
-                $this->t('{perun:perun:warning-test-sp-tpl_text}')
-        ?>
-        </h3>
         <?php
         if ($customTextEnabled) {
-            echo '<div>' . $this->t(Module\perun\Auth\Process\WarningTestSP::CUSTOM_TEXT_KEY) . '</div>' . PHP_EOL;
+            echo '<div>' . $this->t(WarningTestSP::CUSTOM_TEXT_KEY) . '</div>' . PHP_EOL;
         }
         ?>
         <br/>