Owen
8473254ec3
This patch builds on Bug 22318 to move the OpacNavBottom system
preference into the "Additional contents" system, making it possible to
have language- and library-specific content.
To test you should have some content in the OpacNavBottom system
preference. To make testing easier it's also a good idea to have content
in the OpacNav preference.
- Apply the patch and run the database update process.
- In the staff client, go to Tools -> HTML customizations and verify
that the content from OpacNavBottom is now stored there. When you
edit the entry you should see content from the OpacNavBottom system
preference under the "default" tab.
- The publication date for the entry should be today's date.
- Confirm that the previous contents of OpacNavBottom were added
correctly.
- Go to Administration -> System preferences -> OPAC and verify that
the OpacNavBottom preference has been removed.
- Update and reinstall active translations (for instance fr-FR):
- cd misc/translator/
- perl translate update fr-FR
- perl translate install fr-FR
- View the OPAC and confirm that the contents of the OpacNavBottom
system preference displays in the left-hand sidebar.
- Test as many pages as possible to confirm that wherever the
OpacNavBottom content is displayed, OpacNavBottom is also displayed.
- Test also using the updated translation.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
120 lines
7 KiB
Text
120 lines
7 KiB
Text
[% USE raw %]
|
|
[% USE Koha %]
|
|
[% USE AdditionalContents %]
|
|
[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
|
|
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
|
|
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-registration-confirmation' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div class="main">
|
|
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
|
|
<ol class="breadcrumb">
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
|
|
</li>
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Registration complete</a>
|
|
</li>
|
|
</ol>
|
|
</nav> <!-- /#breadcrumbs -->
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
<div class="col-12 col-lg-2 order-3 order-lg-1">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' %]
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
[% # Three-column layout with right and left sidebars %]
|
|
<div class="col-12 col-lg-7 order-md-1 maincontent">
|
|
[% ELSIF ( OpacNavRight ) %]
|
|
[% # Two-column layout with right sidebar %]
|
|
<div class="col-12 col-lg-9 order-md-1 maincontent">
|
|
[% END %]
|
|
|
|
<div id="registration-complete" class="maincontent">
|
|
<h1>Registration complete!</h1>
|
|
|
|
<p>You have successfully registered your new account.</p>
|
|
[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
|
|
<p>To log in, use the following credentials:</p>
|
|
|
|
<p id="patron-userid-p" class="registration-line">
|
|
<span id="patron-userid-label" class="registration-label">Username:</span>
|
|
<span id="patron-userid" class="registration-value">[% borrower.userid | html %]</span>
|
|
</p>
|
|
<p id="patron-password-p" class="registration-line">
|
|
<span id="patron-password-label" class="registration-label">Password:</span>
|
|
<span id="patron-password" class="registration-value">[% password_cleartext | html %]</span>
|
|
</p>
|
|
|
|
[% IF borrower.cardnumber %]
|
|
<p id="patron-cardnumber-p" class="registration-line">
|
|
<span id="patron-cardnumber-label" class="registration-label">Card number:</span>
|
|
<span id="patron-cardnumber" class="registration-value">[% borrower.cardnumber | html %]</span>
|
|
</p>
|
|
[% END %]
|
|
|
|
<p id="patron-instructions">
|
|
[% IF borrower.category.effective_change_password %]
|
|
<span>For your convenience, the login box on this page has been pre-filled with this data. Please log in and change your password.</span>
|
|
[% ELSE %]
|
|
<span>For your convenience, the login box on this page has been pre-filled with this data. Please log in.</span>
|
|
[% END %]
|
|
</p>
|
|
[% END %]
|
|
|
|
<div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions | $raw %]</div>
|
|
</div> <!-- /#registration-complete -->
|
|
</div> <!-- / .col-7/9 -->
|
|
|
|
<div class="col-12 col-lg-3 order-md-2">
|
|
[% UNLESS ( loggedinusername ) %]
|
|
[% UNLESS ( casAuthentication ) %]
|
|
<div id="login">
|
|
<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
|
|
<input type="hidden" name="koha_login_context" value="opac" />
|
|
<fieldset class="brief">
|
|
<legend>Log in to your account:</legend>
|
|
<label for="userid">Login:</label>
|
|
[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
|
|
<input class="form-control" type="text" id="userid" size="10" name="userid" value="[% borrower.userid | html %]" />
|
|
[% ELSE %]
|
|
<input class="form-control" type="text" id="userid" size="10" name="userid" value="" />
|
|
[% END %]
|
|
<label for="password">Password:</label>
|
|
[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
|
|
<input class="form-control" type="password" id="password" size="10" name="password" value="[% password_cleartext | html %]" />
|
|
[% ELSE %]
|
|
<input class="form-control" type="password" id="password" size="10" name="password" value="" />
|
|
[% END %]
|
|
<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 %]
|
|
</fieldset>
|
|
</form> <!-- /#auth -->
|
|
</div> <!-- /#login -->
|
|
[% END # /casAuthentication %]
|
|
[% END # / loggedinusername %]
|
|
[% IF ( OpacNavRight ) %]
|
|
[% PROCESS koha_news_block news => OpacNavRight %]
|
|
[% END # /OpacNavRight %]
|
|
</div> <!-- / .col-lg-3 -->
|
|
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.container-fluid -->
|
|
</div> <!-- /.main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|