From 7f6ea9139a9992b4eada2593510c9e2e1ade8405 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 25 Sep 2008 21:31:51 +0000 Subject: [PATCH 1/1] lots of small changes to support using mod_xmlent with vandelay. added new apache config section to that effect git-svn-id: svn://svn.open-ils.org/ILS/trunk@10704 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 15 +++++ Open-ILS/web/vandelay/vandelay.css | 31 +++++++++ Open-ILS/web/vandelay/vandelay.html | 89 +++++++++----------------- Open-ILS/web/vandelay/vandelay.js | 12 ++++ 4 files changed, 87 insertions(+), 60 deletions(-) create mode 100644 Open-ILS/web/vandelay/vandelay.css diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index 007e6fbfd9..ac9a99d5b1 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -304,6 +304,19 @@ RewriteRule ^/conify/.*/global/(.*)$ /conify/global/$1 # ---------------------------------------------------------------------------------- # Vandelay importers / exporters (your Web interface to bibliographic travel) # ---------------------------------------------------------------------------------- +# capture the locale from the URL +AliasMatch ^/vandelay/.*/vandelay.xml(.*) /openils/var/web/vandelay/vandelay.xml$1 + + RewriteEngine on + SetEnvIf Request_URI "/en-US/" locale=en-US + SetEnvIf Request_URI "/fr-CA/" locale=fr-CA + XMLEntStripPI "yes" + XMLEntEscapeScript "no" + XMLEntStripComments "yes" + XMLEntContentType "text/html; charset=utf-8" + XMLEntStripDoctype "yes" + AddOutputFilter INCLUDES;XMLENT .xml + SetHandler perl-script PerlHandler OpenILS::WWW::Vandelay::spool_marc @@ -311,6 +324,8 @@ RewriteRule ^/conify/.*/global/(.*)$ /conify/global/$1 allow from all + + # OpenURL 0.1 searching based on OpenSearch RewriteEngine on RewriteMap openurl prg:/openils/bin/openurl_map.pl diff --git a/Open-ILS/web/vandelay/vandelay.css b/Open-ILS/web/vandelay/vandelay.css new file mode 100644 index 0000000000..a6d271d81c --- /dev/null +++ b/Open-ILS/web/vandelay/vandelay.css @@ -0,0 +1,31 @@ +@import "/js/dojo/dojo/resources/dojo.css"; +@import "/js/dojo/dijit/themes/tundra/tundra.css"; +@import "/js/dojo/dijit/tests/css/dijitTests.css"; +@import "/js/dojo/dojox/grid/_grid/Grid.css"; +.container:after {content: ""; display: block; height: 0; clear: both; } +body { width:100%; height:100%; border:0; margin:0; padding:0; } +table { border-collapse: collapse; } +table.dijitTooltipTable { border-collapse: separate; } +.form_table td { padding: 6px; } +.match_div { + height: 95%; + width: 95%; +} +.match_div a { + color: red; + font-weight:bold; +} +.match_div a:visited { + color: red; + font-weight:bold; +} +.tall { height:100%; } +.wide { width:100%; } +.hidden { display: none; } +#toolbar { margin-top: 0px; } +.progress {margin: 20px;} +.overlay_selected { + padding: 2px; + background: #d9e8f9; + border: 1px solid red; +} diff --git a/Open-ILS/web/vandelay/vandelay.html b/Open-ILS/web/vandelay/vandelay.html index 76eacc047e..fc1fd38ec1 100644 --- a/Open-ILS/web/vandelay/vandelay.html +++ b/Open-ILS/web/vandelay/vandelay.html @@ -1,4 +1,5 @@ - - + + +]> + + Vandelay - + - +
@@ -58,9 +34,9 @@
Import Records
+ onclick="displayGlobalDiv('vl-marc-upload-div');" showLabel="true">Import Records
Inspect Queue
+ onclick="vlShowQueueSelect();" showLabel="true">Inspect Queue
Bib Attr Definitions
@@ -87,7 +63,6 @@

Evergreen MARC File Upload


-
@@ -142,16 +117,16 @@ vlQueueGridLayout = [{ defaultCell: {styles: 'text-align: center;'}, cells : [[ - {name: '', + {name: '<input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"/>', get: vlQueueGridDrawSelectBox }, { name: 'View MARC', get: vlGetViewMARC, - value:'View MARC' + value:'<a href="javascript:void(0);" onclick="vlLoadMARCHtml(RECID, false, '+ + 'function(){displayGlobalDiv(\'vl-queue-div\');});">View MARC</a>' }, { name: 'Matches', get: vlGetViewMatches, - value:'Matches' + value:'<a href="javascript:void(0);" onclick="vlLoadMatchUI(RECID);">Matches</a>' }, {name: 'Import Time', field:'import_time', get:vlGetDateTimeField, selectableColumn:true} ]] @@ -184,11 +159,11 @@ +
Record Type
- + function() { displayGlobalDiv('vl-marc-upload-div'); }); + }">Delete Queue @@ -208,7 +183,7 @@ Page - @@ -217,16 +192,10 @@ - « Previous Page + « Previous Page - Next Page » + Next Page » Select Columns @@ -254,7 +223,7 @@ { name: 'Overlay Target', get: vlGetOverlayTargetSelector, - value: '' }, {name:'Source Match Point', field:'src_matchpoint'}, @@ -262,8 +231,8 @@ {name: 'ID', field:'id'}, { name: 'View MARC', get: vlGetViewMARC, - value:'View MARC' + value:'<a href="javascript:void(0);" onclick="vlLoadMARCHtml(RECID, '+ + 'true, function(){displayGlobalDiv(\'vl-match-div\');});">View MARC</a>' }, {name: 'Creator', get: vlGetCreator}, {name: 'Create Date', field:'create_date', get: vlGetDateTimeField}, @@ -278,7 +247,7 @@

Import Matches


+ onclick="displayGlobalDiv('vl-queue-div');">↖ Back To Import Queue Overlay selected record with imported record diff --git a/Open-ILS/web/vandelay/vandelay.js b/Open-ILS/web/vandelay/vandelay.js index e0a5ed2d07..2e051183b5 100644 --- a/Open-ILS/web/vandelay/vandelay.js +++ b/Open-ILS/web/vandelay/vandelay.js @@ -565,6 +565,18 @@ function buildRecordGrid(type) { } } +function vlQueueGridPrevPage() { + var page = parseInt(vlQueueDisplayPage.getValue()); + if(page < 2) return; + vlQueueDisplayPage.setValue(page - 1); + retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords); +} + +function vlQueueGridNextPage() { + vlQueueDisplayPage.setValue(parseInt(vlQueueDisplayPage.getValue())+1); + retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords); +} + function vlDeleteQueue(type, queueId, onload) { fieldmapper.standardRequest( ['open-ils.vandelay', 'open-ils.vandelay.'+type+'_queue.delete'], -- 2.43.2