LP#1772680: Added Link to Wishlist Title, Fixed CSS issues, Changed Buttons on Holds...

Signed-off-by: Jaswinder Singh <jaswinder.singh0011@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

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 e7b0fdb..2ae3b05 100755 (executable)
--- 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 @@
 <div id="rbdigital_footer_links" class="col-md-12">
-    <span class="pull-right"><a href="https://[% vendor_library_url %]" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/login_logo_2x.png[% ctx.cache_key %]" alt="[% l('Visit RBdigital.com') %]"/></a></span>
-    <span class="pull-right"><a href="https://itunes.apple.com/us/app/oneclickdigital/id515311743?mt=8" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/apple.png[% ctx.cache_key %]" alt="[% l('Download it from App Store') %]"/></a></span>
-    <span class="pull-right"><a href="https://play.google.com/store/apps/details?id=com.ocd" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/google.png[% ctx.cache_key %]" alt="[% l('Download it from Google Play') %]"/></a></span>
     <span class="pull-right"><a href="https://www.amazon.com/Recorded-Books-OneClickdigital/dp/B009GLFOL4/ref=sr_1_1?s=mobile-apps&amp;ie=UTF8&amp;qid=1358440633&amp;sr=1-1&amp;keywords=oneclickdigital" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/kindlefire_badge.png[% ctx.cache_key %]" alt="[% l('Download it from Kindle Fire') %]"/></a></span>
+    <span class="pull-right"><a href="https://play.google.com/store/apps/details?id=com.ocd" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/google.png[% ctx.cache_key %]" alt="[% l('Download it from Google Play') %]"/></a></span>
+    <span class="pull-right"><a href="https://itunes.apple.com/us/app/oneclickdigital/id515311743?mt=8" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/apple.png[% ctx.cache_key %]" alt="[% l('Download it from App Store') %]"/></a></span>
+    <span class="pull-right"><a href="https://[% vendor_library_url %]" target="_blank"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/login_logo_2x.png[% ctx.cache_key %]" alt="[% l('Visit RBdigital.com') %]"/></a></span>
 </div>
\ 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 021d1e4..8f9d458 100644 (file)
--- 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 @@
         </div>
         <div class="modal-footer">
           <span id="registerProgress" class="pull-left hidden">Registering ... &nbsp;&nbsp;<img src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif[% ctx.cache_key %]" alt="[% l("Registering...") %]"/></span>
-          <span id="registerError" class="pull-left hidden">Registration failed! There is a problem with your account. Please call or visit your local public library for more information.</span>
+          <span id="registerError" class="pull-left text-center hidden">Registration failed! There is a problem with your account. Please call or visit your local public library for more information.</span>
                <span class="pull-right"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/login_logo.png[% ctx.cache_key %]" alt="[% l("RBdigital") %]"/></span>
         </div>
       </div>

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 (file)
new mode 100755 (executable)
index be1912c..8f1b9f4
--- 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';
 %]
 <h3 class="sr-only">[% l('E-Items Currently Checked Out') %]</h3>
 <div id='myopac_checked_div'>

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 (file)
new mode 100755 (executable)
index f862ed6..63f99a6
--- 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 (file)
new mode 100755 (executable)

diff --git a/Open-ILS/src/templates/opac/myopac/wishlist.tt2 b/Open-ILS/src/templates/opac/myopac/wishlist.tt2
index 0430bc7..7a5e2d0 100644 (file)
--- 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/';
 %]
 <h3 class="sr-only">[% l('My Wishlist') %]</h3>
 <div id='myopac_holds_div'>
@@ -31,7 +33,8 @@
             </tr>
             [% FOR ewishlist IN ctx.wishlist; %]
             <tr id="[% ewishlist.isbn %]_ebook_wishlist_remove">
-                <td>[% ewishlist.title; %]</td>
+                [% vendor_record_url = mkurl(ctx.opac_root _ vendor_record_uri _ ewishlist.isbn,{},[ 'detail_record_view', 'expand','summaryplus','recommendations']); %]
+                <td><a href="[% vendor_record_url %]">[% ewishlist.title; %]</a></td>
                 <td>[% ewishlist.authors; %]</td>
                 <td>[% ewishlist.isbn; %]</td>
                 <td>[% ewishlist.publisher; %]</td>

diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index c848192..164382c 100644 (file)
--- 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 7ac82b1..ae0f0f8 100644 (file)
--- 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 216f0b3..0074939 100644 (file)
--- 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");