[Koha-bugs] [Bug 5983] Change the wording around the CAS login

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5983

Chris Cormack <chris at bigballofwax.co.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Needs Signoff               |Does not apply

--- Comment #6 from Chris Cormack <chris at bigballofwax.co.nz> 2011-12-15 02:18:27 UTC ---
Does not apply

Applying: Bug 5983 minor fix in html to improve translatability
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:14: trailing whitespace.
<p><acronym title="Central Authentication Service">If you have a CAS
account</acronym>, 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:14: trailing whitespace.
<p><acronym title="Central Authentication Service">If you have a CAS
account</acronym>, 
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 5983 minor fix in html to improve translatability


I think this patch may no longer be needed. The existing code is


<p>If you have a <acronym title="Central Authentication Service">CAS</acronym>
account,
[% IF ( casServerUrl ) %]
    please <a href="[% casServerUrl %]">click here to login</a>.<p>
[% END %]

[% IF ( casServersLoop ) %]
please choose against which one you would like to authenticate: </p>
<ul>
    [% FOREACH casServer IN casServersLoop %]
        <li><a href="[% casServer.value %]">[% casServer.name %]</a></li>
    [% END %]
[% END %]
</ul>


So I think this has been fixed already, if you agree please mark it so.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.