LP#1772680: Added RBdigital links to social, changed registration failed text, minor...

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
new file mode 100755 (executable)
index 0000000..e7b0fdb
--- /dev/null
+++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/footer_links.tt2
@@ -0,0 +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>
+</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 c440f26..021d1e4 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,8 +38,8 @@
         </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! Please try it again.</span>
-               <span class="pull-right"><img src="[% ctx.media_prefix %]/opac/images/ebook_api/rbdigital/rbdigital_logo.png[% ctx.cache_key %]" alt="[% l("RBDigital") %]"/></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 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>
     </div>
@@ -57,7 +57,7 @@
           <div class="center-text">
             Your RBdigital account has been created!<br><br>
             Please remember the RBdigital password you just created. It may be different from your PINES password.<br><br>
-            Visit <a href="https://[% vendor_library_url %]" target="_blank">https://[% vendor_library_url %]</a>/#/help/support to learn about RBdigital and to download RBdigital mobile and desktop apps.<br><br>
+            Visit <a href="https://[% vendor_library_url %]/#/help/support" target="_blank">https://[% vendor_library_url %]</a>/#/help/support to learn about RBdigital and to download RBdigital mobile and desktop apps.<br><br>
             Visit <a href="https://[% vendor_library_url %]" target="_blank">https://[% vendor_library_url %]</a> to search for e-books and e-audiobooks at RBdigital.com or use the RBdigital tab to search from them from this PINES site
           </div>
           <button id="btnCloseRegisterSuccess" type="submit" class="btn btn-danger btn-default pull-right" data-dismiss="modal">Ok</button>

diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/results.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/results.tt2
index 029888a..73d9563 100644 (file)
--- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/results.tt2
+++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/results.tt2
@@ -82,7 +82,9 @@
                 INCLUDE $path %]
             </div>
             <div class="common-full-pad"></div>
+            [% INCLUDE "opac/ebook_api/rbdigital/parts/result/footer_links.tt2" vendor_library_url = ctx.vendor_library_url %]
         </div>
         <br class="clear-both" />
+        
     </div>
 [%- END %]
\ No newline at end of file

diff --git a/Open-ILS/web/css/skin/default/ebook/rbdigital.css b/Open-ILS/web/css/skin/default/ebook/rbdigital.css
index e953549..7ac82b1 100644 (file)
--- a/Open-ILS/web/css/skin/default/ebook/rbdigital.css
+++ b/Open-ILS/web/css/skin/default/ebook/rbdigital.css
@@ -111,4 +111,17 @@ a.opac-button:hover {
 
 .rbdigital .center-text {
        text-align: center;
+}
+
+#rbdigital_footer_links {
+    padding: 1em;
+}
+
+#rbdigital_footer_links span {
+    margin-right: 1em;
+}
+
+#rbdigital_footer_links img {
+    width: 180px;
+    height: 60px;
 }
\ No newline at end of file

diff --git a/Open-ILS/web/opac/images/ebook_api/rbdigital/rbdigital_logo.png b/Open-ILS/web/opac/images/ebook_api/rbdigital/rbdigital_logo.png
deleted file mode 100755 (executable)
index c6a8d87..0000000
Binary files a/Open-ILS/web/opac/images/ebook_api/rbdigital/rbdigital_logo.png and /dev/null differ