From d0b8c560f69068d10720b081341a06b707207ffd Mon Sep 17 00:00:00 2001
From: Benjamin Dalsass <benjamin.dalsass@combodo.com>
Date: Fri, 17 Jun 2022 09:50:36 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B05037=20-=20Setup:=20Add=20disclaimer=20a?=
 =?UTF-8?q?bout=20collected=20data=203.0=20look=20and=20feel=20adaptation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/wizardsteps.class.inc.php | 54 +++++++++++++++++----------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index 939dc9e05..89cc97098 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -707,43 +707,45 @@ class WizStepLicense extends WizardStep
      */
     public function Display(WebPage $oPage)
     {
-        $aLicenses = SetupUtils::GetLicenses();
-		$oPage->add_style(
-<<<CSS
+	    $aLicenses = SetupUtils::GetLicenses();
+	    $oPage->add_style(
+		    <<<CSS
 fieldset ul {
 	max-height: min(30em, 40vh); /* Allow usage of the UI up to 150% zoom */
 	overflow: auto;
 }
 CSS
-		);
+	    );
 
-		$oPage->add('<h2>Licenses agreements for the components of '.ITOP_APPLICATION.'</h2>');
-		$oPage->add_style('div a.no-arrow { background:transparent; padding-left:0;}');
-		$oPage->add_style('.toggle { cursor:pointer; text-decoration:underline; color:#1C94C4; }');
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>Components of '.ITOP_APPLICATION.'</legend>');
-		$oPage->add('<ul id="ibo-setup-licenses--components-list">');
-        $index = 0;
-        foreach ($aLicenses as $oLicense)
-		{
-			$oPage->add('<li><b>'.$oLicense->product.'</b>, &copy; '.$oLicense->author.' is licensed under the <b>'.$oLicense->license_type.' license</b>. (<span class="toggle" id="toggle_'.$index.'">Details</span>)');
-			$oPage->add('<div id="license_'.$index.'" class="license_text ibo-is-html-content" style="display:none;overflow:auto;max-height:10em;font-size:12px;border:1px #696969 solid;margin-bottom:1em; margin-top:0.5em;padding:0.5em;"><pre>'.$oLicense->text.'</pre></div>');
-			$oPage->add_ready_script('$(".license_text a").attr("target", "_blank").addClass("no-arrow");');
-			$oPage->add_ready_script('$("#toggle_'.$index.'").on("click", function() { $("#license_'.$index.'").toggle(); } );');
-			$index++;
-		}
-		$oPage->add('</ul>');
-		$oPage->add('</fieldset>');
-        $sChecked = ($this->oWizard->GetParameter('accept_license', 'no') == 'yes') ? ' checked ' : '';
-        $oPage->add('<div class="setup-accept-licenses"><input class="check_select" type="checkbox" name="accept_license" id="accept" value="yes" '.$sChecked.'><label for="accept">I accept the terms of the licenses of the '.count($aLicenses).' components mentioned above.</label></div>');
+	    $oPage->add('<h2>Licenses agreements for the components of '.ITOP_APPLICATION.'</h2>');
+	    $oPage->add_style('div a.no-arrow { background:transparent; padding-left:0;}');
+	    $oPage->add_style('.toggle { cursor:pointer; text-decoration:underline; color:#1C94C4; }');
+	    $oPage->add('<fieldset>');
+	    $oPage->add('<legend>Components of '.ITOP_APPLICATION.'</legend>');
+	    $oPage->add('<ul id="ibo-setup-licenses--components-list">');
+	    $index = 0;
+	    foreach ($aLicenses as $oLicense) {
+		    $oPage->add('<li><b>'.$oLicense->product.'</b>, &copy; '.$oLicense->author.' is licensed under the <b>'.$oLicense->license_type.' license</b>. (<span class="toggle" id="toggle_'.$index.'">Details</span>)');
+		    $oPage->add('<div id="license_'.$index.'" class="license_text ibo-is-html-content" style="display:none;overflow:auto;max-height:10em;font-size:12px;border:1px #696969 solid;margin-bottom:1em; margin-top:0.5em;padding:0.5em;"><pre>'.$oLicense->text.'</pre></div>');
+		    $oPage->add_ready_script('$(".license_text a").attr("target", "_blank").addClass("no-arrow");');
+		    $oPage->add_ready_script('$("#toggle_'.$index.'").on("click", function() { $("#license_'.$index.'").toggle(); } );');
+		    $index++;
+	    }
+	    $oPage->add('</ul>');
+	    $oPage->add('</fieldset>');
+	    $sChecked = ($this->oWizard->GetParameter('accept_license', 'no') == 'yes') ? ' checked ' : '';
+	    $oPage->add('<div class="setup-accept-licenses"><input class="check_select" type="checkbox" name="accept_license" id="accept" value="yes" '.$sChecked.'><label for="accept">I accept the terms of the licenses of the '.count($aLicenses).' components mentioned above.</label></div>');
 	    if ($this->NeedsRgpdConsent()) {
-		    $oPage->add('<div id="rgpd_message" class="message message-info">iTop software is compliant with the processing of personal data according to the European General Data Protection Regulation (GDPR).<p></p>
+		    $oPage->add('<br>');
+		    $oPage->add('<fieldset>');
+		    $oPage->add('<legend>European General Data Protection Regulation</legend>');
+		    $oPage->add('<div class="ibo-setup-licenses--components-list">iTop software is compliant with the processing of personal data according to the European General Data Protection Regulation (GDPR).<p></p>
 By installing iTop you agree that some information will be collected by Combodo to help you manage your instances and for statistical purposes.
 This data remains anonymous until it is associated to a user account on iTop Hub.</p>
-<p>List of collected data available in our <a target="_blank" href="https://www.itophub.io/page/data-privacy">Data privacy section.</p></a>');
+<p>List of collected data available in our <a target="_blank" href="https://www.itophub.io/page/data-privacy">Data privacy section.</a></p><br></div>');
 		    $oPage->add('<input type="checkbox" class="check_select" id="rgpd_consent">');
 		    $oPage->add('<label for="rgpd_consent">&nbsp;I accept the processing of my personal data</label>');
-		    $oPage->add('</div>');
+		    $oPage->add('</fieldset>');
 	    }
 	    $oPage->add_ready_script('$(".check_select").bind("click change", function() { WizardUpdateButtons(); });');