From 1a54dc19de27c1f387fad1852d43d9ef01e861f6 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Sat, 29 Sep 2018 19:40:00 -0400 Subject: [PATCH] LP#1772680: Added Link to Wishlist Title, Fixed CSS issues, Changed Buttons on Holds, and other minor fixes Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton --- .../opac/ebook_api/rbdigital/parts/result/footer_links.tt2 | 6 +++--- .../src/templates/opac/ebook_api/rbdigital/register_modal.tt2 | 2 +- Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 | 1 + Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 | 1 + Open-ILS/src/templates/opac/myopac/holds.tt2 | 0 Open-ILS/src/templates/opac/myopac/wishlist.tt2 | 5 ++++- Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 2 +- Open-ILS/web/css/skin/default/ebook/rbdigital.css | 9 +++++---- Open-ILS/web/js/ui/default/opac/ebook_api/loggedin.js | 2 +- 9 files changed, 17 insertions(+), 11 deletions(-) mode change 100644 => 100755 Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 mode change 100644 => 100755 Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 mode change 100644 => 100755 Open-ILS/src/templates/opac/myopac/holds.tt2 diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/footer_links.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/footer_links.tt2 index e7b0fdb2b1..2ae3b05cd3 100755 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/footer_links.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/footer_links.tt2 @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 index 021d1e427d..8f9d458903 100644 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 @@ -38,7 +38,7 @@
- + [% l(
diff --git a/Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 old mode 100644 new mode 100755 index be1912cd61..8f1b9f492b --- a/Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_circs.tt2 @@ -3,6 +3,7 @@ PROCESS "opac/parts/myopac/column_sort_support.tt2"; WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "ebook_circs"; + myopac_parentpage = 'circs'; %]

[% l('E-Items Currently Checked Out') %]

diff --git a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 old mode 100644 new mode 100755 index f862ed6c6a..63f99a6bb8 --- a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 @@ -4,6 +4,7 @@ PROCESS "opac/parts/myopac/column_sort_support.tt2"; WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "ebook_holds"; + myopac_parentpage = 'holds'; limit = (ctx.holds_limit.defined) ? ctx.holds_limit : 0; offset = (ctx.holds_offset.defined) ? ctx.holds_offset : 0; count = (ctx.holds_ids.size.defined) ? ctx.holds_ids.size : 0; diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 old mode 100644 new mode 100755 diff --git a/Open-ILS/src/templates/opac/myopac/wishlist.tt2 b/Open-ILS/src/templates/opac/myopac/wishlist.tt2 index 0430bc7182..7a5e2d0b90 100644 --- a/Open-ILS/src/templates/opac/myopac/wishlist.tt2 +++ b/Open-ILS/src/templates/opac/myopac/wishlist.tt2 @@ -4,6 +4,8 @@ PROCESS "opac/parts/myopac/column_sort_support.tt2"; WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "wishlist"; + + vendor_record_uri = '/ebook_api/rbdigital/record/'; %]

[% l('My Wishlist') %]

@@ -31,7 +33,8 @@ [% FOR ewishlist IN ctx.wishlist; %] - [% ewishlist.title; %] + [% vendor_record_url = mkurl(ctx.opac_root _ vendor_record_uri _ ewishlist.isbn,{},[ 'detail_record_view', 'expand','summaryplus','recommendations']); %] + [% ewishlist.title; %] [% ewishlist.authors; %] [% ewishlist.isbn; %] [% ewishlist.publisher; %] diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 index c84819249d..164382c4ba 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 @@ -37,7 +37,7 @@ [%- FOREACH page IN myopac_pages; NEXT IF ebook_api.enabled != 'true' && page.url == 'wishlist'; - IF page.url == myopac_page; + IF page.url == myopac_page || page.url == myopac_parentpage; cls_which = "acct-tab-on"; ctx.page_title = l("My Account - [_1]", page.name); ELSE; diff --git a/Open-ILS/web/css/skin/default/ebook/rbdigital.css b/Open-ILS/web/css/skin/default/ebook/rbdigital.css index 7ac82b1b69..ae0f0f8ca9 100644 --- a/Open-ILS/web/css/skin/default/ebook/rbdigital.css +++ b/Open-ILS/web/css/skin/default/ebook/rbdigital.css @@ -52,8 +52,9 @@ } .rbdigital #registerProgress, #registerError { - font-size: 18px; - color: #007a54; + font-size: 125%; + font-weight: bold; + color: red; margin-left: 2em; } @@ -122,6 +123,6 @@ a.opac-button:hover { } #rbdigital_footer_links img { - width: 180px; - height: 60px; + width: 90px; + height: 30px; } \ No newline at end of file diff --git a/Open-ILS/web/js/ui/default/opac/ebook_api/loggedin.js b/Open-ILS/web/js/ui/default/opac/ebook_api/loggedin.js index 216f0b3568..0074939c72 100644 --- a/Open-ILS/web/js/ui/default/opac/ebook_api/loggedin.js +++ b/Open-ILS/web/js/ui/default/opac/ebook_api/loggedin.js @@ -201,7 +201,7 @@ function updateHoldView() { dojo.create("td", { innerHTML: h.expire_date }, tr); dojo.create("td", { innerHTML: hold_status }, tr); var actions_td = dojo.create("td", null, tr); - var button = dojo.create("input", { id: "cancel-hold-" + h.title_id, type: "button", value: l_strings.cancel_hold }, actions_td); + var button = dojo.create("input", { id: "cancel-hold-" + h.title_id, type: "button", class: "btn btn-default", value: l_strings.cancel_hold }, actions_td); dojo.connect(button, 'onclick', h, "doCancelHold"); }); dojo.addClass('no_ebook_holds', "hidden"); -- 2.11.0