[open-ils-commits] [GIT] Evergreen ILS branch master updated. 22b50dccc96b6977febea1e2877b6a945a3bbef0

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  22b50dccc96b6977febea1e2877b6a945a3bbef0 (commit)
       via  376978e2f507b22521d3ae03251e141b7e579323 (commit)
      from  314b1a5dcb13a67cf146ea8b4c9c9722c57ce78b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22b50dccc96b6977febea1e2877b6a945a3bbef0
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Feb 22 00:03:58 2013 -0500

    Enable dojo in TPAC if using newer Novelist API
    
    Enable dojo if the apache variable for Novelist URL is set. This avoids
    issues such as needing to have dojo enabled via either AutoSuggest or
    Google Books preview, which may not be enabled by every TPAC.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index 4397e81..daa26e5 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -100,4 +100,8 @@
     IF ctx.google_books_preview;
         want_dojo = 1;
     END;
+
+    IF ENV.OILS_NOVELIST_URL;
+        want_dojo = 1;
+    END;
 %]

commit 376978e2f507b22521d3ae03251e141b7e579323
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Oct 11 16:09:12 2012 -0400

    Support new-style Novelist for TPAC.
    
    Updates the Novelist loading script to use the newer Novelist API.
    
    Includes minor change to example/apache/eg_vhost.conf for environment
    variables.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf b/Open-ILS/examples/apache_24/eg_vhost.conf
index 2257bf8..a5e3fcf 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf
@@ -617,6 +617,12 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     #SetEnv OILS_CHILIFRESH_ACCOUNT
     #SetEnv OILS_CHILIFRESH_URL http://chilifresh.com/on-site/js/evergreen.js
     #SetEnv OILS_CHILIFRESH_HTTPS_URL https://secure.chilifresh.com/on-site/js/evergreen.js
+
+    # Novelist
+    # SetEnv OILS_NOVELIST_URL http://imageserver.ebscohost.com/novelistselect/ns2init.js
+    # SetEnv OILS_NOVELIST_PROFILE <profile>
+    # SetEnv OILS_NOVELIST_PASSWORD <password>
+
     #-------------------------------------------------
 
     <IfModule mod_deflate.c>
diff --git a/Open-ILS/src/templates/opac/parts/acjs.tt2 b/Open-ILS/src/templates/opac/parts/acjs.tt2
index 438daf5..9cf83ec 100644
--- a/Open-ILS/src/templates/opac/parts/acjs.tt2
+++ b/Open-ILS/src/templates/opac/parts/acjs.tt2
@@ -48,7 +48,24 @@
                         });
                     });
                 [% END; # IF status unknown
-            END; 
-        END; # IF ident
+            END  %] 
+
+            /* Load novelist content */
+            novSelect.loadContentForQuery(
+                {
+                    ClientIdentifier : '[% ident %]',
+                    ISBN : '[% ident %]',
+                    version : '2.1'
+                }, 
+                '[% ENV.OILS_NOVELIST_PROFILE %]',
+                '[% ENV.OILS_NOVELIST_PASSWORD %]',
+                function(d){
+                    // note if d.length == 0, there is no content to display
+                    // hide the Loading... text
+                    dojo.byId('novelist-loading').innerHTML = '';
+                }
+            );
+
+        [% END; # IF ident
     %]
 </script>
diff --git a/Open-ILS/src/templates/opac/parts/record/awards.tt2 b/Open-ILS/src/templates/opac/parts/record/awards.tt2
index 94c72a2..915b0e0 100644
--- a/Open-ILS/src/templates/opac/parts/record/awards.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/awards.tt2
@@ -7,26 +7,13 @@
             <span class="chili_review" id="isbn_[% attrs.isbn_clean | html %]"> </span>
             <div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center" width="100%"></div>
         </div>
-    
-        <!-- Reviews from added content provider -->
-        [% IF 0 %] 
-        <strong>[% l('Reviews:') %]</strong>
-        <div style="margin-bottom:20px;"></div>
-        [% END %]
 
         <!-- Novelist suggestions-->
         [% IF ENV.OILS_NOVELIST_URL %] 
-        <strong>[% l('Similar Books:') %]</strong>
-        <div class='rdetail_extras_div'>
-            <div id="NoveListSelect" class="NoveListSelect">
-                <div id="NoveListAnchor" class="NoveListSelect"></div>
-                <div id="novsuggestions"></div>
-                <div id="nextreads"></div>
-                <div id="novrelatedauthors"></div>
-                <div id="novrelateditems"></div>
-            </div>
-        </div>
+            <div id='novelist-loading'>[% l('Loading...') %]</div>
+            <div data-novelist-novelistselect="[% attrs.isbn_clean || attrs.upc %]"></div>
         [% END %]
+
     </div>
 </div>
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/apache_24/eg_vhost.conf          |    6 +++++
 Open-ILS/src/templates/opac/parts/acjs.tt2         |   21 ++++++++++++++++++-
 Open-ILS/src/templates/opac/parts/header.tt2       |    4 +++
 .../src/templates/opac/parts/record/awards.tt2     |   19 ++---------------
 4 files changed, 32 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Evergreen ILS