[open-ils-commits] [GIT] Evergreen ILS branch master updated. db2759bcf9de84f9c22a9499f4d8120c987746d1
Evergreen Git
git at git.evergreen-ils.org
Tue Feb 28 14:47:36 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via db2759bcf9de84f9c22a9499f4d8120c987746d1 (commit)
from 4d5c6ada5a3dbca18e3abfc6dbbafc62df1d09ef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db2759bcf9de84f9c22a9499f4d8120c987746d1
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Dec 19 17:08:12 2011 -0500
Vandelay: refresh upload and inspect queue pages
Vandley sub-pages are currently managed as hidden divs that come into
view when the requested tab is selected. This creates two types of
problems in the interface. The first is that newly created data (e.g. a
new queue) is not available in the UI, because it's not getting
re-fetched from the server when the tab is opened (or added to local
data stores). Second, certain form elements misbehave when the form is
re-rendered without a refresh. Elements, typically checkboxes, will
appear to be selected when they are not. (Or, perhaps they are, and the
method to detect their selection is not sufficient). The simplest
solution to both problems is to simply reload the page....
This patch changes the tabs for Import Records and Inspect Queue so that
they reload the page (focused on the selected tab) instead of just
showing the hidden div. These pages were chosen because they are the
only interfaces that don't automatically refresh their own data and (for
Import Record) have forms that need refreshing.
Additionally, since the user may spend more time loading Vandelay
pages, this also fixes the long-standing annoyance of seeing the
Vandelay UI partially render while waiting for the page to load. Now,
it all remains hidden, except for a brief "Loading..." message.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
index cdfc6d6..61be2a6 100644
--- a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
@@ -2,9 +2,9 @@
<div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-marc-export'
onclick="displayGlobalDiv('vl-marc-export-div');" showLabel="true">[% l('Export Records') %]</div>
<div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-marc-upload'
- onclick="displayGlobalDiv('vl-marc-upload-div');" showLabel="true">[% l('Import Records') %]</div>
+ onclick="location.href = oilsBasePath + '/vandelay/vandelay';" showLabel="true">[% l('Import Records') %]</div>
<div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-queue-select'
- onclick="vlShowQueueSelect();" showLabel="true">[% l('Inspect Queue') %]</div>
+ onclick="location.href = oilsBasePath + '/vandelay/vandelay?page=inspectq';" showLabel="true">[% l('Inspect Queue') %]</div>
<div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-attr-editor'
onclick="vlShowAttrEditor();" showLabel="true">[% l('Record Display Attributes') %]</div>
<div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-profile-editor'
diff --git a/Open-ILS/src/templates/vandelay/vandelay.tt2 b/Open-ILS/src/templates/vandelay/vandelay.tt2
index 6e7c849..cfd6d2b 100644
--- a/Open-ILS/src/templates/vandelay/vandelay.tt2
+++ b/Open-ILS/src/templates/vandelay/vandelay.tt2
@@ -5,44 +5,48 @@
<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/vandelay.css'/>
<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %]/vandelay.css'/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
- [% INCLUDE 'vandelay/inc/toolbar.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
- [% INCLUDE 'vandelay/inc/progress.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/export.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/upload.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/queue.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/matches.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/marchtml.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='hidden content'>
- [% INCLUDE '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='[% l('Record Display Attributes') %]'>
- [% INCLUDE 'vandelay/inc/attrs.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-profile-editor-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/profiles.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-set-editor-div' class='hidden content'>
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-item-attr-editor-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/item_attrs.tt2' %]
-</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-import-error-div' class='hidden content'>
- [% INCLUDE 'vandelay/inc/import_errors.tt2' %]
+<div id="vl-page-loading">[% l('Loading...') %]</div>
+
+<div id='vl-body-wrapper' style="visibility: hidden;">
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
+ [% INCLUDE 'vandelay/inc/toolbar.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+ [% INCLUDE 'vandelay/inc/progress.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/export.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/upload.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/queue.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/matches.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/marchtml.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='hidden content'>
+ [% INCLUDE '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='[% l('Record Display Attributes') %]'>
+ [% INCLUDE 'vandelay/inc/attrs.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-profile-editor-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/profiles.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-set-editor-div' class='hidden content'>
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-item-attr-editor-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/item_attrs.tt2' %]
+ </div>
+ <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-import-error-div' class='hidden content'>
+ [% INCLUDE 'vandelay/inc/import_errors.tt2' %]
+ </div>
</div>
diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 2b39612..24b2a0d 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -337,11 +337,16 @@ function displayGlobalDiv(id) {
}
function runStartupCommands() {
+ openils.Util.hide(dojo.byId('vl-page-loading'));
+ openils.Util.show(dojo.byId('vl-body-wrapper'));
currentQueueId = cgi.param('qid');
currentType = cgi.param('qtype');
dojo.style('vl-nav-bar', 'visibility', 'visible');
if(currentQueueId)
return retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords);
+ if (cgi.param('page', 'inspectq'))
+ return displayGlobalDiv('vl-queue-select-div');
+
vlShowUploadForm();
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/vandelay/inc/toolbar.tt2 | 4 +-
Open-ILS/src/templates/vandelay/vandelay.tt2 | 80 ++++++++++++-----------
Open-ILS/web/js/ui/default/vandelay/vandelay.js | 5 ++
3 files changed, 49 insertions(+), 40 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list