[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3e400639f1b6c8d948980507c37a45df1a79cba3

[Evergreen Git]

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  3e400639f1b6c8d948980507c37a45df1a79cba3 (commit)
      from  c4df2e9ccacb369304dfeca0cfe94286b35d801a (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 3e400639f1b6c8d948980507c37a45df1a79cba3
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Sep 17 14:50:36 2012 -0400

    ACQ scroll back to top of lineitem info page
    
    When displaying the lineitem "info" page (li attributes, marc record),
    be sure to scroll to the top of the page instead of relying on the
    previous scroll location.  In particular, if you last viewed a LI
    toward the bottom of the page, returned (causes scroll down), then go
    back into the info page, the page will be scrolled to the bottom.
    
    The solution is a little funkier than I'd hoped.  The scroll-to point
    has to be a node that is a) within the scrolling dojo div and b). non-
    visible when scrollIntoView is called.  Since the top-level
    page div may be different, depending on who is loading li_table, we rely
    on the caller to place an id=oils-scroll-to-top div in the page for
    general top-scrolling.  (Note, also, window.scrollTo does not work when
    it's the div and not the full page that needs scrolling).
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/acq/picklist/view.tt2 b/Open-ILS/src/templates/acq/picklist/view.tt2
index 65af63b..5d4d2c2 100644
--- a/Open-ILS/src/templates/acq/picklist/view.tt2
+++ b/Open-ILS/src/templates/acq/picklist/view.tt2
@@ -2,6 +2,7 @@
 [% ctx.page_title = 'Selection List' %]
 <div dojoType="dijit.layout.ContentPane" style="height:100%">
     <div class='container'>
+        <div id='oils-scroll-to-top'></div>
         <div id='oils-acq-picklist-header'>
             Selection list <span id='oils-acq-picklist-name'> </span>
             <div class='oils-acq-picklist-attributes'>
diff --git a/Open-ILS/src/templates/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2
index afa2edc..1baf68a 100644
--- a/Open-ILS/src/templates/acq/po/view.tt2
+++ b/Open-ILS/src/templates/acq/po/view.tt2
@@ -1,6 +1,7 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = "Purchase Order" %]
 <div dojoType="dijit.layout.ContentPane" style="height:100%">
+    <div id='oils-scroll-to-top'></div>
     <div>
         <div id='oils-acq-picklist-header'>
             <big>
diff --git a/Open-ILS/src/templates/acq/search/unified.tt2 b/Open-ILS/src/templates/acq/search/unified.tt2
index 41b3a60..0a7259d 100644
--- a/Open-ILS/src/templates/acq/search/unified.tt2
+++ b/Open-ILS/src/templates/acq/search/unified.tt2
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/search/picklist.js"></script>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/search/purchase_order.js"></script>
 <div id="acq-unified-body" class="hidden">
+    <div id='oils-scroll-to-top'></div>
     <div id="acq-unified-heading">
         <span id="acq-unified-heading-actual">Acquisitions Search</span>
         <span id="acq-unified-heading-controls">
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 0ed491e..5f5df76 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -1089,6 +1089,9 @@ function AcqLiTable() {
                 oilsBasePath + "/acq/lineitem/related/" + li.id();
         }
 
+        // if a top scroll point is defined, jump up to it here
+        var node = dojo.byId('oils-scroll-to-top');
+        if (node) dijit.scrollIntoView(node);
     };
 
     this.generateMakeRecTab = function(bib_id,default_view, row) {

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/acq/picklist/view.tt2      |    1 +
 Open-ILS/src/templates/acq/po/view.tt2            |    1 +
 Open-ILS/src/templates/acq/search/unified.tt2     |    1 +
 Open-ILS/web/js/ui/default/acq/common/li_table.js |    3 +++
 4 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS