From 545630731576c69e4a270ce4af7379cee77cd96c Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 8 May 2009 20:43:22 +0000
Subject: [PATCH] moved vandelay into the new TT infrastructure.  still using
 dtd for now.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@13109 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../{vandelay => css/skin/default}/vandelay.css    |  2 +-
 .../web/{ => js/ui/default}/vandelay/vandelay.js   |  4 +-
 .../default/vandelay/inc/attrs.tt2}                |  0
 .../default/vandelay/inc/export.tt2}               |  0
 .../default/vandelay/inc/marchtml.tt2}             |  0
 .../default/vandelay/inc/matches.tt2}              |  0
 .../default/vandelay/inc/progress.tt2}             |  0
 .../default/vandelay/inc/queue.tt2}                |  0
 .../default/vandelay/inc/queueselect.tt2}          |  0
 .../default/vandelay/inc/toolbar.tt2}              |  0
 .../default/vandelay/inc/upload.tt2}               |  0
 .../web/templates/default/vandelay/vandelay.tt2    | 41 +++++++++++++++
 Open-ILS/web/vandelay/vandelay.xml                 | 61 ----------------------
 13 files changed, 44 insertions(+), 64 deletions(-)
 rename Open-ILS/web/{vandelay => css/skin/default}/vandelay.css (97%)
 rename Open-ILS/web/{ => js/ui/default}/vandelay/vandelay.js (99%)
 rename Open-ILS/web/{vandelay/inc/attrs.xml => templates/default/vandelay/inc/attrs.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/export.xml => templates/default/vandelay/inc/export.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/marchtml.xml => templates/default/vandelay/inc/marchtml.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/matches.xml => templates/default/vandelay/inc/matches.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/progress.xml => templates/default/vandelay/inc/progress.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/queue.xml => templates/default/vandelay/inc/queue.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/queueselect.xml => templates/default/vandelay/inc/queueselect.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/toolbar.xml => templates/default/vandelay/inc/toolbar.tt2} (100%)
 rename Open-ILS/web/{vandelay/inc/upload.xml => templates/default/vandelay/inc/upload.tt2} (100%)
 create mode 100644 Open-ILS/web/templates/default/vandelay/vandelay.tt2
 delete mode 100644 Open-ILS/web/vandelay/vandelay.xml

diff --git a/Open-ILS/web/vandelay/vandelay.css b/Open-ILS/web/css/skin/default/vandelay.css
similarity index 97%
rename from Open-ILS/web/vandelay/vandelay.css
rename to Open-ILS/web/css/skin/default/vandelay.css
index 8296037a7..40cae5587 100644
--- a/Open-ILS/web/vandelay/vandelay.css
+++ b/Open-ILS/web/css/skin/default/vandelay.css
@@ -22,7 +22,7 @@ table.dijitTooltipTable { border-collapse: separate; }
     color: red;
     font-weight:bold;
 }
-.tall { height:100%; }
+.tall { height:600px; }
 .wide { width:100%; }
 .hidden { display: none; }
 #toolbar { margin-top: 0px; }
diff --git a/Open-ILS/web/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
similarity index 99%
rename from Open-ILS/web/vandelay/vandelay.js
rename to Open-ILS/web/js/ui/default/vandelay/vandelay.js
index ef249b685..5a8ed0631 100644
--- a/Open-ILS/web/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -82,7 +82,7 @@ var vlBibSources = [];
   * Grab initial data
   */
 function vlInit() {
-    authtoken = dojo.cookie('ses') || cgi.param('ses');
+    authtoken = openils.User.authtoken;
     var initNeeded = 5; // how many async responses do we need before we're init'd 
     var initCount = 0; // how many async reponses we've received
 
@@ -137,7 +137,7 @@ function vlInit() {
 }
 
 
-dojo.addOnLoad(vlInit);
+openils.Util.addOnLoad(vlInit);
 
 
 // fetch the bib and authority attribute definitions
diff --git a/Open-ILS/web/vandelay/inc/attrs.xml b/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/attrs.xml
rename to Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
diff --git a/Open-ILS/web/vandelay/inc/export.xml b/Open-ILS/web/templates/default/vandelay/inc/export.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/export.xml
rename to Open-ILS/web/templates/default/vandelay/inc/export.tt2
diff --git a/Open-ILS/web/vandelay/inc/marchtml.xml b/Open-ILS/web/templates/default/vandelay/inc/marchtml.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/marchtml.xml
rename to Open-ILS/web/templates/default/vandelay/inc/marchtml.tt2
diff --git a/Open-ILS/web/vandelay/inc/matches.xml b/Open-ILS/web/templates/default/vandelay/inc/matches.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/matches.xml
rename to Open-ILS/web/templates/default/vandelay/inc/matches.tt2
diff --git a/Open-ILS/web/vandelay/inc/progress.xml b/Open-ILS/web/templates/default/vandelay/inc/progress.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/progress.xml
rename to Open-ILS/web/templates/default/vandelay/inc/progress.tt2
diff --git a/Open-ILS/web/vandelay/inc/queue.xml b/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/queue.xml
rename to Open-ILS/web/templates/default/vandelay/inc/queue.tt2
diff --git a/Open-ILS/web/vandelay/inc/queueselect.xml b/Open-ILS/web/templates/default/vandelay/inc/queueselect.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/queueselect.xml
rename to Open-ILS/web/templates/default/vandelay/inc/queueselect.tt2
diff --git a/Open-ILS/web/vandelay/inc/toolbar.xml b/Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/toolbar.xml
rename to Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2
diff --git a/Open-ILS/web/vandelay/inc/upload.xml b/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
similarity index 100%
rename from Open-ILS/web/vandelay/inc/upload.xml
rename to Open-ILS/web/templates/default/vandelay/inc/upload.tt2
diff --git a/Open-ILS/web/templates/default/vandelay/vandelay.tt2 b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
new file mode 100644
index 000000000..e0d2f0420
--- /dev/null
+++ b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
@@ -0,0 +1,41 @@
+[% WRAPPER 'default/base.tt2' %]
+[% ctx.page_title = 'MARC Import/Export' %]
+[% ctx.dtd = '<!DOCTYPE html SYSTEM "'_ ctx.web_dir _'/opac/locale/' _ ctx.locale _ '/vandelay.dtd">' %]
+
+<script src='[% ctx.media_prefix %]/js/ui/default/vandelay/vandelay.js'> </script>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/vandelay.css'></link>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %]/vandelay.css'></link>
+
+
+<div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
+        [% INCLUDE 'default/vandelay/inc/toolbar.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+        [% INCLUDE 'default/vandelay/inc/progress.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
+        [% INCLUDE 'default/vandelay/inc/export.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
+        [% INCLUDE 'default/vandelay/inc/upload.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='tall hidden content'>
+        [% INCLUDE 'default/vandelay/inc/queue.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='tall hidden content'>
+        [% INCLUDE 'default/vandelay/inc/matches.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='tall hidden content'>
+        [% INCLUDE 'default/vandelay/inc/marchtml.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='tall hidden content'>
+        [% INCLUDE 'default/vandelay/inc/queueselect.tt2' %]
+    </div>
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="client"  id="vl-attr-editor-div" 
+            class='hidden attr-editor-detail-content-pane content' title='&vandelay.edit.attrs;'>
+        [% INCLUDE 'default/vandelay/inc/attrs.tt2' %]
+    </div>
+</div>
+
+[% END %]
diff --git a/Open-ILS/web/vandelay/vandelay.xml b/Open-ILS/web/vandelay/vandelay.xml
deleted file mode 100644
index 15307491a..000000000
--- a/Open-ILS/web/vandelay/vandelay.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- 
-# Copyright (C) 2008  Georgia Public Library Service
-# Bill Erickson <erickson@esilibrary.com>
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
--->
-
-<!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/vandelay.dtd"-->
-]>
-
-<html xmlns='http://www.w3.org/1999/xhtml'>
-    <head>
-        <title>&vandelay.vandelay;</title>
-        <link type='text/css' rel='stylesheet' href="/vandelay/vandelay.css"/>
-        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:true" src="/js/dojo/dojo/dojo.js"></script>
-        <script type="text/javascript" src='/js/dojo/openils/MarcXPathParser.js'></script>
-        <script type="text/javascript" src='/vandelay/vandelay.js'></script>
-    </head>
-    <body class="tundra">
-        <div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
-                <!--#include virtual="inc/toolbar.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-                <!--#include virtual="inc/progress.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
-                <!--#include virtual="inc/export.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
-                <!--#include virtual="inc/upload.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='tall hidden content'>
-                <!--#include virtual="inc/queue.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='tall hidden content'>
-                <!--#include virtual="inc/matches.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='tall hidden content'>
-                <!--#include virtual="inc/marchtml.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='tall hidden content'>
-                <!--#include virtual="inc/queueselect.xml"-->
-            </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client"  id="vl-attr-editor-div" 
-                    class='hidden attr-editor-detail-content-pane content' title='&vandelay.edit.attrs;'>
-                <!--#include virtual="inc/attrs.xml"-->
-            </div>
-        </div>
-    </body>
-</html>
-- 
2.11.0