From: Terran McCanna Date: Wed, 30 Dec 2015 18:51:21 +0000 (-0500) Subject: KPAC changes in preparation for upgrade: X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b1abb68c0b24fadda8a4c05d063fc22d0dc65802;p=evergreen%2Fpines.git KPAC changes in preparation for upgrade: 1. Biggest change was to move the library selector box to the main search panel instead of on the side - had to modify quite a few files in order to make this work and pass the values correctly. 2. Also changed the feature icons to use links instead of search terms to allow more control over search limits and sorting and to see if caching the searches would improve response speed. 3. A number of smaller UI changes. Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml index 7fefb60395..f19ab244d2 100644 --- a/Open-ILS/examples/kpac.xml +++ b/Open-ILS/examples/kpac.xml @@ -23,47 +23,45 @@ - + + + - keyword:valentine's day - - keyword:dinosaur - keyword:princess - 10 - 12 - 11 + http://bit.ly/1YOlOj0 + --> + http://bit.ly/1IDKRy9 + http://bit.ly/1JJ6F6t + + 20 + 30 + 40 + http://bit.ly/1ktf1Iw + http://bit.ly/1JJbf4z homedewey - - - - - - ((keyword:car || keyword:truck) || keyword: automobile) - (keyword:airplane || keyword:aeroplane) - (keyword:train || keyword:locomotive) - (keyword:tractor || keyword:construction) - (keyword:boat || keyword:ship) - (((keyword:military tank || keyword:submarine) || keyword:aircraft carrier) || keyword:military aircraft) - - - + + http://bit.ly/1QZqUEx + http://bit.ly/1OxJTpu + http://bit.ly/1mpI4Os + http://bit.ly/1RRz9CH + http://bit.ly/1PxDdVq + http://bit.ly/1mRw1Ki + http://bit.ly/1OxMKP5 + + https://gapines.org/eg/kpac/results?bookbag=153202;locg=1;trail=11 https://gapines.org/eg/kpac/results?bookbag=153204;locg=1;trail=11 https://gapines.org/eg/kpac/results?bookbag=153203;locg=1;trail=11 @@ -73,32 +71,15 @@ https://gapines.org/eg/kpac/results?bookbag=153205;locg=1;trail=11 https://gapines.org/eg/kpac/results?bookbag=154171;locg=1;trail=11 https://gapines.org/eg/kpac/results?bookbag=379799;locg=1;trail=11 - - - - - (keyword:abc || keyword:alphabet) - ((keyword:number || keyword:123) || keyword:counting) - keyword:colors - ((keyword:nutrition || keyword:vitamins) || keyword:healthy food) - (((keyword:shapes || keyword:circle) || keyword:square) || keyword:triangle) - (keyword:telling time || keyword:clock) - ((((keyword:seasons || keyword:spring) || keyword:summer) || keyword:fall) || keyword:winter) - - - - keyword:science experiment - (keyword:bug || keyword:insect) - keyword:dinosaur sort(pubdate)%23descending - keyword:computer sort(pubdate)%23descending - (((keyword:snake || keyword:lizard) || keyword:reptile) || keyword:amphibian) - (keyword:biology || keyword:living things) - keyword:volcano - ((keyword:astronomy || keyword:planet) || keyword:space) - ((keyword:motion || keyword:physics) || keyword:energy) - ((((keyword:ocean || keyword:octopus) || keyword:beach) || keyword:whale) || keyword:shark) - (keyword:weather || keyword:meteorology) - + + + http://bit.ly/1mpCqvR + http://bit.ly/1mpCzPP + http://bit.ly/1OZLjDp + http://bit.ly/1Tpx8v8 + http://bit.ly/1PwYZdD + http://bit.ly/1VpCY11 + diff --git a/Open-ILS/src/templates/kpac/home.tt2 b/Open-ILS/src/templates/kpac/home.tt2 index d97b6d14b2..6af8def9ea 100644 --- a/Open-ILS/src/templates/kpac/home.tt2 +++ b/Open-ILS/src/templates/kpac/home.tt2 @@ -1,6 +1,7 @@ [% PROCESS "opac/parts/header.tt2"; PROCESS "kpac/parts/grid.tt2"; + PROCESS "opac/parts/org_selector.tt2"; WRAPPER "kpac/parts/base.tt2"; ctx.page_title = l("Home") %] @@ -9,7 +10,7 @@

[% l('Search the Libraries') %]

[% qtype = CGI.param('qtype') %] - +
@@ -24,9 +25,14 @@ - + value=""/> + + + + + +
[% INCLUDE build_org_selector show_loc_groups=1 %]
diff --git a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 index 15abce0e61..c49c69e9c1 100644 --- a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 +++ b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 @@ -2,7 +2,7 @@ [% clear_params = ['action', 'hold', 'pickup_lib', 'ac', 'copy_limit', 'copy_offset', 'list'] %] - [% l('Home') %] diff --git a/Open-ILS/src/templates/kpac/parts/header.tt2 b/Open-ILS/src/templates/kpac/parts/header.tt2 index b7e0df5222..027477d670 100644 --- a/Open-ILS/src/templates/kpac/parts/header.tt2 +++ b/Open-ILS/src/templates/kpac/parts/header.tt2 @@ -1,6 +1,6 @@
- +   [% l('Logo') %]  
diff --git a/Open-ILS/src/templates/kpac/parts/org_selector.tt2 b/Open-ILS/src/templates/kpac/parts/org_selector.tt2 index 82e5c33bcf..b9ad4a0445 100644 --- a/Open-ILS/src/templates/kpac/parts/org_selector.tt2 +++ b/Open-ILS/src/templates/kpac/parts/org_selector.tt2 @@ -1,3 +1,5 @@ + + [% # Org Unit Selector Widget : # INCLUDE build_org_selector id='selector-id' name='selector-name' @@ -8,8 +10,7 @@ # # This is a modified version of opac/parts/org_selector.tt2 - there was a naming conflict with the 'org_unit' variable - - +# that I couldn't figure out at the time I was first trying it out PROCESS get_library; @@ -26,15 +27,10 @@ BLOCK build_org_selector; END; %] - [% urla = CGI.request_uri %] - [% urlb = urla %] - - [% IF (matches = urla.match('locg=')); - urlb = urlb.remove(';locg=' _ CGI.url_param('locg')); - END %] -
- [% WHILE node_stack.size > 0; node = node_stack.pop(); @@ -122,3 +118,4 @@ BLOCK build_org_selector; [% END %] + diff --git a/Open-ILS/src/templates/kpac/parts/searchlimits.tt2 b/Open-ILS/src/templates/kpac/parts/searchlimits.tt2 index a5c3c51774..fae4294f3a 100644 --- a/Open-ILS/src/templates/kpac/parts/searchlimits.tt2 +++ b/Open-ILS/src/templates/kpac/parts/searchlimits.tt2 @@ -36,14 +36,4 @@ [% END %] - -

Showing Results For:

- -[% PROCESS "kpac/parts/org_selector.tt2" %] - -
- [% INCLUDE build_org_selector show_loc_groups=1 %] -
- - [% END %] \ No newline at end of file diff --git a/Open-ILS/src/templates/kpac/parts/subpage.tt2 b/Open-ILS/src/templates/kpac/parts/subpage.tt2 index f33e80b88a..4131822d71 100644 --- a/Open-ILS/src/templates/kpac/parts/subpage.tt2 +++ b/Open-ILS/src/templates/kpac/parts/subpage.tt2 @@ -1,4 +1,6 @@ -[% PROCESS 'kpac/parts/util.tt2'; WRAPPER "kpac/parts/base.tt2" %] +[% PROCESS 'kpac/parts/util.tt2'; + PROCESS "opac/parts/org_selector.tt2"; + WRAPPER "kpac/parts/base.tt2" %] @@ -22,8 +24,13 @@ - + + + + [% INCLUDE build_org_selector show_loc_groups=1 %] + +
diff --git a/Open-ILS/web/css/skin/default/kpac/style.css b/Open-ILS/web/css/skin/default/kpac/style.css index 31ca8b21b6..a896b2875f 100755 --- a/Open-ILS/web/css/skin/default/kpac/style.css +++ b/Open-ILS/web/css/skin/default/kpac/style.css @@ -298,6 +298,16 @@ input[type=text], input[type=password], textarea { margin-right:6px !important; } +.org_selector_dropdown { + margin-top:4px; + padding:5px; + width:326px; + font-size:14px; + font-weight:bold; + margin-right:6px !important; + height:39px; +} + .st_author_box { padding-right:15px !important; } @@ -344,7 +354,7 @@ input[type=text], input[type=password], textarea { width:100%; */ width: 936px; margin:auto; - height:60px; + height:100px; background:#000; font-size:13px; color:#fff; @@ -1101,7 +1111,8 @@ div.hr { margin:0px; height:50px; } - -.branchpicker select { - width:215px; + +#main-content, .content-wrapper-library { + font-size: 16px; + margin-left: 20px; } diff --git a/Open-ILS/web/images/kpac/cat-newyear.png b/Open-ILS/web/images/kpac/cat-newyear.png new file mode 100644 index 0000000000..fcff72e50e Binary files /dev/null and b/Open-ILS/web/images/kpac/cat-newyear.png differ