From b58bb371bc585ffe5b86761b43e8def07d1e680e Mon Sep 17 00:00:00 2001
From: Adrian Coveney <adrian.coveney@stfc.ac.uk>
Date: Mon, 14 Aug 2023 10:28:36 +0000
Subject: [PATCH 1/3] Improve clarity of text and layout

- Slim down identifier linking/recovery page to focus on important content.
- Reword some sections to hopefully be more clear.
- Add newline at end of file.
---
 .../web_portal/views/user/link_identity.php   | 61 ++++---------------
 1 file changed, 11 insertions(+), 50 deletions(-)

diff --git a/htdocs/web_portal/views/user/link_identity.php b/htdocs/web_portal/views/user/link_identity.php
index 1ffb3c5e8..0f922593c 100644
--- a/htdocs/web_portal/views/user/link_identity.php
+++ b/htdocs/web_portal/views/user/link_identity.php
@@ -1,59 +1,21 @@
 <div class="rightPageContainer">
-    <h1>Link Identity or Recover an Account</h1>
-
-    <br />
-
+    <h1>Link Identifier or Recover an Account</h1>
     <div>
-        <h2>What is identity linking?</h2>
-        <ul>
-            <li>
-                You can use this process to add your current authentication method as a way to log in to an existing account.
-            </li>
-            <li>
-                This allows access to a single account through two or more identifiers.
-            </li>
-            <li>
-                You must have access to the email address associated with the account being linked.
-            </li>
-            <li>
-                <b>Your current authentication type must be different to any authentication types already associated
-                with the account being linked.</b>
-            </li>
-        </ul>
-
-        <h2>What is account recovery?</h2>
-        <ul>
-            <li>
-                If your identifier has changed, you can use this process to update it and regain control of your old account.
-            </li>
-            <li>
-                You must have access to the email address associated with your old account.
-            </li>
-            <li>
-                <b>Your current authentication type must be the same as the authentication type you enter for your old account.</b>
-            </li>
+    This page allows you to either add a new identifier to an exisitng GOCDB account, or recover a GOCDB account if your identifier has changed. You must have access to the email address associated with that GOCDB account. You must be logged in with the new identifier.
     </div>
-
     <br />
-
     <div class=Form_Holder>
         <div class=Form_Holder_2>
             <form name="Link_Identity" action="index.php?Page_Type=Link_Identity"
                   method="post" class="inputForm" id="linkIdentityForm">
-                <span>
+                <div>
                     Your current ID string (e.g. certificate DN) is: <label><?php echo $params['idString']; ?></label>
-                </span>
-                <br />
-                <span>
+                </div>
+                <div>
                     Your current authentication type is: <label id="currentAuthType"><?php echo $params['currentAuthType']; ?></label>
-                </span>
-
-                <br />
-                <br />
+                </div>
 
-                <h2>Details of account to be linked or recovered</h2>
-
-                <br />
+                <h2>Details of account to be linked to or recovered</h2>
 
                 <div class="form-group" id="authTypeGroup">
                     <label class="control-label" for="authType">Authentication type *</label>
@@ -104,8 +66,6 @@ class="form-control"
                     <br id="idStringPlaceholder" />
                 </div>
 
-                <br />
-
                 <div class="form-group" id="emailGroup">
                     <label class="control-label" for="email">E-mail address *
                         <label class="input_syntax" >(valid e-mail format)</label>
@@ -132,12 +92,12 @@ class="form-control"
                         <li class="hidden" id="linkingDetails"> If you successfully validate your <b>linking</b> request:
                             <ul>
                                 <li>
-                                    Your <b>current ID string</b> and <b>authentication type</b> will be added as an alternative identifier to the account being linked.
+                                    Your <b>current ID string</b> and <b>authentication type</b> will be added as an alternative identifier to the account being linked to.
                                 </li>
                                 </li>
                                 <li <?php echo $params['registered'] ? "" : "hidden"; ?>>
                                     Any roles you have with the account you are currently using will be requested
-                                    for the account being linked.
+                                    for the account being linked to.
                                 </li>
                                 <li <?php echo $params['registered'] ? "" : "hidden"; ?>>
                                     These roles will be approved automatically if either account has permission to do so.
@@ -191,4 +151,5 @@ class="form-control"
     }
 </style>
 
-<script type="text/javascript" src="<?php echo \GocContextPath::getPath(); ?>javascript/linking.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="<?php echo \GocContextPath::getPath(); ?>javascript/linking.js"></script>
+

From 6bf93469ec5a8099cc1d14e3583dc2e33f516f87 Mon Sep 17 00:00:00 2001
From: Adrian Coveney <4836233+tofu-rocketry@users.noreply.github.com>
Date: Mon, 14 Aug 2023 13:37:16 +0100
Subject: [PATCH 2/3] Correct spelling and claify word in link_identity.php

Co-authored-by: gregcorbett <gregcorbett@users.noreply.github.com>
---
 htdocs/web_portal/views/user/link_identity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/web_portal/views/user/link_identity.php b/htdocs/web_portal/views/user/link_identity.php
index 0f922593c..fdac2cae7 100644
--- a/htdocs/web_portal/views/user/link_identity.php
+++ b/htdocs/web_portal/views/user/link_identity.php
@@ -1,7 +1,7 @@
 <div class="rightPageContainer">
     <h1>Link Identifier or Recover an Account</h1>
     <div>
-    This page allows you to either add a new identifier to an exisitng GOCDB account, or recover a GOCDB account if your identifier has changed. You must have access to the email address associated with that GOCDB account. You must be logged in with the new identifier.
+    This page allows you to either add a new identifier to an exisiting GOCDB account, or recover a GOCDB account if your identifier has changed. You must have access to the email address associated with that GOCDB account. You must be authenticated with the new identifier.
     </div>
     <br />
     <div class=Form_Holder>

From df00bed27b7f39a516c534831823baefc60f1401 Mon Sep 17 00:00:00 2001
From: Adrian Coveney <adrian.coveney@stfc.ac.uk>
Date: Mon, 14 Aug 2023 12:54:42 +0000
Subject: [PATCH 3/3] Break up long lines

---
 htdocs/web_portal/views/user/link_identity.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/web_portal/views/user/link_identity.php b/htdocs/web_portal/views/user/link_identity.php
index fdac2cae7..2588e53da 100644
--- a/htdocs/web_portal/views/user/link_identity.php
+++ b/htdocs/web_portal/views/user/link_identity.php
@@ -1,7 +1,10 @@
 <div class="rightPageContainer">
     <h1>Link Identifier or Recover an Account</h1>
     <div>
-    This page allows you to either add a new identifier to an exisiting GOCDB account, or recover a GOCDB account if your identifier has changed. You must have access to the email address associated with that GOCDB account. You must be authenticated with the new identifier.
+    This page allows you to either add a new identifier to an exisiting GOCDB
+    account, or recover a GOCDB account if your identifier has changed. You
+    must have access to the email address associated with that GOCDB account.
+    You must be authenticated with the new identifier.
     </div>
     <br />
     <div class=Form_Holder>
@@ -92,7 +95,10 @@ class="form-control"
                         <li class="hidden" id="linkingDetails"> If you successfully validate your <b>linking</b> request:
                             <ul>
                                 <li>
-                                    Your <b>current ID string</b> and <b>authentication type</b> will be added as an alternative identifier to the account being linked to.
+                                    Your <b>current ID string</b> and
+                                    <b>authentication type</b> will be added as
+                                    an alternative identifier to the account
+                                    being linked to.
                                 </li>
                                 </li>
                                 <li <?php echo $params['registered'] ? "" : "hidden"; ?>>