Bugzilla – Attachment 70748 Details for
Bug 20038
Switch single-column templates to Bootstrap grid: Acquisitions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20038: Switch single-column templates to Bootstrap grid: Acquisitions
Bug-20038-Switch-single-column-templates-to-Bootst.patch (text/plain), 8.12 KB, created by
Owen Leonard
on 2018-01-19 14:40:50 UTC
(
hide
)
Description:
Bug 20038: Switch single-column templates to Bootstrap grid: Acquisitions
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-01-19 14:40:50 UTC
Size:
8.12 KB
patch
obsolete
>From b96bf71e0104d75b4342b98c389771a6874f5d6a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 18 Jan 2018 19:41:45 +0000 >Subject: [PATCH] Bug 20038: Switch single-column templates to Bootstrap grid: > Acquisitions > >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. >--- > .../prog/en/modules/acqui/addorder.tt | 10 ++-------- > .../prog/en/modules/acqui/basketheader.tt | 7 +++---- > .../prog/en/modules/acqui/cancelorder.tt | 9 ++++----- > .../prog/en/modules/acqui/modordernotes.tt | 7 ++++--- > .../prog/en/modules/acqui/z3950_search.tt | 22 ++++++++++++---------- > 5 files changed, 25 insertions(+), 30 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt >index 5656b80..18f5429 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt >@@ -6,11 +6,7 @@ > <body id="acq_addorder" class="acq"> > [% INCLUDE "header.inc" %] > >-<div id="doc3" class="yui-t7"> >- >-<div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+ <div class="container-fluid"> > [% IF (not_enough_budget) %] > <form action="/cgi-bin/koha/acqui/addorder.pl" method="post"> > [% FOREACH var IN vars_loop %] >@@ -35,7 +31,5 @@ > </div> > </form> > [% END %] >- </div> >- </div> >-</div> >+ > [% INCLUDE "intranet-bottom.inc" %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 351e525..74b9cc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -27,10 +27,9 @@ > [% END %] > </div> > >-<div id="doc" class="yui-t7"> >- <div id="bd"> >- >- <div id="yui-main"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > > [% IF ( add_form ) %] > [% IF ( basketno ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >index 8cdbe8e..1cd5bea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >@@ -14,11 +14,10 @@ > Cancel order > </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 ) %] > <form method="post" action=""> > <div class="dialog alert"> >@@ -65,5 +64,5 @@ > > </div> > </div> >-</div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >index f17d5c2..c6fd643 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >@@ -14,10 +14,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> › 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") %] > <h1>Change order vendor note (order no. [% ordernumber %])</h1> > [% ELSE %] >@@ -39,4 +39,5 @@ > </form> > </div> > </div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index 98ff748..86fb438 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -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> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> › [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order from external source</a> › Search results[% END %]</div> > >-<div id="doc3" class="yui-t7"> >- <div id="bd"> >- [% IF ( opsearch ) %] >-<h2>Order from external source</h2> >+<div class="main container-fluid"> > <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" /> >- <div class="yui-g"> >- <div class="yui-u first"> > <fieldset class="rows"> > <ol> > <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="booksellerid" value="[% booksellerid | html %]" /> > </div> >-<div class="yui-u second"> >+<div class="col-sm-6"> > <h2>Search targets</h2> > <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> >@@ -69,11 +68,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </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 %]&basketno=[% basketno | uri %]">Cancel</a></fieldset> >+</div> > </form> >+</div> > > > [% ELSE %] >+ <div class="col-md-12"> > <h2>Search results</h2> > > <p>You searched for: >@@ -178,12 +182,10 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% END %] > <div class="dialog message">Nothing found. <a href="javascript: history.back()">Try another search</a>.</div> > [% END %] >- >+</div> > > [% END %] > >- </div> >-</div> > [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %] > > [% MACRO jsinclude BLOCK %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20038
:
70748
|
70875