projects / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7266b04)
applying mike's grid scroll fixes, jason's typo fix. thanks guys
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 23 Sep 2008 18:38:17 +0000 (18:38 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 23 Sep 2008 18:38:17 +0000 (18:38 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@10690 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/web/vandelay/vandelay.html patch | blob | history
Open-ILS/web/vandelay/vandelay.js patch | blob | history

diff --git a/Open-ILS/web/vandelay/vandelay.html b/Open-ILS/web/vandelay/vandelay.html
index 8d4e634..615d694 100644 (file)
--- a/Open-ILS/web/vandelay/vandelay.html
+++ b/Open-ILS/web/vandelay/vandelay.html
@@ -38,11 +38,7 @@
             .hidden { display: none; }
             #toolbar { margin-top: 0px; }
             body { width:100%; height:100%; border:0; margin:0; padding:0; }
-            .progress { 
-                width:100%;
-                text-align:center;
-                margin: 20px;
-            }
+            .progress {margin: 20px;}
             .overlay_selected { 
                 padding: 2px; 
                 background: #d9e8f9;
@@ -54,7 +50,8 @@
         <script type="text/javascript" src='vandelay.js'></script>
     </head>
     <body class="tundra tall">
-        <div dojoType="dijit.Toolbar" id='toolbar'>
+      <div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">
+        <div dojoType="dijit.Toolbar" id='toolbar' layoutAlign="top">
             <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                 onclick='displayGlobalDiv("vl-marc-upload-div");' showLabel="true">Import Records</div>
             <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" 
@@ -77,7 +74,7 @@
         </div>
 
         <!-- MARC upload form -->
-        <div id='vl-marc-upload-div' class='hidden'>
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" id='vl-marc-upload-div' class='hidden'>
             <h1>Evergreen MARC File Upload</h1><br/>
             <form id="vl-marc-upload-form" enctype="multipart/form-data">
                 <input type='hidden' name='ses' id='vl-ses-input'/>
@@ -128,7 +125,7 @@
         </div>
 
         <!-- record queue grid -->
-        <div id='vl-queue-div' class='tall hidden'>
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" id='vl-queue-div' class='tall hidden'>
             <h1>Record Queue</h1><br/>
             <script>
                 var vlQueueGridLayout;
@@ -148,7 +145,7 @@
                 <div dojoType="dijit.Dialog" jsId='vlQueueGridColumePickerDialog' title="Column Picker" execute="alert(2);">
                     <table class='form_table'>
                         <thead>
-                            <tr><th width='33%'>Column</th><th width='33%'>Dislapy</th><th width='33%'>Auto Width</th></tr>
+                            <tr><th width='33%'>Column</th><th width='33%'>Display</th><th width='33%'>Auto Width</th></tr>
                         </thead>
                         <tbody>
                             <tr>
@@ -226,7 +223,7 @@
         </div>
 
         <!-- Grid of record matches -->
-        <div id='vl-match-div' class='tall hidden'>
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" id='vl-match-div' class='tall hidden'>
             <script>
                 var vlMatchGridLayout;
                 function resetVlMatchGridLayout() {
@@ -269,7 +266,7 @@
         </div>
 
         <!-- MARC as HTML for matched records -->
-        <div id='vl-match-html-div' class='tall hidden'>
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" id='vl-match-html-div' class='tall hidden'>
             <h1>MARC Record</h1><br/>
             <div>
                 <button dojoType='dijit.form.Button' 
@@ -282,7 +279,7 @@
         </div>
 
         <!-- Form for choosing which queue to view -->
-        <div id='vl-queue-select-div' class='tall hidden'>
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" id='vl-queue-select-div' class='tall hidden'>
             <h1>Select a Queue to Inspect</h1><br/>
             <table class='form_table'>
                 <tr>
@@ -308,5 +305,6 @@
                 </tr>
             </table>
         </div>
+      </div>
     </body>
 </html>
diff --git a/Open-ILS/web/vandelay/vandelay.js b/Open-ILS/web/vandelay/vandelay.js
index 2431e29..9c9ac85 100644 (file)
--- a/Open-ILS/web/vandelay/vandelay.js
+++ b/Open-ILS/web/vandelay/vandelay.js
@@ -17,6 +17,7 @@ dojo.require("dojo.io.iframe");
 dojo.require("dijit.ProgressBar"); 
 dojo.require("dijit.form.Button"); 
 dojo.require("dijit.form.FilteringSelect"); 
+dojo.require("dijit.layout.LayoutContainer");
 dojo.require("dijit.layout.ContentPane");
 dojo.require("dijit.layout.TabContainer");
 dojo.require("dijit.Dialog");
Evergreen ILS