[open-ils-commits] r13150 - in trunk/Open-ILS/web/templates/default/vandelay: . inc (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed May 13 11:41:08 EDT 2009
Author: erickson
Date: 2009-05-13 11:41:06 -0400 (Wed, 13 May 2009)
New Revision: 13150
Modified:
trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
trunk/Open-ILS/web/templates/default/vandelay/vandelay.tt2
Log:
pile of dojo layout fixes for 1.3 and to better ascimilate into the TT framework
Modified: trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2 2009-05-12 20:39:30 UTC (rev 13149)
+++ trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2 2009-05-13 15:41:06 UTC (rev 13150)
@@ -96,6 +96,7 @@
</tr>
</thead>
</table>
+ <div/>
</div>
Modified: trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2 2009-05-12 20:39:30 UTC (rev 13149)
+++ trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2 2009-05-13 15:41:06 UTC (rev 13150)
@@ -1,163 +1,162 @@
-<table class='wide' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
- <tr>
- <td align='left'>
- <h1>&vandelay.record.queue; <span style='font-style:italic;' id='vl-queue-summary-name'/></h1><br/>
- </td>
- <td align='right'>
- &vandelay.queue.total; <span style='font-weight:bold;' id='vl-queue-summary-total-count'/>
- &vandelay.queue.imported; <span style='font-weight:bold;' id='vl-queue-summary-import-count'/>
- </td>
- </tr>
-</table>
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+ <table class='wide'>
+ <tr>
+ <td align='left'>
+ <h1>&vandelay.record.queue; <span style='font-style:italic;' id='vl-queue-summary-name'/></h1><br/>
+ </td>
+ <td align='right'>
+ &vandelay.queue.total; <span style='font-weight:bold;' id='vl-queue-summary-total-count'/>
+ &vandelay.queue.imported; <span style='font-weight:bold;' id='vl-queue-summary-import-count'/>
+ </td>
+ </tr>
+ </table>
+</div>
<br/>
-<div id='vl-queue-div-grid' class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
- <!-- queue grid navigation row -->
- <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
- <table width='100%' style='margin-bottom:0px;'>
- <tr>
- <td align='left' valign='bottom'>
- <select id='vl-queue-actions-selector'>
- <option selected='selected' disabled='disabled' value='select-actions'>&vandelay.select_actions;</option>
- <option value='import'>&vandelay.import.selected;</option>
- <option value='import_all'>&vandelay.import.all;</option>
- <option value='delete_queue'>&vandelay.delete.queue;</option>
- </select>
- <script>
- var sel = dojo.byId('vl-queue-actions-selector');
- sel.onchange = function(evt) {
- switch(openils.Util.selectorValue(evt.target)) {
- case 'import': vlImportSelectedRecords(); break;;
- case 'import_all': vlImportAllRecords(); break;;
- case 'delete_queue':
- if(confirm('&vandelay.sure.to.delete.queue;')) {
- vlDeleteQueue(currentType, currentQueueId,
- function() { displayGlobalDiv('vl-marc-upload-div'); });
- }
- }
- evt.target.selectedIndex = 0;
+
+<!-- queue grid navigation row -->
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+ <table width='100%' style='margin-bottom:0px;'>
+ <tr>
+ <td align='left' valign='bottom'>
+ <select id='vl-queue-actions-selector'>
+ <option selected='selected' disabled='disabled' value='select-actions'>&vandelay.select_actions;</option>
+ <option value='import'>&vandelay.import.selected;</option>
+ <option value='import_all'>&vandelay.import.all;</option>
+ <option value='delete_queue'>&vandelay.delete.queue;</option>
+ </select>
+ <script>
+ var sel = dojo.byId('vl-queue-actions-selector');
+ sel.onchange = function(evt) {
+ switch(openils.Util.selectorValue(evt.target)) {
+ case 'import': vlImportSelectedRecords(); break;;
+ case 'import_all': vlImportAllRecords(); break;;
+ case 'delete_queue':
+ if(confirm('&vandelay.sure.to.delete.queue;')) {
+ vlDeleteQueue(currentType, currentQueueId,
+ function() { displayGlobalDiv('vl-marc-upload-div'); });
+ }
}
- </script>
- </td>
- <td align='middle' valign='bottom'>
- <style>.filter_span { padding-right: 5px; border-right: 2px solid #e8e1cf; } </style>
- <table><tr>
- <td>
- <span>&vandelay.limit.to.collision.matches;</span>
- <span class='filter_span'>
- <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowMatches' onchange='retrieveQueuedRecords();'/>
- </span>
+ evt.target.selectedIndex = 0;
+ }
+ </script>
+ </td>
+ <td align='middle' valign='bottom'>
+ <style>.filter_span { padding-right: 5px; border-right: 2px solid #e8e1cf; } </style>
+ <table><tr>
+ <td>
+ <span>&vandelay.limit.to.collision.matches;</span>
+ <span class='filter_span'>
+ <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowMatches' onchange='retrieveQueuedRecords();'/>
+ </span>
- <span>&vandelay.limit.to.non.imported;</span>
- <span class='filter_span'>
- <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowNonImport' checked='checked' onchange='retrieveQueuedRecords();'/>
- </span>
+ <span>&vandelay.limit.to.non.imported;</span>
+ <span class='filter_span'>
+ <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowNonImport' checked='checked' onchange='retrieveQueuedRecords();'/>
+ </span>
- <span>&vandelay.results.per.page;</span>
- <span class='filter_span'>
- <select jsId='vlQueueDisplayLimit' id='vl-queue-display-limit-selector'
- value='10' onchange='retrieveQueuedRecords();'>
- <option value='10'>10</option>
- <option value='20'>20</option>
- <option value='50'>50</option>
- <option value='100'>100</option>
- </select>
- </span>
+ <span>&vandelay.results.per.page;</span>
+ <span class='filter_span'>
+ <select jsId='vlQueueDisplayLimit' id='vl-queue-display-limit-selector'
+ value='10' onchange='retrieveQueuedRecords();'>
+ <option value='10'>10</option>
+ <option value='20'>20</option>
+ <option value='50'>50</option>
+ <option value='100'>100</option>
+ </select>
+ </span>
- <span style='padding-left:5px;'>&vandelay.page;</span>
- <input style='width:36px;' dojoType='dijit.form.TextBox' jsId='vlQueueDisplayPage' value='1'/>
- </td>
- </tr></table>
- </td>
- <td align='right' valign='bottom'>
- <span style='padding-right:4px;'>
- <a href='javascript:void(0);' onclick='vlQueueGridPrevPage();'>« &vandelay.prev.page;</a>
- </span>
- <span style='padding-right:10px;'>
- <a href='javascript:void(0);' onclick='vlQueueGridNextPage();'>&vandelay.next.page; »</a>
- </span>
- </td>
- </tr>
- </table>
- </div>
+ <span style='padding-left:5px;'>&vandelay.page;</span>
+ <input style='width:36px;' dojoType='dijit.form.TextBox' jsId='vlQueueDisplayPage' value='1'/>
+ </td>
+ </tr></table>
+ </td>
+ <td align='right' valign='bottom'>
+ <span style='padding-right:4px;'>
+ <a href='javascript:void(0);' onclick='vlQueueGridPrevPage();'>« &vandelay.prev.page;</a>
+ </span>
+ <span style='padding-right:10px;'>
+ <a href='javascript:void(0);' onclick='vlQueueGridNextPage();'>&vandelay.next.page; »</a>
+ </span>
+ </td>
+ </tr>
+ </table>
+</div>
- <!-- Bib Queue Grid -->
- <div class='hidden tall' id='vl-bib-queue-grid-wrapper'>
- <div dojoType="openils.widget.GridColumnPicker" jsid="vlBibQueueGridMenu" style="display: none;" grid='vlBibQueueGrid'>
- <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
- </div>
- <div class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client' style='border:1px solid #FFF;'>
- <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{import_time:'*'}" headerMenu='vlBibQueueGridMenu' style='height:600px;'>
- <thead>
- <tr>
- <th
- field='+row_selector'
- get='vlQueueGridDrawSelectBox'
- formatter='vlQueueGridFormatSelectBox'
- styles='text-align: center;'
- nonSelectable='true'>
- <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
- </th>
- <th
- field='+view_marc'
- get='vlGetViewMARC'
- formatter='vlFormatViewMARC'
- styles='text-align: center;'
- nonSelectable='true'>&vandelay.view.marc;</th>
- <th
- field='+get_matches'
- get='vlGetViewMatches'
- formatter='vlFormatViewMatches'
- styles='text-align: center;'
- nonSelectable='true'>&vandelay.matches;</th>
- <th
- field='import_time'
- styles='text-align: center;'
- get='vlGetDateTimeField'>&vandelay.import.time;</th>
- </tr>
- </thead>
- </table>
- </div>
+<!-- Bib Queue Grid -->
+<div class='' id='vl-bib-queue-grid-wrapper' dojoType='dijit.layout.ContentPane'>
+ <div dojoType="openils.widget.GridColumnPicker" jsid="vlBibQueueGridMenu" style="display: none;" grid='vlBibQueueGrid'>
+ <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
</div>
+ <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{import_time:'*'}" headerMenu='vlBibQueueGridMenu' autoHeight='true' _style='height:600px;'>
+ <thead>
+ <tr>
+ <th
+ field='+row_selector'
+ get='vlQueueGridDrawSelectBox'
+ formatter='vlQueueGridFormatSelectBox'
+ styles='text-align: center;'
+ nonSelectable='true'>
+ <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
+ </th>
+ <th
+ field='+view_marc'
+ get='vlGetViewMARC'
+ formatter='vlFormatViewMARC'
+ styles='text-align: center;'
+ nonSelectable='true'>&vandelay.view.marc;</th>
+ <th
+ field='+get_matches'
+ get='vlGetViewMatches'
+ formatter='vlFormatViewMatches'
+ styles='text-align: center;'
+ nonSelectable='true'>&vandelay.matches;</th>
+ <th
+ field='import_time'
+ styles='text-align: center;'
+ get='vlGetDateTimeField'>&vandelay.import.time;</th>
+ </tr>
+ </thead>
+ </table>
+ <div/>
+</div>
- <!-- Auth Queue Grid -->
- <div class='hidden' id='vl-auth-queue-grid-wrapper'>
- <div dojoType="openils.widget.GridColumnPicker" jsid="vlAuthQueueGridMenu" style="display: none;" grid='vlAuthQueueGrid'>
- <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
- </div>
- <div class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
- <table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" headerMenu='vlAuthQueueGridMenu'>
- <thead>
- <tr>
- <th
- field='+row_selector'
- get='vlQueueGridDrawSelectBox'
- formatter='vlQueueGridFormatSelectBox'
- styles='text-align: center;'
- nonSelectable='true'>
- <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
- </th>
- <th
- field='+view_marc'
- get='vlGetViewMARC'
- formatter='vlFormatViewMARC'
- styles='text-align: center;'
- nonSelectable='true'>&vandelay.view.marc;</th>
- <th
- field='+get_matches'
- get='vlGetViewMatches'
- formatter='vlFormatViewMatches'
- styles='text-align: center;'
- nonSelectable='true'>&vandelay.matches;</th>
- <th
- field='import_time'
- styles='text-align: center;'
- get='vlGetDateTimeField'>&vandelay.import.time;</th>
- </tr>
- </thead>
- </table>
- </div>
+<!-- Auth Queue Grid -->
+<div class='' id='vl-auth-queue-grid-wrapper' dojoType='dijit.layout.ContentPane'>
+ <div dojoType="openils.widget.GridColumnPicker" jsid="vlAuthQueueGridMenu" style="display: none;" grid='vlAuthQueueGrid'>
+ <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
</div>
-
+ <table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" headerMenu='vlAuthQueueGridMenu'>
+ <thead>
+ <tr>
+ <th
+ field='+row_selector'
+ get='vlQueueGridDrawSelectBox'
+ formatter='vlQueueGridFormatSelectBox'
+ styles='text-align: center;'
+ nonSelectable='true'>
+ <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
+ </th>
+ <th
+ field='+view_marc'
+ get='vlGetViewMARC'
+ formatter='vlFormatViewMARC'
+ styles='text-align: center;'
+ nonSelectable='true'>&vandelay.view.marc;</th>
+ <th
+ field='+get_matches'
+ get='vlGetViewMatches'
+ formatter='vlFormatViewMatches'
+ styles='text-align: center;'
+ nonSelectable='true'>&vandelay.matches;</th>
+ <th
+ field='import_time'
+ styles='text-align: center;'
+ get='vlGetDateTimeField'>&vandelay.import.time;</th>
+ </tr>
+ </thead>
+ </table>
+ <div/>
</div>
+
Modified: trunk/Open-ILS/web/templates/default/vandelay/vandelay.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/vandelay.tt2 2009-05-12 20:39:30 UTC (rev 13149)
+++ trunk/Open-ILS/web/templates/default/vandelay/vandelay.tt2 2009-05-13 15:41:06 UTC (rev 13150)
@@ -6,36 +6,33 @@
<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 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='hidden content'>
+ [% INCLUDE 'default/vandelay/inc/queue.tt2' %]
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='hidden content'>
+ [% INCLUDE 'default/vandelay/inc/matches.tt2' %]
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='hidden content'>
+ [% INCLUDE 'default/vandelay/inc/marchtml.tt2' %]
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='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>
[% END %]
More information about the open-ils-commits
mailing list