Bug 35364: Update serials pop-up windows with consistent footer markup
This patch updates several serials module templates in order to style
submission and close buttons in a fixed footer at the bottom of pop-up
windows, with markup consistent with other pop-up windows.
Unrelated change: A couple of templates have had a "page-section" div
added where it was missing.
To test, apply the patch and go to Serials. For each affected template,
test that the window looks correct and the buttons in the footer work
correctly:
- New subscription ->
- Search for a vendor:
- Vendor search form
- Vendor search results
- Search for record
- Record search form
- Record search results
- Complete the process of creating a subscription if there are no other
subscriptions already in your database.
- From the subscription detail page, click the "Renew" button in the
toolbar and test that window.
- From the subscription detail page, click the "Create routing list"
link in the left-hand sidebar menu.
- Add one or more recipients and click "Save"
- Click "Save and preview routing slip" and test the resulting
pop-up.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
parent
8ee1ce0cd2
commit
11f805aec2
GPG key ID:
0EF6E2C03357A834
6 changed files with 86 additions and 31 deletions
|
|
@ -13,29 +13,38 @@
|
|||
[% UNLESS count %]
|
||||
<h2>Your search returned no results.</h2>
|
||||
[% ELSIF ( supplier.length < 1 ) %]
|
||||
<h2>Vendor search: [% count | html %] result(s) found</h2>
|
||||
<h2>[% count | html %] result(s) found</h2>
|
||||
[% ELSE %]
|
||||
<h2>Vendor search: [% count | html %] result(s) found for '[% supplier | html %]'</h2>
|
||||
<h2>[% count | html %] result(s) found for '[% supplier | html %]'</h2>
|
||||
[% END %]
|
||||
|
||||
[% IF ( loop_suppliers ) %]
|
||||
<table>
|
||||
<tr>
|
||||
<th>Vendor</th>
|
||||
<th>Select</th>
|
||||
</tr>
|
||||
[% FOREACH loop_supplier IN loop_suppliers %]
|
||||
<div class="page-section">
|
||||
<table>
|
||||
<tr>
|
||||
<td>[% loop_supplier.name | html %]</td>
|
||||
<td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid | html %]" data-vendorname="[% loop_supplier.name | html %]">Choose</a></td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
<th>Vendor</th>
|
||||
<th>Select</th>
|
||||
</tr>
|
||||
[% FOREACH loop_supplier IN loop_suppliers %]
|
||||
<tr>
|
||||
<td>[% loop_supplier.name | html %]</td>
|
||||
<td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid | html %]" data-vendorname="[% loop_supplier.name | html %]">Choose</a></td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
</div> <!-- /.page-section -->
|
||||
[% END %]
|
||||
|
||||
<p><a href="/cgi-bin/koha/serials/acqui-search.pl">Perform a new search</a></p>
|
||||
|
||||
<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Cancel</a></div>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<form action="/cgi-bin/koha/serials/acqui-search.pl">
|
||||
<button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Perform a new search</button>
|
||||
</form>
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
[% MACRO jsinclude BLOCK %]
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -9,9 +9,22 @@
|
|||
|
||||
<h1>Serial subscription: search for vendor </h1>
|
||||
<form action="/cgi-bin/koha/serials/acqui-search-result.pl" method="get">
|
||||
<label for="text">Vendor name: </label>
|
||||
<input id="text" type="text" size="25" name="supplier" autofocus="autofocus" />
|
||||
<input type="submit" class="btn btn-primary" value="OK" />
|
||||
<fieldset class="rows">
|
||||
<ol>
|
||||
<li>
|
||||
<label for="text">Vendor name: </label>
|
||||
<input id="text" type="text" size="25" name="supplier" autofocus="autofocus" />
|
||||
</li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<input type="submit" class="btn btn-primary" value="Search" />
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
</form>
|
||||
|
||||
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@
|
|||
|
||||
[% END %]
|
||||
|
||||
|
||||
|
||||
<div class="pages">
|
||||
[% IF ( displayprev ) %]
|
||||
<a class="nav" href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&type=intranet&startfrom=[% startfromprev |url %]&q=[% query |url %]"><< Previous</a>
|
||||
|
|
@ -60,9 +62,16 @@
|
|||
[% END %]
|
||||
</div>
|
||||
|
||||
<p><a href="subscription-bib-search.pl">Search for another record</a></p>
|
||||
|
||||
<div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<form action="/cgi-bin/koha/serials/subscription-bib-search.pl">
|
||||
<button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Perform a new search</button>
|
||||
</form>
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
[% MACRO jsinclude BLOCK %]
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
<body id="ser_routing-preview-slip" class="ser">
|
||||
<div class="container-fluid">
|
||||
|
||||
<div class="page-section">
|
||||
<table>
|
||||
<tr>
|
||||
<td colspan="2"><h3>[% libraryname | html %]</h3></td>
|
||||
|
|
@ -30,13 +30,21 @@
|
|||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
</div> <!-- /.page-section -->
|
||||
|
||||
<div id="routingnotes">
|
||||
<p id="generalroutingnote">[% Koha.Preference('RoutingListNote') | $raw %]</p>
|
||||
<p id="routingnote">[% routingnotes | html %]</p>
|
||||
</div>
|
||||
|
||||
<div id="closewindow" class="noprint"><a class="btn btn-default btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default btn-default close" href="#">Close</a></div>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<a class="btn btn-default btn-primary" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a>
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
[% MACRO jsinclude BLOCK %]
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -46,9 +46,14 @@
|
|||
[%- END %]
|
||||
</ol>
|
||||
</fieldset>
|
||||
<fieldset class="action">
|
||||
<input type="submit" class="btn btn-primary" value="Search" />
|
||||
</fieldset>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<input type="submit" class="btn btn-primary" value="Search" />
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
</form>
|
||||
|
||||
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
|
||||
|
|
|
|||
|
|
@ -24,9 +24,13 @@
|
|||
<span>Subscriptions renewed.<span>
|
||||
[% END %]
|
||||
|
||||
<div id="closewindow">
|
||||
<a class="btn btn-default btn-default close" href="#">Close</a>
|
||||
</div>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
[% ELSIF op == 'multi_renew' %]
|
||||
|
||||
<form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
|
||||
|
|
@ -100,7 +104,14 @@
|
|||
[% END %]
|
||||
</ol>
|
||||
</fieldset>
|
||||
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
|
||||
<nav class="navbar navbar-default navbar-fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<fieldset class="action">
|
||||
<input type="submit" class="btn btn-primary" value="Submit" />
|
||||
<button type="button" class="btn btn-default close_window">Close window</button>
|
||||
</fieldset>
|
||||
</div>
|
||||
</nav>
|
||||
</form>
|
||||
[% END %]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue