Attachment 30751 Details for Bug 12683 – Bug 12683: Follow-up, adding div tags around NoLoginInstructions

[patch] Bug 12683: Follow-up, adding div tags around NoLoginInstructions

Bug-12683-Follow-up-adding-div-tags-around-NoLogin.patch (text/plain), 3.14 KB, created by Marcel de Rooy on 2014-08-13 11:20:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2014-08-13 11:20:50 UTC

Size: 3.14 KB

patch

obsolete

>From 5e9f8d908d4e76d0374590c8da0faafb5af1afa6 Mon Sep 17 00:00:00 2001
>From: simith <simith@inlibro.com>
>Date: Tue, 12 Aug 2014 10:21:56 -0400
>Subject: [PATCH] Bug 12683: Follow-up, adding div tags around
> NoLoginInstructions
>Content-Type: text/plain; charset=utf-8
>
>Button in pop-up displays now as expected.
>
>Signed-off-by: Marc Veron <veron@veron.ch>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../opac-tmpl/bootstrap/en/includes/masthead.inc   |   10 ++++++----
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |    2 ++
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 42f679a..61f1308 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -285,10 +285,12 @@
>                     <fieldset class="brief">
>                         <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
>                         <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
>-                    [% IF ( NoLoginInstructions ) %]
>-                        [% NoLoginInstructions %]
>-                    [% END %]
>-                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
>+                        <div class="NoLoginInstructions">
>+                           [% IF ( NoLoginInstructions ) %]
>+                              [% NoLoginInstructions %]
>+                           [% END %]
>+                        </div>
>+                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
>                     </fieldset>
>             </div>
>             <div class="modal-footer">
>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 0d792c7..b4c957c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -78,9 +78,11 @@
>                                     </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 %]
>                                     </fieldset>
>+                                    <div class="NoLoginInstructions">
>                                     [% IF ( NoLoginInstructions ) %]
>                                         [% NoLoginInstructions %]
>                                     [% END %]
>+                                    </div>
>                                 </form>
>                             </div> 
>                         [% END # /casAuthentication %]
>-- 
>1.7.7.6

Actions: View | Diff | Splinter Review

Attachments on bug 12683: 30415 | 30447 | 30736 | 30739 | 30750 | 30751 | 30839