From 1869a0e18cc51c6a4316af47c31cdb8fc79fcdaa Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 6 Nov 2023 14:48:59 +0000
Subject: [PATCH] Bug 35261: Update links for self registration avoiding "here"

This patch updates several OPAC templates to change the wording of the
self registration link to "Create an account."

Minor adjustments to CSS have been made to make whitespace around the
links more comfortable.

To test, apply the patch and rebuild the OPAC CSS.

- If necessary enable the PatronSelfRegistration system preference is
  enabled.
- Go to the OPAC and check the login form in the right-hand sidebar.
- Click the "Log in to your account" link in the header and check the
  form displayed in the modal window.
- Navigate directly to /cgi-bin/koha/opac-user.pl and check the link on
  the login page.
- Complete the self-registration process and check the link in the
  right-hand sidebar menu on the "Registration complete" page.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../opac-tmpl/bootstrap/css/src/opac.scss      | 18 ++++++++++++++----
 .../bootstrap/en/includes/masthead.inc         |  4 ++--
 .../bootstrap/en/modules/opac-auth.tt          |  6 ++----
 .../bootstrap/en/modules/opac-main.tt          |  2 +-
 .../modules/opac-registration-confirmation.tt  |  6 +++++-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index ae849a8af7..b3ab160885 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -315,6 +315,14 @@ th {
     }
 }
 
+#auth {
+    margin-bottom: 1rem;
+
+    p {
+        margin: .5rem 0;
+    }
+}
+
 #basketcount {
     display: inline;
     margin: 0;
@@ -2074,6 +2082,10 @@ nav {
         }
     }
 
+    p {
+        margin: .5rem 0;
+    }
+
     .closebtn {
         color: #C00;
         opacity: 1;
@@ -2091,10 +2103,8 @@ nav {
     }
 }
 
-.nologininstructions,
-.forgotpassword,
-.patronregistration {
-    padding-top: 1em;
+#nologininstructions {
+    margin: .5rem 0;
 }
 
 .registration-label {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index b7f3dd892d..bec516757f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -439,12 +439,12 @@
                                 [% END %]
                                 [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
                                     <div id="forgotpassword-modal" class="forgotpassword">
-                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
+                                        <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
                                     </div>
                                 [% END %]
                                 [% IF Koha.Preference('PatronSelfRegistration') && Categories.all( categorycode => Koha.Preference('PatronSelfRegistrationDefaultCategory') ).count %]
                                     <div id="patronregistration-modal" class="patronregistration">
-                                        <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
+                                        <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
                                     </div>
                                 [% END %]
                             </fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index b8a9c5db86..f76ded9c5f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -243,14 +243,12 @@
                                 </div>
                                 [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
                                     <div id="forgotpassword">
-                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
+                                        <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
                                     </div>
                                 [% END %]
                                 [% IF Koha.Preference('PatronSelfRegistration') && Categories.all( categorycode => Koha.Preference('PatronSelfRegistrationDefaultCategory') ).count %]
                                     <div id="registrationinstructions">
-                                        <span>
-                                            <a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
-                                        </span>
+                                        <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
                                     </div>
                                 [% END %]
                             </form>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index e11454336e..8e616f02a7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -217,7 +217,7 @@
                                         [% END %]
                                         [% IF Koha.Preference('PatronSelfRegistration') && Categories.all( categorycode => Koha.Preference('PatronSelfRegistrationDefaultCategory') ).count %]
                                             <div id="patronregistration-main" class="patronregistration">
-                                                <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
+                                                <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
                                             </div>
                                         [% END %]
                                     </fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
index 6d904f4f2e..9c103dbad9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
@@ -96,7 +96,11 @@
                                     <fieldset class="action">
                                         <input type="submit" value="Log in" class="btn btn-primary" />
                                     </fieldset>
-                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
+                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
+                                        <div id="patronregistration">
+                                            <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
+                                        </div>
+                                    [% END %]
                                     </fieldset>
                                 </form> <!-- /#auth -->
                             </div> <!-- /#login -->
-- 
2.39.5