[open-ils-commits] [GIT] Evergreen ILS branch master updated. 62934868d7a42d450539166c70d97d07229c7122

Evergreen Git git at git.evergreen-ils.org
Mon Jul 18 11:28:50 EDT 2011


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  62934868d7a42d450539166c70d97d07229c7122 (commit)
       via  5f2dd33849dc68dfb2b692b0f17b9da028a8aa81 (commit)
       via  c5a678949021a70feac6f65ee14fbd67cadf8014 (commit)
       via  826607cd3fd7fe958c5318d7884a64495da28d89 (commit)
      from  de29b7cadcd827ffbb95c3c07201fcb9bc3607ea (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 62934868d7a42d450539166c70d97d07229c7122
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Wed Jul 6 14:52:53 2011 -0400

    Item Status->Alternate View support for the dynamic Record Summary
    
    For now, you could put something like this in server/skin/custom.js to re-configure the display:
    
    try {
    
        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
        var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
        prefs.setCharPref(
            'oils.bib_brief.alternate_copy_summary.dynamic_grid_replacement.data',
            js2JSON([
                ['title',       'edition',  'editor'],
                ['author',      'pubdate',  'edit_date'],
                ['call_number', 'tcn',      'create_date']
            ])
        );
    
    } catch(E) {
        dump('Error in custom.js trying to set oils.bib_brief.alternate_copy_summary.dynamic_grid_replacement.data: ' + E + '\n');
    }
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.js b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
index b7c5c02..d197422 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.js
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
@@ -1,11 +1,11 @@
 var docid;
 
-function my_init(orientation) {
+function bib_brief_init(mode) {
     try {
 
         ui_init(); // JSAN, etc.
 
-        if (! orientation) { orientation = 'horizontal'; }
+        if (! mode) { mode = 'horizontal'; }
 
         JSAN.use('OpenILS.data');
         g.data = new OpenILS.data();
@@ -54,7 +54,7 @@ function my_init(orientation) {
                                 try {
                                     g.meta = req2.getResultObject()[0];
                                     set_caption();
-                                    dynamic_grid_replacement(orientation);
+                                    dynamic_grid_replacement(mode);
                                     bib_brief_overlay({
                                         'mvr' : g.mods,
                                         'bre' : g.meta
@@ -205,7 +205,7 @@ function ui_init() {
     g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
 }
 
-function dynamic_grid_replacement(orientation) {
+function dynamic_grid_replacement(mode) {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     var prefs = Components.classes[
         '@mozilla.org/preferences-service;1'
@@ -213,20 +213,20 @@ function dynamic_grid_replacement(orientation) {
         Components.interfaces['nsIPrefBranch']
     );
     if (! prefs.prefHasUserValue(
-            'oils.bib_brief.'+orientation+'.dynamic_grid_replacement.data'
+            'oils.bib_brief.'+mode+'.dynamic_grid_replacement.data'
         )
     ) {
-        return;
+        return false;
     }
 
     var gridData = JSON2js(
         prefs.getCharPref(
-            'oils.bib_brief.'+orientation+'.dynamic_grid_replacement.data'
+            'oils.bib_brief.'+mode+'.dynamic_grid_replacement.data'
         )
     );
 
     var grid = document.getElementById('bib_brief_grid');
-    if (!grid) { return; }
+    if (!grid) { return false; }
 
     JSAN.use('util.widgets');
 
@@ -301,5 +301,6 @@ function dynamic_grid_replacement(orientation) {
             row.appendChild(textbox);
         }
     }
+    return true;
 }
 
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
index bce81b7..5cbe572 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
@@ -22,7 +22,7 @@ vim: noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/cat/bib_brief_overlay.xul"?>
 
 <window id="cat_bib_brief_win" 
-    onload="try { my_init(); font_helper(); persist_helper(); unhide_add_volumes_button(); } catch(E) { alert(E); }"
+    onload="try { bib_brief_init(); font_helper(); persist_helper(); unhide_add_volumes_button(); } catch(E) { alert(E); }"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
index b742d20..34f7cbe 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
@@ -22,7 +22,7 @@ vim: noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/cat/bib_brief_overlay_vertical.xul"?>
 
 <window id="cat_bib_brief_win" 
-    onload="try { my_init('vertical'); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    onload="try { bib_brief_init('vertical'); font_helper(); persist_helper(); } catch(E) { alert(E); }"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
index af6d1c0..b7b2207 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
@@ -120,7 +120,15 @@ function load_item() {
             // Should get back .mvr, .copy, .volume, .transit, .circ, .hold
         }
 
-        if (typeof bib_brief_overlay == 'function') bib_brief_overlay( { 'mvr' : details.mvr, 'acp' : details.copy } );
+        if (typeof dynamic_grid_replacement == 'function') {
+            dynamic_grid_replacement('alternate_copy_summary');
+        }
+        if (typeof bib_brief_overlay == 'function') {
+            bib_brief_overlay({
+                'mvr' : details.mvr,
+                'acp' : details.copy
+            });
+        }
 
         set("stat_cat_entries", '');
         set("age_protect", '');
diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
index 2091b43..bcdf212 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
@@ -30,6 +30,7 @@
     <scripts id="openils_util_scripts"/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
     <script type="text/javascript" src="alternate_copy_summary.js"/>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index fb389ca..6c4eb06 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -526,6 +526,8 @@ staff.cat.bib_brief.pubdate.label=Pub Date:
 staff.cat.bib_brief.pubdate.accesskey=
 staff.cat.bib_brief.bib_call_number.label=Bib Call #:
 staff.cat.bib_brief.bib_call_number.accesskey=
+staff.cat.bib_brief.call_number.label=Item Call #:
+staff.cat.bib_brief.ib_call_number.accesskey=
 staff.cat.bib_brief.tcn.label=TCN:
 staff.cat.bib_brief.tcn.accesskey=
 staff.cat.bib_brief.mvr_doc_id.label=Record ID:

commit 5f2dd33849dc68dfb2b692b0f17b9da028a8aa81
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Wed Jul 6 03:19:09 2011 -0400

    dynamic Record Summary layout based on preference
    
    For now, you could add something like this to server/skin/custom.js to re-configure the display:
    
    try {
    
        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
        var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
        prefs.setCharPref(
            'oils.bib_brief.horizontal.dynamic_grid_replacement.data',
            js2JSON([
                ['title',           'edition',  'editor'],
                ['author',          'pubdate',  'edit_date'],
                ['bib_call_number', 'tcn',      'create_date']
            ])
        );
    
    } catch(E) {
        dump('Error in custom.js trying to set oils.bib_brief.horizontal.dynamic_grid_replacement.data: ' + E + '\n');
    }
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.js b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
index 930e68c..b7c5c02 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.js
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
@@ -5,6 +5,8 @@ function my_init(orientation) {
 
         ui_init(); // JSAN, etc.
 
+        if (! orientation) { orientation = 'horizontal'; }
+
         JSAN.use('OpenILS.data');
         g.data = new OpenILS.data();
         g.data.stash_retrieve();
@@ -52,6 +54,7 @@ function my_init(orientation) {
                                 try {
                                     g.meta = req2.getResultObject()[0];
                                     set_caption();
+                                    dynamic_grid_replacement(orientation);
                                     bib_brief_overlay({
                                         'mvr' : g.mods,
                                         'bre' : g.meta
@@ -202,3 +205,101 @@ function ui_init() {
     g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
 }
 
+function dynamic_grid_replacement(orientation) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var prefs = Components.classes[
+        '@mozilla.org/preferences-service;1'
+    ].getService(
+        Components.interfaces['nsIPrefBranch']
+    );
+    if (! prefs.prefHasUserValue(
+            'oils.bib_brief.'+orientation+'.dynamic_grid_replacement.data'
+        )
+    ) {
+        return;
+    }
+
+    var gridData = JSON2js(
+        prefs.getCharPref(
+            'oils.bib_brief.'+orientation+'.dynamic_grid_replacement.data'
+        )
+    );
+
+    var grid = document.getElementById('bib_brief_grid');
+    if (!grid) { return; }
+
+    JSAN.use('util.widgets');
+
+    util.widgets.remove_children(grid);
+
+    var columns = document.createElement('columns');
+    grid.appendChild(columns);
+
+    var maxColumns = 0;
+    for (var i = 0; i < gridData.length; i++) {
+        if (gridData[i].length > maxColumns) {
+            maxColumns = gridData[i].length;
+        }
+    }
+
+    for (var i = 0; i < maxColumns; i++) {
+        var columnA = document.createElement('column');
+        columns.appendChild(columnA);
+        var columnB = document.createElement('column');
+        columns.appendChild(columnB);
+    }
+
+    // Flex the column where the title usually goes
+    columns.firstChild.nextSibling.setAttribute('flex','1');
+
+    var rows = document.createElement('rows');
+    grid.appendChild(rows);
+
+/*
+    <row id="bib_brief_grid_row1" position="1">
+        <label control="title" class="emphasis"
+            value="&staff.cat.bib_brief.title.label;"
+            accesskey="&staff.cat.bib_brief.title.accesskey;"/>
+        <textbox id="title"
+            name="title" readonly="true" context="clipboard"
+            class="plain" onfocus="this.select()"/>
+    </row>
+*/
+
+    var catStrings = document.getElementById('catStrings');
+
+    for (var i = 0; i < gridData.length; i++) {
+        var row = document.createElement('row');
+        row.setAttribute('id','bib_brief_grid_row'+i);
+        rows.appendChild(row);
+
+        for (var j = 0; j < gridData[i].length; j++) {
+            var name = gridData[i][j];
+
+            var label = document.createElement('label');
+            label.setAttribute('control',name);
+            label.setAttribute('class','emphasis');
+            label.setAttribute('value',
+                catStrings.testString('staff.cat.bib_brief.'+name+'.label')
+                ? catStrings.getString('staff.cat.bib_brief.'+name+'.label')
+                : name
+            );
+            label.setAttribute('accesskey',
+                catStrings.testString('staff.cat.bib_brief.'+name+'.accesskey')
+                ? catStrings.getString('staff.cat.bib_brief.'+name+'.accesskey')
+                : name
+            );
+            row.appendChild(label);
+
+            var textbox = document.createElement('textbox');
+            textbox.setAttribute('id',name);
+            textbox.setAttribute('name',name);
+            textbox.setAttribute('readonly','true');
+            textbox.setAttribute('context','clipboard');
+            textbox.setAttribute('class','plain');
+            textbox.setAttribute('onfocus','this.select()');
+            row.appendChild(textbox);
+        }
+    }
+}
+
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index f035034..fb389ca 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -516,3 +516,27 @@ staff.cat.z3950.spawn_marc_editor_for_overlay.success_overlay=Record successfull
 staff.cat.z3950.spawn_marc_editor_for_overlay.overlay_error=Record not likely overlaid.
 staff.cat.z3950.load_creds.z3950_cred_error=Error retrieving stored z39.50 credentials
 staff.cat.z3950.save_creds.z3950_cred_error=Problem storing z39.50 credentials.
+staff.cat.bib_brief.title.label=Title:
+staff.cat.bib_brief.title.accesskey=
+staff.cat.bib_brief.author.label=Author:
+staff.cat.bib_brief.author.accesskey=
+staff.cat.bib_brief.edition.label=Edition:
+staff.cat.bib_brief.edition.accesskey=
+staff.cat.bib_brief.pubdate.label=Pub Date:
+staff.cat.bib_brief.pubdate.accesskey=
+staff.cat.bib_brief.bib_call_number.label=Bib Call #:
+staff.cat.bib_brief.bib_call_number.accesskey=
+staff.cat.bib_brief.tcn.label=TCN:
+staff.cat.bib_brief.tcn.accesskey=
+staff.cat.bib_brief.mvr_doc_id.label=Record ID:
+staff.cat.bib_brief.mvr_doc_id.accesskey=
+staff.cat.bib_brief.owner.label=Record Owner:
+staff.cat.bib_brief.owner.accesskey=
+staff.cat.bib_brief.creator.label=Created By:
+staff.cat.bib_brief.creator.accesskey=
+staff.cat.bib_brief.create_date.label=Created On:
+staff.cat.bib_brief.create_date.accesskey=
+staff.cat.bib_brief.editor.label=Last Edited By:
+staff.cat.bib_brief.editor.accesskey=
+staff.cat.bib_brief.edit_date.label=Last Edited On:
+staff.cat.bib_brief.edit_date.accesskey=

commit c5a678949021a70feac6f65ee14fbd67cadf8014
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Wed Jul 6 02:32:01 2011 -0400

    some refactoring in prep for dynamic Record Summary layout
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.js b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
index 44bc145..930e68c 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.js
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
@@ -1,21 +1,24 @@
 var docid;
 
-function my_init() {
+function my_init(orientation) {
     try {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-        if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-        JSAN.errorLevel = "die"; // none, warn, or die
-        JSAN.addRepository('/xul/server/');
-        JSAN.use('util.error'); g.error = new util.error();
-        g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
 
-        JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+        ui_init(); // JSAN, etc.
+
+        JSAN.use('OpenILS.data');
+        g.data = new OpenILS.data();
+        g.data.stash_retrieve();
 
         docid = xul_param('docid');
 
+        // hackery if modal and invoked with util.window
         var key = location.pathname + location.search + location.hash;
-        if (!docid && typeof g.data.modal_xulG_stack != 'undefined' && typeof g.data.modal_xulG_stack[key] != 'undefined') {
-            var xulG = g.data.modal_xulG_stack[key][ g.data.modal_xulG_stack[key].length - 1 ];
+        if (!docid
+            && typeof g.data.modal_xulG_stack != 'undefined'
+            && typeof g.data.modal_xulG_stack[key] != 'undefined'
+        ) {
+            var xulG = g.data.modal_xulG_stack[key][
+                g.data.modal_xulG_stack[key].length - 1 ];
             if (typeof xulG == 'object') {
                 docid = xulG.docid;
             }
@@ -24,7 +27,12 @@ function my_init() {
         JSAN.use('util.network'); g.network = new util.network();
         JSAN.use('util.date');
 
-        document.getElementById('caption').setAttribute('tooltiptext',document.getElementById('catStrings').getFormattedString('staff.cat.bib_brief.record_id', [docid]));
+        document.getElementById('caption').setAttribute(
+            'tooltiptext',
+            document.getElementById('catStrings').getFormattedString(
+                'staff.cat.bib_brief.record_id', [docid]
+            )
+        );
 
         if (docid > -1) {
 
@@ -34,48 +42,36 @@ function my_init() {
                 'MODS_SLIM_RECORD_RETRIEVE.authoritative',
                 [ docid ],
                 function (req) {
-                    var mods = req.getResultObject();
-                    
-                    if (window.xulG && typeof window.xulG.set_tab_name == 'function') {
-                        try {
-                            window.xulG.set_tab_name(mods.tcn());
-                        } catch(E) {
-                            g.error.sdump('D_ERROR','bib_brief.xul, set_tab: ' + E);
-                        }
-                    }
-
-                    g.network.simple_request(
-                        'FM_BRE_RETRIEVE_VIA_ID.authoritative',
-                        [ ses(), [ docid ] ],
-                        function (req) {
-                            try {
-                                var meta = req.getResultObject();
-                                if (typeof meta.ilsevent != 'undefined') throw(meta);
-                                meta = meta[0];
-                                var t = document.getElementById('caption').getAttribute('label');
-                                if (get_bool( meta.deleted() )) { 
-                                    t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.deleted') + ' '; 
-                                    document.getElementById('caption').setAttribute('style','background: red; color: white;');
+                    try {
+                        g.mods = req.getResultObject();
+                        set_tab_name();
+                        g.network.simple_request(
+                            'FM_BRE_RETRIEVE_VIA_ID.authoritative',
+                            [ ses(), [ docid ] ],
+                            function (req2) {
+                                try {
+                                    g.meta = req2.getResultObject()[0];
+                                    set_caption();
+                                    bib_brief_overlay({
+                                        'mvr' : g.mods,
+                                        'bre' : g.meta
+                                    });
+                                } catch(E) {
+                                    alert('Error in bib_brief.js, '
+                                        + 'req handler 2: ' + E + '\n');
                                 }
-                                if ( ! get_bool( meta.active() ) ) { 
-                                    t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.inactive') + ' '; 
-                                    document.getElementById('caption').setAttribute('style','background: red; color: white;');
-                                }
-                                document.getElementById('caption').setAttribute('label',t);
-
-                                bib_brief_overlay( { 'mvr' : mods, 'bre' : meta } );
-
-                            } catch(E) {
-                                g.error.standard_unexpected_error_alert('meta retrieve',E);
                             }
-                        }
-                    );
+                        );
+                    } catch(E) {
+                        alert('Error in bib_brief.js, req handler 1: '
+                            + E + '\n');
+                    }
                 }
             );
 
         } else {
             var t = document.getElementById('caption').getAttribute('label');
-            t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.noncat') + ' '; 
+            t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.noncat') + ' ';
             document.getElementById('caption').setAttribute('style','background: red; color: white;');
             document.getElementById('caption').setAttribute('label',t);
         }
@@ -87,6 +83,32 @@ function my_init() {
     }
 }
 
+function set_tab_name() {
+    try {
+        window.xulG.set_tab_name(g.mods.tcn());
+    } catch(E) {
+        dump('Error in bib_brief.js, set_tab_name(): ' + E + '\n');
+    }
+}
+
+function set_caption() {
+    try {
+        var t = document.getElementById('caption').getAttribute('label');
+        if (get_bool( g.meta.deleted() )) {
+            t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.deleted') + ' ';
+            document.getElementById('caption').setAttribute('style','background: red; color: white;');
+        }
+        if ( ! get_bool( g.meta.active() ) ) {
+            t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.inactive') + ' ';
+            document.getElementById('caption').setAttribute('style','background: red; color: white;');
+        }
+        document.getElementById('caption').setAttribute('label',t);
+
+    } catch(E) {
+        dump('Error in bib_brief.js, set_caption(): ' + E + '\n');
+    }
+}
+
 function unhide_add_volumes_button() {
     if (xulG && typeof xulG == 'object' && typeof xulG['new_tab'] == 'function') {
         document.getElementById('add_volumes').hidden = false;
@@ -164,3 +186,19 @@ function add_volumes() {
         alert('Error in server/cat/bib_brief.js, add_volumes(): ' + E);
     }
 }
+
+function ui_init() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+        throw(
+            document.getElementById("commonStrings").getString(
+                'common.jsan.missing'
+            )
+        );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
+}
+
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
index 7d89b69..f2a1939 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
@@ -8,7 +8,7 @@
         <script type="text/javascript" src="/xul/server/cat/bib_brief_overlay.js"/>
 
         <grid id="bib_brief_grid" flex="0">
-            <columns>
+            <columns id="bib_brief_grid_columns">
                 <column />
                 <column flex="1" />
                 <column />
@@ -29,7 +29,7 @@
                     <label value="&staff.cat.bib_brief.created_by.label;" accesskey="&staff.cat.bib_brief.created_by.accesskey;" control="creator" class="emphasis"/>
                     <textbox id="creator" name="creator" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
                 </row>
-                <row position="2">
+                <row id="bib_brief_grid_row2" position="2">
                     <label value="&staff.cat.bib_brief.author.label;" accesskey="&staff.cat.bib_brief.author.accesskey;" control="author" class="emphasis"/>
                     <textbox id="author" name="author" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
                     <label value="&staff.cat.bib_brief.pub_date.label;" accesskey="&staff.cat.bib_brief.pub_date.accesskey;" control="pubdate" class="emphasis"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
index 15ed851..b742d20 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
@@ -22,7 +22,7 @@ vim: noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/cat/bib_brief_overlay_vertical.xul"?>
 
 <window id="cat_bib_brief_win" 
-    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    onload="try { my_init('vertical'); font_helper(); persist_helper(); } catch(E) { alert(E); }"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->

commit 826607cd3fd7fe958c5318d7884a64495da28d89
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Fri Jul 1 12:05:46 2011 -0400

    in staff Record Summary (bib brief) pane, stretch the column for title, author, and bib call #
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
index 93b654d..7d89b69 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
@@ -10,7 +10,7 @@
         <grid id="bib_brief_grid" flex="0">
             <columns>
                 <column />
-                <column />
+                <column flex="1" />
                 <column />
                 <column />
                 <column />

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

Summary of changes:
 Open-ILS/xul/staff_client/server/cat/bib_brief.js  |  232 ++++++++++++++++----
 Open-ILS/xul/staff_client/server/cat/bib_brief.xul |    2 +-
 .../staff_client/server/cat/bib_brief_overlay.xul  |    6 +-
 .../staff_client/server/cat/bib_brief_vertical.xul |    2 +-
 .../server/circ/alternate_copy_summary.js          |   10 +-
 .../server/circ/alternate_copy_summary.xul         |    1 +
 .../server/locale/en-US/cat.properties             |   26 +++
 7 files changed, 227 insertions(+), 52 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list