projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4c415a)
LP#1312309: Remove old bbags.xml interface, apache config
authorJeff Godin <jgodin@tadl.org>
Fri, 15 May 2015 23:16:50 +0000 (16:16 -0700)
committerJeff Godin <jgodin@tadl.org>
Wed, 19 Aug 2015 17:04:49 +0000 (13:04 -0400)
Remove the XML and Javascript for the old JSPAC book bags / bbags / list
display.

Also, remove <Location> block in Apache example configs for /opac/extras, as
the only things requiring it were the (now removed) legacy self checkout
interface, and this bbags interface.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Open-ILS/examples/apache/eg_vhost.conf.in patch | blob | history
Open-ILS/examples/apache_24/eg_vhost.conf.in patch | blob | history
Open-ILS/web/opac/extras/bbags.js [deleted file] patch | blob | history
Open-ILS/web/opac/extras/bbags.xml [deleted file] patch | blob | history

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 8530e6b..c692fd7 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -278,14 +278,6 @@ Options -Indexes
     SSLRequireSSL
 </LocationMatch>
 
-<LocationMatch /opac/extras/>
-    # Force to en-US for now to satisfy bbags.xml
-    SetEnv locale en-US
-    Options +Includes
-    AddOutputFilter INCLUDES .xml
-    AddType application/xhtml+xml .xml
-</LocationMatch>
-
 RewriteCond %{QUERY_STRING} locale=([^&]*)
 RewriteRule ^/opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect]
 <LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/>
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 6e8980e..28b8c17 100644 (file)
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -279,15 +279,6 @@ Options -Indexes
     SSLRequireSSL
 </LocationMatch>
 
-<LocationMatch /opac/extras/>
-    SSILegacyExprParser on
-    # Force to en-US for now to satisfy bbags.xml
-    SetEnv locale en-US
-    Options +Includes
-    AddOutputFilter INCLUDES .xml
-    AddType application/xhtml+xml .xml
-</LocationMatch>
-
 RewriteCond %{QUERY_STRING} locale=([^&]*)
 RewriteRule ^/opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect]
 <LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/>
diff --git a/Open-ILS/web/opac/extras/bbags.js b/Open-ILS/web/opac/extras/bbags.js
deleted file mode 100644 (file)
index be5fdc1..0000000
--- a/Open-ILS/web/opac/extras/bbags.js
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/* XXX allow to pass in a 'local' var so the links back into the opac can be localized */
-/* maybe also a 'skin' var */
-
-function bbInit() {
-       var cgi = new CGI();
-       var bb  = cgi.param('bb');
-       if(!bb) { unHideMe($('not_found')); return; }
-       var req = new Request(FLESH_PUBLIC_CONTAINER, 'biblio', bb);
-       req.callback( bbShow );
-       req.send();
-}
-
-
-var template;
-function bbShow(r) {
-
-       var bb = r.getResultObject();
-       if(!bb || !bb.pub()) { unHideMe($('not_found')); return; }
-       $('bb_name').appendChild(text(bb.name()));
-
-       var tbody = $('tbody');
-       if(!template) template = tbody.removeChild($('row_template'));
-
-       for( var i in bb.items() ) 
-               tbody.appendChild(bbShowItem( template, bb.items()[i] ));
-}
-
-function bbShowItem( template, item ) {
-       var row = template.cloneNode(true);
-
-       var req = new Request( FETCH_RMODS, item.target_biblio_record_entry() );
-       req.request.tlink = $n(row, 'title');
-       req.request.alink = $n(row, 'author');
-       req.request.blink = $n(row, 'by');
-
-       req.callback( function(r) { 
-               var rec = r.getResultObject();
-               buildTitleDetailLink(rec, r.tlink); 
-               r.tlink.setAttribute('href', '/opac/en-US/skin/default/xml/rdetail.xml?r='+rec.doc_id());
-               r.alink.appendChild(text(rec.author()));
-               unHideMe(r.blink);
-       });
-
-       req.send();
-       return row;
-}
diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml
deleted file mode 100644 (file)
index 2b6ecf7..0000000
--- a/Open-ILS/web/opac/extras/bbags.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE html PUBLIC 
-       "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-       <head>
-               <title>Evergreen: Bookbag Viewer</title>
-               <script language='javascript' src='/opac/common/js/utils.js'> </script>
-               <script language='javascript' src='/opac/common/js//config.js'> </script> 
-               <script language='javascript' src='/opac/common/js/CGI.js'> </script>
-       
-               <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-               <script language='javascript' src='/opac/common/js/fmall.js'> </script>
-               <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-               <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-               <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-               <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-               <script language='javascript' src='/opac/common/js/init.js'> </script>
-               <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-               <script language='javascript' src='bbags.js'> </script>
-
-               <style type='text/css'>
-                       .hide_me { visibility: hidden; display: none }
-                       .has_color { background: #E0F0E0; color: #000000; }
-                       .data_grid { font-weight: 500; border-collapse: collapse;}
-                       .data_grid thead tr { background: #E0F0E0; color: #000000; }
-                       .data_grid thead td { border: 1px solid #808080; padding-right: 5px; padding-left: 5px;}
-                       .data_grid tbody td { border: 1px solid #E0E0E0; padding: 10px; }
-                       .data_grid_center { text-align: center; }
-               </style>
-
-       </head>
-
-       <body onload='bbInit();'>
-               <center>
-                       <table class='data_grid data_grid_center' width='80%' style='margin-top: 30px;'>
-                               <thead>
-                                       <tr>
-                                               <td id='view_bookbags'>
-                                                       <span>Items in  Bookbag </span>
-                                                       <b><span id='bb_name'> </span></b>
-                                               </td>
-                                       </tr>
-                               </thead>
-                               <tbody id='tbody'>
-                                       <tr id='row_template'>
-                                               <td>
-                                                       <b><a href='javascript:void(0);' name='title'> </a></b>
-                                                       <span name='by' class='hide_me'> By </span><b><span name='author'> </span></b>
-                                               </td>
-                                       </tr>
-                               </tbody>
-                       </table>
-                       <span id='not_found' class='hide_me'><b>No Bookbag found!</b></span>
-               </center>
-       </body>
-
-
-</html>
-
Evergreen working repo (MassLNC)