Bugzilla – Attachment 71482 Details for
Bug 19959
Update popup window templates to use Bootstrap grid: Label creator
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19959: Update popup window templates to use Bootstrap grid: Label creator
Bug-19959-Update-popup-window-templates-to-use-Boo.patch (text/plain), 7.13 KB, created by
Owen Leonard
on 2018-02-12 15:53:19 UTC
(
hide
)
Description:
Bug 19959: Update popup window templates to use Bootstrap grid: Label creator
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-02-12 15:53:19 UTC
Size:
7.13 KB
patch
obsolete
>From aadbf1569c78615396f17ee688d8055529677dff Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 11 Jan 2018 18:35:44 +0000 >Subject: [PATCH] Bug 19959: Update popup window templates to use Bootstrap > grid: Label creator > >This patch updates two label creator templates to use the Bootstrap grid >instead of the YUI grid. > >To test, apply the patch and go to Label creator -> Manage -> Label >batches. > >- Create a new or open an existing label batch. >- Click "Add items." > - The resulting pop-up window should look correct. > - Perform a search > - The search results screen should look correct. > >Signed-off-by: Charlotte Cordwell <charlotte.cordwell123@gmail.com> >--- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 97 +++++++++++----------- > .../intranet-tmpl/prog/en/modules/labels/search.tt | 15 ++-- > 2 files changed, 57 insertions(+), 55 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 9bf4e1a..ca2ac51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -1,55 +1,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Barcodes and labels › Search results</title> > [% INCLUDE 'doc-head-close.inc' %] >- <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript"> >- //<![CDATA[ >- $(document).ready(function(){ >- $("#toolbar").fixFloat(); >- $("#CheckAll").click(function(e){ >- e.preventDefault(); >- $("input[type='checkbox']").prop("checked",true); >- }); >- $("#CheckNone").click(function(e){ >- e.preventDefault(); >- $("input[type='checkbox']").prop("checked",false); >- }); >- $("#add_items").on("click",function(){ >- add_item('checked',[% batch_id %],'[% type %]'); >- }); >- $(".select_item").on("click",function(e){ >- e.preventDefault(); >- var batch_id = $(this).data("batch-id"); >- var itemnumber = $(this).data("item-number"); >- var type = $(this).data("field-type"); >- add_item(itemnumber, batch_id, type); >- }); >- }); >- function add_item(item_number,batch_id,type_id){ >- var p = window.opener; >- if (item_number == 'checked') { >- items= new Array; >- if(document.resultform.action.length > 0) { >- for (var i=0; i < document.resultform.action.length; i++) { >- if (document.resultform.action[i].checked) { >- p.add_item(document.resultform.action[i].value); >- } >- } >- } else { >- p.add_item(document.resultform.action.value); >- } >- } >- else { >- p.add_item(item_number); >- } >- } >- //]]> >- </script> > </head> >+ > <body id="labels_result" class="tools labels"> >- <div id="custom-doc" class="yui-t7"> >- <div id="bd"> >+ <div class="container-fluid"> > <h1>Search results</h1> > <div class="results"> > [% IF ( displayprev || displaynext ) %] >@@ -150,4 +105,50 @@ z [% END -%] > <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> > [% END %] > </div> >- [% INCLUDE 'popup-bottom.inc' %] >+ >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ <script type="text/javascript"> >+ $(document).ready(function(){ >+ $("#toolbar").fixFloat(); >+ $("#CheckAll").click(function(e){ >+ e.preventDefault(); >+ $("input[type='checkbox']").prop("checked",true); >+ }); >+ $("#CheckNone").click(function(e){ >+ e.preventDefault(); >+ $("input[type='checkbox']").prop("checked",false); >+ }); >+ $("#add_items").on("click",function(){ >+ add_item('checked',[% batch_id %],'[% type %]'); >+ }); >+ $(".select_item").on("click",function(e){ >+ e.preventDefault(); >+ var batch_id = $(this).data("batch-id"); >+ var itemnumber = $(this).data("item-number"); >+ var type = $(this).data("field-type"); >+ add_item(itemnumber, batch_id, type); >+ }); >+ }); >+ function add_item(item_number,batch_id,type_id){ >+ var p = window.opener; >+ if (item_number == 'checked') { >+ items= new Array; >+ if(document.resultform.action.length > 0) { >+ for (var i=0; i < document.resultform.action.length; i++) { >+ if (document.resultform.action[i].checked) { >+ p.add_item(document.resultform.action[i].value); >+ } >+ } >+ } else { >+ p.add_item(document.resultform.action.value); >+ } >+ } >+ else { >+ p.add_item(item_number); >+ } >+ } >+ </script> >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index d9d5235..6795e2c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -1,12 +1,10 @@ > [% INCLUDE 'doc-head-open.inc' %]<title>Koha › Labels</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% INCLUDE 'calendar.inc' %] > <style type="text/css">#custom-doc { width:47.23em;*width:46.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style> > </head> >-<body id="labels_search" class="tools labels"> > >-<div id="custom-doc" class="yui-t7"> >- <div id="bd"> >+<body id="labels_search" class="tools labels"> >+ <div class="container-fluid"> > > <h1>Search for items > [% IF ( batch_id ) %] >@@ -103,6 +101,9 @@ to add to Batch [% batch_id %] > > <fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </form> >-</div> >-</div> >-[% INCLUDE 'popup-bottom.inc' %] >+ >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >-- >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 19959
:
70438
|
70714
|
71482
|
72440