fix: separate tos and privacy checkbox into two (#4848)

internal/api/ui/login/static/templates/external_not_found_option.html

@@ -77,26 +77,33 @@
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
             <label class="lgn-label">{{t "ExternalNotFound.TosAndPrivacyLabel"}}</label>
+            {{ if .TOSLink }}
             <div class="lgn-checkbox">
                 <input type="checkbox" id="terms-confirm"
                        name="terms-confirm" required>
                 <label for="terms-confirm">
                     {{t "ExternalNotFound.TosConfirm"}}
-                    {{ if .TOSLink }}
                     <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
                         {{t "ExternalNotFound.TosLinkText"}}
                     </a>
-                    {{end}}
-                    {{ if and .TOSLink .PrivacyLink }}
-                    {{t "ExternalNotFound.TosConfirmAnd"}}
-                    {{ end }}
-                    {{ if .PrivacyLink }}
+                </label>
+            </div>
+            {{end}}
+            {{ if and .TOSLink .PrivacyLink }}
+            <br />
+            {{end}}
+            {{ if .PrivacyLink }}
+            <div class="lgn-checkbox">
+                <input type="checkbox" id="terms-confirm-privacy"
+                       name="terms-confirm-privacy" required>
+                <label for="terms-confirm-privacy">
+                    {{t "ExternalNotFound.PrivacyConfirm"}}
                     <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
                         {{t "ExternalNotFound.PrivacyLinkText"}}
                     </a>
-                    {{end}}
                 </label>
             </div>
+            {{end}}
         </div>
         {{ end }}
     </div>

internal/api/ui/login/static/templates/external_register_overview.html

@@ -77,26 +77,33 @@
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
             <label class="lgn-label">{{t "ExternalRegistrationUserOverview.TosAndPrivacyLabel"}}</label>
+            {{ if .TOSLink }}
             <div class="lgn-checkbox">
                 <input type="checkbox" id="register-term-confirmation"
                        name="register-term-confirmation" required>
                 <label for="register-term-confirmation">
                     {{t "ExternalRegistrationUserOverview.TosConfirm"}}
-                    {{ if .TOSLink }}
                     <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
                         {{t "ExternalRegistrationUserOverview.TosLinkText"}}
                     </a>
-                    {{end}}
-                    {{ if and .TOSLink .PrivacyLink }}
-                    {{t "ExternalRegistrationUserOverview.TosConfirmAnd"}}
-                    {{ end }}
-                    {{ if .PrivacyLink }}
+                </label>
+            </div>
+            {{end}}
+            {{ if and .TOSLink .PrivacyLink }}
+            <br />
+            {{end}}
+            {{ if .PrivacyLink }}
+            <div class="lgn-checkbox">
+                <input type="checkbox" id="register-term-confirmation-privacy"
+                       name="register-term-confirmation-privacy" required>
+                <label for="register-term-confirmation-privacy">
+                    {{t "ExternalRegistrationUserOverview.PrivacyConfirm"}}
                     <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
                         {{t "ExternalRegistrationUserOverview.PrivacyLinkText"}}
                     </a>
-                    {{end}}
                 </label>
             </div>
+            {{end}}
         </div>
         {{ end }}
     </div>

internal/api/ui/login/static/templates/register.html

@@ -72,26 +72,33 @@
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
             <label class="lgn-label">{{t "RegistrationUser.TosAndPrivacyLabel"}}</label>
+            {{ if .TOSLink }}
             <div class="lgn-checkbox">
                 <input type="checkbox" id="register-term-confirmation"
-                    name="register-term-confirmation" required>
+                       name="register-term-confirmation" required>
                 <label for="register-term-confirmation">
-                   {{t "RegistrationUser.TosConfirm"}}
-                    {{ if .TOSLink }}
-                        <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
-                            {{t "RegistrationUser.TosLinkText"}}
-                        </a>
-                    {{end}}
-                    {{ if and .TOSLink .PrivacyLink }}
-                        {{t "RegistrationUser.TosConfirmAnd"}}
-                    {{ end }}
-                    {{ if .PrivacyLink }}
-                        <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
-                        {{t "RegistrationUser.PrivacyLinkText"}}
-                        </a>
-                    {{end}}
+                    {{t "RegistrationUser.TosConfirm"}}
+                    <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
+                        {{t "RegistrationUser.TosLinkText"}}
+                    </a>
                 </label>
             </div>
+            {{end}}
+            {{ if and .TOSLink .PrivacyLink }}
+            <br />
+            {{end}}
+            {{ if .PrivacyLink }}
+            <div class="lgn-checkbox">
+                <input type="checkbox" id="register-term-confirmation-privacy"
+                       name="register-term-confirmation-privacy" required>
+                <label for="register-term-confirmation-privacy">
+                    {{t "RegistrationUser.PrivacyConfirm"}}
+                    <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
+                        {{t "RegistrationUser.PrivacyLinkText"}}
+                    </a>
+                </label>
+            </div>
+            {{end}}
         </div>
         {{ end }}
     </div>

internal/api/ui/login/static/templates/register_org.html

@@ -9,25 +9,25 @@
 
     {{ .CSRF }}
 
-    <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
+    <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}"/>
 
     <div class="lgn-register">
         <div class="lgn-field">
             <label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgNameLabel"}}</label>
             <input class="lgn-input" type="text" id="orgname" name="orgname" value="{{ .RegisterOrgName }}" autofocus
-                required>
+                   required>
         </div>
-        
+
         <div class="double-col">
             <div class="lgn-field">
                 <label class="lgn-label" for="firstname">{{t "RegistrationOrg.FirstnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
-                    value="{{ .Firstname }}" required>
+                       value="{{ .Firstname }}" required>
             </div>
             <div class="lgn-field">
                 <label class="lgn-label" for="lastname">{{t "RegistrationOrg.LastnameLabel"}}</label>
                 <input class="lgn-input" type="text" id="lastname" name="lastname" autocomplete="family-name"
-                    value="{{ .Lastname }}" required>
+                       value="{{ .Lastname }}" required>
             </div>
         </div>
 
@@ -36,8 +36,9 @@
             <label class="lgn-label" for="username">{{t "RegistrationOrg.UsernameLabel"}}</label>
             <span id="loginname">
                 <div class="lgn-suffix-wrapper">
-                    <input data-iam-domain="{{ .IamDomain }}" class="lgn-input lgn-suffix-input" type="text" id="username" name="username"
-                        value="{{ .Username }}" autofocus required>
+                    <input data-iam-domain="{{ .IamDomain }}" class="lgn-input lgn-suffix-input" type="text"
+                           id="username" name="username"
+                           value="{{ .Username }}" autofocus required>
                     <!-- suffix requires parent div 'lgn-suffix-wrapper', corresponding input class 'lgn-suffix-input' and its id="default-login-suffix" as well as an offset script -->
                     <span id="default-login-suffix" lgnSuffix class="loginname-suffix"></span>
                 </div>
@@ -47,20 +48,21 @@
         <div class="lgn-field">
             <label class="lgn-label" for="email">{{t "RegistrationOrg.EmailLabel"}}</label>
             <input class="lgn-input" type="email" id="email" name="email" autocomplete="email" value="{{ .Email }}"
-                autofocus required>
+                   autofocus required>
         </div>
-       <div class="double-col">
+        <div class="double-col">
             <div class="lgn-field">
                 <label class="lgn-label" for="register-password">{{t "RegistrationOrg.PasswordLabel"}}</label>
                 <input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
-                    data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
-                    data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="register-password"
-                    name="register-password" autocomplete="new-password" required>
+                       data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}"
+                       data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="register-password"
+                       name="register-password" autocomplete="new-password" required>
             </div>
             <div class="lgn-field">
-                <label class="lgn-label" for="register-password-confirmation">{{t "RegistrationOrg.PasswordConfirmLabel"}}</label>
+                <label class="lgn-label" for="register-password-confirmation">{{t
+                    "RegistrationOrg.PasswordConfirmLabel"}}</label>
                 <input class="lgn-input" type="password" id="register-password-confirmation"
-                    name="register-password-confirmation" autocomplete="new-password" required>
+                       name="register-password-confirmation" autocomplete="new-password" required>
             </div>
         </div>
         <div class="lgn-field">
@@ -70,27 +72,32 @@
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
             <label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacyLabel"}}</label>
+            {{ if .TOSLink }}
             <div class="lgn-checkbox">
                 <input class="lgn-input" type="checkbox" id="register-term-confirmation"
-                    name="register-term-confirmation" required>
+                       name="register-term-confirmation" required>
                 <label class="lgn-label" for="register-term-confirmation">
-
-                        {{t "RegistrationOrg.TosConfirm"}}
-                    {{ if .TOSLink }}
-                        <a class="tos-link" target="_blank" href="{{.TOSLink}}" rel="noopener noreferrer">{{t "RegistrationOrg.TosLinkText"}}</a>
-                    {{end}}
-
-                    {{ if and .TOSLink .PrivacyLink }}
-                        {{t "RegistrationOrg.TosConfirmAnd"}}
-                    {{end}}
-
-                    {{ if .PrivacyLink }}
-                        <a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
-                        {{t "RegistrationOrg.PrivacyLinkText"}}
-                        </a>
-                    {{end}}
+                    {{t "RegistrationOrg.TosConfirm"}}
+                    <a class="tos-link" target="_blank" href="{{.TOSLink}}" rel="noopener noreferrer">{{t
+                        "RegistrationOrg.TosLinkText"}}</a>
                 </label>
             </div>
+            {{end}}
+            {{ if and .TOSLink .PrivacyLink }}
+            <br />
+            {{end}}
+            {{ if .PrivacyLink }}
+            <div class="lgn-checkbox">
+                <input class="lgn-input" type="checkbox" id="register-term-confirmation-privacy"
+                       name="register-term-confirmation-privacy" required>
+                <label class="lgn-label" for="register-term-confirmation-privacy">
+                    {{t "RegistrationOrg.PrivacyConfirm"}}
+                    <a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
+                        {{t "RegistrationOrg.PrivacyLinkText"}}
+                    </a>
+                </label>
+            </div>
+            {{end}}
         </div>
         {{ end }}
     </div>
@@ -99,14 +106,16 @@
 
     <div class="lgn-actions">
         <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationOrg.SaveButtonText"}}</button>
+        <button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t
+            "RegistrationOrg.SaveButtonText"}}
+        </button>
     </div>
 </form>
 
-<script src="{{ resourceUrl "scripts/input_suffix_offset.js" }}"></script>
-<script src="{{ resourceUrl "scripts/form_submit.js" }}"></script>
-<script src="{{ resourceUrl "scripts/password_policy_check.js" }}"></script>
-<script src="{{ resourceUrl "scripts/register_check.js" }}"></script>
-<script src="{{ resourceUrl "scripts/loginname_suffix.js" }}"></script>
+<script src="{{ resourceUrl " scripts/input_suffix_offset.js" }}"></script>
+<script src="{{ resourceUrl " scripts/form_submit.js" }}"></script>
+<script src="{{ resourceUrl " scripts/password_policy_check.js" }}"></script>
+<script src="{{ resourceUrl " scripts/register_check.js" }}"></script>
+<script src="{{ resourceUrl " scripts/loginname_suffix.js" }}"></script>
 
 {{template "main-bottom" .}}