Bugzilla – Attachment 151010 Details for
Bug 33699
Typo in identity_provider_domains.tt (presedence)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33699: Typo in identity_provider_domains.tt (presedence)
Bug-33699-Typo-in-identityproviderdomainstt-presed.patch (text/plain), 5.64 KB, created by
Owen Leonard
on 2023-05-10 14:43:14 UTC
(
hide
)
Description:
Bug 33699: Typo in identity_provider_domains.tt (presedence)
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-05-10 14:43:14 UTC
Size:
5.64 KB
patch
obsolete
>From 8253297a542eccf212ab174bf83f78363f79ab02 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 10 May 2023 13:19:38 +0000 >Subject: [PATCH] Bug 33699: Typo in identity_provider_domains.tt (presedence) > >This patch corrects the typo "presedence" with "precedence." > >The patch also corrects some grammar: > >"so if the 'library.com' domain will take presedence over >'*library.com'" > >...changed to... > >"so 'library.com' domain will take presedence over '*library.com'" > >I also changed the <div>s inside that block of help text to <p> in order >to improve legibility. > >To test, apply the patch and go to Administration -> Identity providers >-> Manage domains (on an existing provider) -> Edit, and click the >"More" button under the "Domain" field. > >Confirm that the text is correct. >--- > .../admin/identity_provider_domains.tt | 26 ++++++------------- > 1 file changed, 8 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >index b5ec234fcd..65d91e1ec5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >@@ -91,17 +91,12 @@ > <input type="text" name="domain" id="domain" size="60" /> > <div class="hint">Email domain to match this rule. <button class="more btn btn-ligth" data-target="domain"><i class="fa fa-caret-down"></i> More</button></div> > <div class="hint more-domain" style="display: none"> >- <div>If this field is empty, or '*' any email domain will match this rule.</div> >- <div>You may enter a wildcard at the beginning of the domain. For example, the domain '*library.com' will match 'students.library.com' but will also match 'otherlibrary.com'</div> >- <div>Exact matches have presedence over wildcard ones, so 'library.com' domain will take presedence over '*library.com' when the email is 'somebody@library.com'</div> >- <div>The same way, the longest match will take presedence over the shorter one, so '*teacher.university.com' will take presedence over '*.university.com' if the email is 'user@math.teacher.university.com'</div> >+ <p>If this field is empty, or '*' any email domain will match this rule.</p> >+ <p>You may enter a wildcard at the beginning of the domain. For example, the domain '*library.com' will match 'students.library.com' but will also match 'otherlibrary.com'</p> >+ <p>Exact matches have precedence over wildcard ones, so 'library.com' domain will take precedence over '*library.com' when the email is 'somebody@library.com'</p> >+ <p>The same way, the longest match will take precedence over the shorter one, so '*teacher.university.com' will take precedence over '*.university.com' if the email is 'user@math.teacher.university.com'</p> > </div> > </li> >- </ol> >- </fieldset> >- >- <fieldset class="rows"> >- <ol> > <li> > <label for="update_on_auth">Update on login: </label> > <select name="update_on_auth" id="update_on_auth"> >@@ -178,17 +173,12 @@ > <input type="text" name="domain" id="domain" size="60" value="[%- identity_provider_domain.domain | html -%]"/> > <div class="hint">Email domain to match this rule. <button class="more btn btn-ligth" data-target="domain"><i class="fa fa-caret-down"></i> More</button></div> > <div class="hint more-domain" style="display: none"> >- <div>If this field is empty, or '*' any email domain will match this rule.</div> >- <div>You may enter a wildcard at the beginning of the domain. For example, the domain '*library.com' will match 'students.library.com' but will also match 'otherlibrary.com'</div> >- <div>Exact matches have presedence over asterix ones, so if the 'library.com' domain will take presedence over '*library.com' when the email is 'somebody@library.com'</div> >- <div>The same way, the longest match will take presedence over the shorter one, so '*teacher.university.com' will take presedence over '*.university.com' if the email is 'user@math.teacher.university.com'</div> >+ <p>If this field is empty, or '*' any email domain will match this rule.</p> >+ <p>You may enter a wildcard at the beginning of the domain. For example, the domain '*library.com' will match 'students.library.com' but will also match 'otherlibrary.com'</p> >+ <p>Exact matches have precedence over asterix ones, so 'library.com' will take precedence over '*library.com' when the email is 'somebody@library.com'</p> >+ <p>The same way, the longest match will take precedence over the shorter one, so '*teacher.university.com' will take precedence over '*.university.com' if the email is 'user@math.teacher.university.com'</p> > </div> > </li> >- </ol> >- </fieldset> >- >- <fieldset class="rows"> >- <ol> > <li> > <label for="update_on_auth">Update on login: </label> > <select name="update_on_auth" id="update_on_auth"> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33699
:
151008
|
151010
|
151017
|
151122