Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20038: Switch single-column templates to Bootstrap grid: Acquisitions

Browse source 
This patch updates several acquisitions module templates to use the
Bootstrap grid.

- acqui/z3950_search.tt - Acquisitions -> Vendor -> View basket -> Add
  to basket -> From an external source. The Z39.50 search form should
  look correct.
  - Search for a title. The search results page should look correct.

- acqui/addorder.tt - Acquisitions -> Vendor -> View basket -> Add to
  basket. Add an order to the basket which costs more than is available
  in the fund you select. The error/confirmation screen should look
  correct.

- acqui\modordernotes.tt - Acquisitions -> Vendor -> View basket -> Add
  internal or vendor note. The note add form should look correct.

- acqui/cancelorder.tt - Acquisitions -> Vendor -> View basket -> Cancel
  order (from an open basket which has existing orders). The
  confirmation screen should look correct.

- acqui\basketheader.tt - Acquisitions -> Vendor -> New basket. The new
  basket edit form should look correct.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2018-01-18 19:41:45 +00:00 committed by Jonathan Druart
parent 32efe99361
commit fad518ed7d
5 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt
View file

@ -6,11 +6,7 @@
<body id="acq_addorder" class="acq"> <body id="acq_addorder" class="acq">
[% INCLUDE "header.inc" %] [% INCLUDE "header.inc" %]
<div id="doc3" class="yui-t7"> <div class="container-fluid">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
[% IF (not_enough_budget) %] [% IF (not_enough_budget) %]
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post"> <form action="/cgi-bin/koha/acqui/addorder.pl" method="post">
[% FOREACH var IN vars_loop %] [% FOREACH var IN vars_loop %]
@ -35,7 +31,5 @@
</div> </div>
</form> </form>
[% END %] [% END %]
</div>
</div>
</div>
[% INCLUDE "intranet-bottom.inc" %] [% INCLUDE "intranet-bottom.inc" %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
View file

@ -27,10 +27,9 @@
[% END %] [% END %]
</div> </div>
<div id="doc" class="yui-t7"> <div class="main container-fluid">
<div id="bd"> <div class="row">
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div id="yui-main">
[% IF ( add_form ) %] [% IF ( add_form ) %]
[% IF ( basketno ) %] [% IF ( basketno ) %]

9
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
View file

@ -14,11 +14,10 @@
Cancel order Cancel order
</div> </div>
<div id="doc" class="yui-t7"> <div class="main container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
[% UNLESS ( confirmcancel ) %] [% UNLESS ( confirmcancel ) %]
<form method="post" action=""> <form method="post" action="">
<div class="dialog alert"> <div class="dialog alert">
@ -65,5 +64,5 @@
</div> </div>
</div> </div>
</div>
[% INCLUDE 'intranet-bottom.inc' %] [% INCLUDE 'intranet-bottom.inc' %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
View file

@ -14,10 +14,10 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> &rsaquo; Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</div> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> &rsaquo; Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</div>
<div id="doc" class="yui-t7"> <div class="main container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div id="bd">
<div id="yui-main">
[% IF (type == "vendor") %] [% IF (type == "vendor") %]
<h1>Change order vendor note (order no. [% ordernumber %])</h1> <h1>Change order vendor note (order no. [% ordernumber %])</h1>
[% ELSE %] [% ELSE %]
@ -39,4 +39,5 @@
</form> </form>
</div> </div>
</div> </div>
[% INCLUDE 'intranet-bottom.inc' %] [% INCLUDE 'intranet-bottom.inc' %]

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
View file

@ -17,14 +17,13 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order from external source</a> &rsaquo; Search results[% END %]</div> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order from external source</a> &rsaquo; Search results[% END %]</div>
<div id="doc3" class="yui-t7"> <div class="main container-fluid">
<div id="bd">
[% IF ( opsearch ) %]
<h2>Order from external source</h2>
<form method="post" action="z3950_search.pl" name="f" class="checkboxed"> <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
<div class="row">
[% IF ( opsearch ) %]
<div class="col-sm-6">
<h2>Order from external source</h2>
<input type="hidden" name="op" id="op" value="do_search" /> <input type="hidden" name="op" id="op" value="do_search" />
<div class="yui-g">
<div class="yui-u first">
<fieldset class="rows"> <fieldset class="rows">
<ol> <ol>
<li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="[% title |html %]" class="focus" /></li> <li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="[% title |html %]" class="focus" /></li>
@ -50,7 +49,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
<input type="hidden" name="basketno" value="[% basketno | html %]" /> <input type="hidden" name="basketno" value="[% basketno | html %]" />
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
</div> </div>
<div class="yui-u second"> <div class="col-sm-6">
<h2>Search targets</h2> <h2>Search targets</h2>
<div id="z3950_search_targets_acq"> <div id="z3950_search_targets_acq">
<span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span> <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
@ -69,11 +68,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-12">
<fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset> <fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
</div>
</form> </form>
</div>
[% ELSE %] [% ELSE %]
<div class="col-md-12">
<h2>Search results</h2> <h2>Search results</h2>
<p>You searched for: <p>You searched for:
@ -178,12 +182,10 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% END %] [% END %]
<div class="dialog message">Nothing found. <a href="javascript: history.back()">Try another search</a>.</div> <div class="dialog message">Nothing found. <a href="javascript: history.back()">Try another search</a>.</div>
[% END %] [% END %]
</div>
[% END %] [% END %]
</div>
</div>
[% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %] [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %]
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]