LP#1772680: Fixed issues with Sorting and added image assests

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

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm
index af3106a..df6d51a 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm
@@ -285,8 +285,6 @@ sub _build_search_URI {
     
     if ($sort_by ne '') {
         $sort_string = "&sort-by=$sort_by&sort-order=$sort_order";
-    } else {
-        $sort_string = '&sort-by=title'; #Default to Title sort
     }
 
     # convert book to ebook

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 76c75e0..c440f26 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
@@ -39,7 +39,7 @@
         <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 %]/images/rbdigital_logo.png[% ctx.cache_key %]" alt="[% l("RBDigital") %]"/></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>
         </div>
       </div>
     </div>

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

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

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

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

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

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

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
new file mode 100755 (executable)
index 0000000..c6a8d87
Binary files /dev/null and b/Open-ILS/web/opac/images/ebook_api/rbdigital/rbdigital_logo.png differ