Attachment 50857 Details for Bug 16363 – [SIGNED-OFF] Bug 16363: Add floating toolbar to advanced search

[patch] [SIGNED-OFF] Bug 16363: Add floating toolbar to advanced search

SIGNED-OFF-Bug-16363-Add-floating-toolbar-to-advan.patch (text/plain), 3.97 KB, created by Owen Leonard on 2016-04-28 01:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-04-28 01:25:35 UTC

Size: 3.97 KB

patch

obsolete

>From 0d6bb6b78cffb2226527e968cbed77ae0828093e Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Wed, 27 Apr 2016 04:08:40 +0000
>Subject: [PATCH] [SIGNED-OFF] Bug 16363: Add floating toolbar to advanced
> search
>Content-Type: text/plain; charset="utf-8"
>
>EDIT: Ah yes I was so sure it wasn't mini but couldn't remember what to
>use! Thanks for that Owen
>
>To test:
>1) Go to advanced search
>2) Confirm Save, More Options and Clear fields (notice change from New
>search to Clear fields) are in toolbar and work as expected
>
>Sponsored-by: Catalyst IT
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/catalogue/advsearch.tt         |   45 +++++++++++---------
> 1 file changed, 24 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>index e2bd3cc..6019f4c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -1,6 +1,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Catalog &rsaquo; Advanced search</title>
> [% INCLUDE 'doc-head-close.inc' %]
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
> <script type="text/JavaScript" language="JavaScript">
> 	/**
> 	 *  Function add_field();
>@@ -16,6 +17,7 @@
> 	$(document).ready(function() {
> 		$("input[name=q]:eq(0)").focus();
>         $('#advsearches').tabs();
>+        $('#toolbar').fixFloat();
> 	});
> </script>
> </head>
>@@ -32,6 +34,28 @@
> <h1>Advanced search</h1>
> <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a>
> 
>+
>+<div id="toolbar" class="btn-toolbar">
>+    <fieldset class="action" id="submit1">
>+        <div class="btn-group">
>+            <button class="btn btn-small" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
>+        </div>
>+        <div class="btn-group">
>+        [% IF ( expanded_options ) %]
>+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn-small"><i class="fa fa-search-minus"></i> Fewer options</a>
>+        </div>
>+        [% ELSE %]
>+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn-small"><i class="fa fa-search-plus"></i> More options</a>
>+        </div>
>+        [% END %]
>+        <div class="btn-group">
>+            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear" class="btn-small"><i class="fa fa-times"></i> Clear fields</a>
>+        </div>
>+    </fieldset>
>+</div>
>+
>+
>+
> [% IF ( outer_servers_loop ) %]
> 
> 
>@@ -84,16 +108,6 @@
>     </fieldset>
> 
> 
>-
>-            <fieldset class="action" id="submit1"><input class="submit" type="submit" accesskey="s" value="Search" />
>-            [% IF ( expanded_options ) %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer options]</a>
>-            [% ELSE %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
>-            [% END %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a>
>-            </fieldset>
>-
> </div>
> 
>     <div class="yui-g">
>@@ -269,17 +283,6 @@
>         </p>
> </fieldset>
> 
>-
>-
>-            <fieldset class="action" id="submit2"><input class="submit" type="submit" accesskey="s" value="Search" />
>-            [% IF ( expanded_options ) %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer options]</a>
>-            [% ELSE %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
>-            [% END %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a> 
>-            </fieldset>
>-
> </div>
> </div>
> </form>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16363: 50784 | 50847 | 50849 | 50857 | 50891