[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3ef152fdcf964d2d63ac09db2c771286d01c5e1b
Evergreen Git
git at git.evergreen-ils.org
Fri May 20 10:45:18 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 3ef152fdcf964d2d63ac09db2c771286d01c5e1b (commit)
via 9b7cab2a2f5c10c8588b00050445817a6ebfa667 (commit)
via 17e34e387def0e7239f852bb9b92a17e00e1731f (commit)
via 45b6c0503f2095fb5bd9e1975188c5f1b6ff5d88 (commit)
via 7586c71c879108607eaaeeedaedff633dde14685 (commit)
from ea20f3920b2ef71e12ef40afdeb40a6f5f361186 (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 3ef152fdcf964d2d63ac09db2c771286d01c5e1b
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri May 20 05:30:55 2011 -0400
align the batch edit menus in the vol creator. mostly aesthetic, but can save horizontal real estate, so usability as well for horizontal vol/copy editor.
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index dcaac78..d9c2b2c 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -417,15 +417,18 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
var classification_column_box = document.createElement('vbox');
classification_column_box.setAttribute('class','cn_class');
r.appendChild(classification_column_box);
+ classification_column_box.width = $('batch_class').parentNode.boxObject.width;
/**** PREFIX COLUMN ****/
var prefix_column_box = document.createElement('vbox');
prefix_column_box.setAttribute('class','cn_prefix');
r.appendChild(prefix_column_box);
+ prefix_column_box.width = $('batch_prefix').parentNode.boxObject.width;
/**** CALLNUMBER COLUMN ****/
var call_number_column_box = document.createElement('vbox');
r.appendChild(call_number_column_box);
+ call_number_column_box.width = $('marc_cn').parentNode.boxObject.width;
var call_number_column_textbox = document.createElement('textbox');
call_number_column_box.appendChild(call_number_column_textbox);
if (g.use_defaults && $('marc_cn').firstChild) {
@@ -482,6 +485,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
var suffix_column_box = document.createElement('vbox');
suffix_column_box.setAttribute('class','cn_suffix');
r.appendChild(suffix_column_box);
+ suffix_column_box.width = $('batch_suffix').parentNode.boxObject.width;
var suffix_column_menulist = g.render_suffix_menu(call_number_column_textbox);
suffix_column_menulist.addEventListener(
'command',
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index f48695a..5cfc111 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -49,24 +49,51 @@
<vbox id="main" oils_persist="height" flex="1">
<groupbox flex="1" class="my_overflow">
<caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
- <hbox flex="0">
- <hbox id="batch_bar" flex="1">
- <label value="&staff.cat.volume_copy_creator.batch_bar;"/>
- <label class="cn_class" value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
- <hbox class="cn_class" id="batch_class"/>
- <label class="cn_prefix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
- <hbox class="cn_prefix" id="batch_prefix"/>
- <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
- accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;" control="marc_cn_menulist"/>
- <hbox id="marc_cn"/>
- <label class="cn_suffix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
- <hbox class="cn_suffix" id="batch_suffix"/>
- <hbox id="batch_button_box"/>
- </hbox>
- </hbox>
<grid flex="1">
<columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
<rows id="rows">
+ <row id="batch_bar">
+ <spacer />
+ <spacer />
+ <grid flex="1">
+ <columns>
+ <column/>
+ <column/>
+ <column/>
+ <column/>
+ </columns>
+ <rows>
+ <row>
+ <vbox class="cn_class">
+ <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"
+ class="header"/>
+ <hbox id="batch_class"/>
+ </vbox>
+ <vbox class="cn_prefix">
+ <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"
+ class="header"/>
+ <hbox id="batch_prefix"/>
+ </vbox>
+ <vbox>
+ <label
+ value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
+ accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;"
+ control="marc_cn_menulist" class="header"/>
+ <hbox id="marc_cn"/>
+ </vbox>
+ <vbox class="cn_suffix">
+ <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"
+ class="header"/>
+ <hbox id="batch_suffix"/>
+ </vbox>
+ <vbox>
+ <label class="header" value="&staff.cat.volume_copy_creator.batch_bar;"/>
+ <hbox id="batch_button_box"/>
+ </vbox>
+ </row>
+ </rows>
+ </grid>
+ </row>
<row>
<label value="&staff.cat.volume_copy_creator.library_label.value;" style="font-weight: bold"/>
<label value="&staff.cat.volume_copy_creator.num_of_volumes_label.value;" style="font-weight: bold"/>
diff --git a/Open-ILS/xul/staff_client/server/skin/cat.css b/Open-ILS/xul/staff_client/server/skin/cat.css
index d17d0df..3fc7a30 100644
--- a/Open-ILS/xul/staff_client/server/skin/cat.css
+++ b/Open-ILS/xul/staff_client/server/skin/cat.css
@@ -8,7 +8,7 @@
.copy_editor_field_changed { background: lightgreen; }
.copy_editor_field_required { border: solid thin red; }
-hbox#batch_bar { background-color: gray; }
+row#batch_bar { background-color: gray; }
/* How you might hide the classification, affix, and parts columns in the volume creator/editor */
/*
commit 9b7cab2a2f5c10c8588b00050445817a6ebfa667
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri May 20 05:04:17 2011 -0400
usability tweak for controlling screen real estate, in unified vol/copy editor don't embed the the Record Summary in the vol editor, but in the main wrapping UI. Also move CN batch edit bar into groupbox
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index 7bc79c1..dcaac78 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -145,11 +145,18 @@ function my_init() {
alert('Error in volume_copy_creator.js, g.doc_id not valid');
window.close(); return;
}
- var sb = document.getElementById('summary_box'); while(sb.firstChild) sb.removeChild(sb.lastChild);
- var summary = document.createElement('iframe'); sb.appendChild(summary);
- summary.setAttribute('src',urls.XUL_BIB_BRIEF);
- summary.setAttribute('flex','1');
- get_contentWindow(summary).xulG = { 'docid' : g.doc_id };
+
+ var sb = document.getElementById('summary_box');
+ if (xul_param('no_bib_summary')) {
+ sb.hidden = true;
+ sb.nextSibling.hidden = true; /* splitter */
+ } else {
+ while(sb.firstChild) sb.removeChild(sb.lastChild);
+ var summary = document.createElement('iframe'); sb.appendChild(summary);
+ summary.setAttribute('src',urls.XUL_BIB_BRIEF);
+ summary.setAttribute('flex','1');
+ get_contentWindow(summary).xulG = { 'docid' : g.doc_id };
+ }
/***********************************************************************************************************/
/* Setup pcrud and fetch the monographic parts for this bib */
@@ -207,6 +214,10 @@ function my_init() {
dump('Error in volume_copy_creator.js, my_init(), trying to auto-scroll to the far right: ' + E + '\n');
}
+ if (typeof xulG.volume_ui_callback_for_unified_interface == 'function') {
+ xulG.volume_ui_callback_for_unified_interface();
+ }
+
} catch(E) {
var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_copy_creator.js', E]);
try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index 0cbf65d..f48695a 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -47,24 +47,23 @@
<grippy/>
</splitter>
<vbox id="main" oils_persist="height" flex="1">
- <hbox flex="0">
- <hbox id="batch_bar">
- <label value="&staff.cat.volume_copy_creator.batch_bar;"/>
- <label class="cn_class" value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
- <hbox class="cn_class" id="batch_class"/>
- <label class="cn_prefix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
- <hbox class="cn_prefix" id="batch_prefix"/>
- <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
- accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;" control="marc_cn_menulist"/>
- <hbox id="marc_cn"/>
- <label class="cn_suffix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
- <hbox class="cn_suffix" id="batch_suffix"/>
- <hbox id="batch_button_box"/>
- </hbox>
- <spacer flex="1" />
- </hbox>
<groupbox flex="1" class="my_overflow">
<caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
+ <hbox flex="0">
+ <hbox id="batch_bar" flex="1">
+ <label value="&staff.cat.volume_copy_creator.batch_bar;"/>
+ <label class="cn_class" value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
+ <hbox class="cn_class" id="batch_class"/>
+ <label class="cn_prefix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
+ <hbox class="cn_prefix" id="batch_prefix"/>
+ <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
+ accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;" control="marc_cn_menulist"/>
+ <hbox id="marc_cn"/>
+ <label class="cn_suffix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
+ <hbox class="cn_suffix" id="batch_suffix"/>
+ <hbox id="batch_button_box"/>
+ </hbox>
+ </hbox>
<grid flex="1">
<columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
<rows id="rows">
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
index 468f95e..28f3c78 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
@@ -21,6 +21,12 @@ function my_init() {
xulG.not_modal = true;
xulG.edit = true;
+ // Volume Creator looks for these
+ xulG.no_bib_summary = true;
+ xulG.volume_ui_callback_for_unified_interface = function() {
+ on_volume_pane_load();
+ };
+
// Spawn the volume/copy creator
JSAN.use('util.browser');
var volume_pane = new util.browser();
@@ -30,27 +36,7 @@ function my_init() {
'push_xulG' : true,
'alt_print' : false,
'browser_id' : 'volume_pane',
- 'passthru_content_params' : xulG,
- 'on_url_load' : function() {
- if ($('Create')) { // in horizontal UI variant
- // Hide the Create button in the embedded volume creator
- var f_content = get_contentWindow( $('volume_pane' ) );
- var original_btn = f_content.document.getElementById('Create');
- original_btn.hidden = true;
- $('Create').setAttribute(
- 'label',
- $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.label')
- );
- $('Create').setAttribute(
- 'accesskey',
- $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.accesskey')
- );
- g.stash_and_close = function(p) {
- // Wire up the method for the replacement button
- f_content.g.stash_and_close(p);
- }
- }
- }
+ 'passthru_content_params' : xulG
}
);
@@ -129,3 +115,37 @@ function setup_templates() {
}
}
+function on_volume_pane_load() {
+ try {
+ var f_content = get_contentWindow( $('volume_pane' ) );
+
+ // horizontal UI variant has its own create button
+ if ($('Create')) {
+ var original_btn = f_content.document.getElementById('Create');
+ original_btn.hidden = true;
+ $('Create').setAttribute(
+ 'label',
+ $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.label')
+ );
+ $('Create').setAttribute(
+ 'accesskey',
+ $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.accesskey')
+ );
+ g.stash_and_close = function(p) {
+ // Wire up the method for the replacement button
+ f_content.g.stash_and_close(p);
+ }
+ }
+
+ // load the bib summary pane
+ var sb = document.getElementById('summary_box');
+ while(sb.firstChild) sb.removeChild(sb.lastChild);
+ var summary = document.createElement('iframe'); sb.appendChild(summary);
+ summary.setAttribute('src',urls.XUL_BIB_BRIEF);
+ summary.setAttribute('flex','1');
+ get_contentWindow(summary).xulG = { 'docid' : f_content.g.doc_id };
+ dump('f_content.g.doc_id = ' + f_content.g.doc_id + '\n');
+ } catch(E) {
+ alert('Error in volume_copy_editor.js, on_volume_pane_load(): ' + E);
+ }
+}
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
index b35c077..911c032 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
@@ -31,6 +31,15 @@
<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
<script type="text/javascript" src="volume_copy_editor.js"/>
+ <vbox id="summary_box" oils_persist="height"/>
+ <splitter
+ collapse="before"
+ resize_before="flex"
+ resize_after="grow"
+ oils_persist="state hidden"
+ oils_persist_peers="summary_box main">
+ <grippy/>
+ </splitter>
<vbox flex="1">
<vbox id="top_pane" flex="1" oils_persist="height">
<hbox id="template_bar_holder"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
index 99b1276..b500ab4 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
@@ -33,7 +33,16 @@
<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
<script type="text/javascript" src="volume_copy_editor.js"/>
- <hbox id="template_bar_holder"/>
+ <vbox id="summary_box" oils_persist="height"/>
+ <splitter
+ collapse="before"
+ resize_before="flex"
+ resize_after="grow"
+ oils_persist="state hidden"
+ oils_persist_peers="summary_box main">
+ <grippy/>
+ </splitter>
+ <hbox flex="0" id="template_bar_holder"/>
<hbox flex="1">
<vbox id="top_pane" flex="1" oils_persist="width">
<browser id="volume_pane" flex="1" />
commit 17e34e387def0e7239f852bb9b92a17e00e1731f
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri May 20 03:55:37 2011 -0400
usability tweak, pull the Create button out of the embedded interfaces and into the wrapping UI for the horizontal variant of the unified vol/copy editor
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
index 2938b6a..468f95e 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.js
@@ -30,7 +30,27 @@ function my_init() {
'push_xulG' : true,
'alt_print' : false,
'browser_id' : 'volume_pane',
- 'passthru_content_params' : xulG
+ 'passthru_content_params' : xulG,
+ 'on_url_load' : function() {
+ if ($('Create')) { // in horizontal UI variant
+ // Hide the Create button in the embedded volume creator
+ var f_content = get_contentWindow( $('volume_pane' ) );
+ var original_btn = f_content.document.getElementById('Create');
+ original_btn.hidden = true;
+ $('Create').setAttribute(
+ 'label',
+ $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.label')
+ );
+ $('Create').setAttribute(
+ 'accesskey',
+ $('catStrings').getString('staff.cat.volume_copy_creator.create.btn.accesskey')
+ );
+ g.stash_and_close = function(p) {
+ // Wire up the method for the replacement button
+ f_content.g.stash_and_close(p);
+ }
+ }
+ }
}
);
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
index fb22e32..99b1276 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
@@ -28,6 +28,8 @@
</script>
<scripts id="openils_util_scripts"/>
+ <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+
<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
<script type="text/javascript" src="volume_copy_editor.js"/>
@@ -49,6 +51,10 @@
<hbox id="bottom_bar"/>
</vbox>
</hbox>
+ <hbox>
+ <spacer flex="1"/>
+ <button id="Create" oncommand="g.stash_and_close('unified_interface');"/>
+ </hbox>
</window>
commit 45b6c0503f2095fb5bd9e1975188c5f1b6ff5d88
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri May 20 03:33:52 2011 -0400
css hooks so we can hide class, affix, and part columns in volume creator/editor. can help with screen real estate with the horizontal vol/copy editor
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index 1aea205..7bc79c1 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -297,15 +297,18 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
var x = document.createElement('label'); r.appendChild(x);
x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.classification'));
x.setAttribute('style','font-weight: bold');
+ x.setAttribute('class','cn_class');
x = document.createElement('label'); r.appendChild(x);
x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.prefix'));
x.setAttribute('style','font-weight: bold');
+ x.setAttribute('class','cn_prefix');
x = document.createElement('label'); r.appendChild(x);
x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.call_nums'));
x.setAttribute('style','font-weight: bold');
x = document.createElement('label'); r.appendChild(x);
x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.suffix'));
x.setAttribute('style','font-weight: bold');
+ x.setAttribute('class','cn_suffix');
x = document.createElement('label'); r.appendChild(x);
x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies'));
x.setAttribute('style','font-weight: bold');
@@ -401,10 +404,12 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
/**** CLASSIFICATION COLUMN ****/
var classification_column_box = document.createElement('vbox');
+ classification_column_box.setAttribute('class','cn_class');
r.appendChild(classification_column_box);
/**** PREFIX COLUMN ****/
var prefix_column_box = document.createElement('vbox');
+ prefix_column_box.setAttribute('class','cn_prefix');
r.appendChild(prefix_column_box);
/**** CALLNUMBER COLUMN ****/
@@ -464,6 +469,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
/**** SUFFIX COLUMN ****/
var suffix_column_box = document.createElement('vbox');
+ suffix_column_box.setAttribute('class','cn_suffix');
r.appendChild(suffix_column_box);
var suffix_column_menulist = g.render_suffix_menu(call_number_column_textbox);
suffix_column_menulist.addEventListener(
@@ -664,6 +670,7 @@ g.render_barcode_entry = function(node,callnumber_composite_key,count,ou_id) {
tb = document.createElement('textbox');
tb_part_box.appendChild(tb);
part_menu = g.render_part_menu(tb);
+ part_menu.setAttribute('class','part_column');
tb_part_box.appendChild(part_menu);
set_handlers = true;
} else {
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index 9e88c1a..0cbf65d 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -50,15 +50,15 @@
<hbox flex="0">
<hbox id="batch_bar">
<label value="&staff.cat.volume_copy_creator.batch_bar;"/>
- <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
- <hbox id="batch_class"/>
- <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
- <hbox id="batch_prefix"/>
+ <label class="cn_class" value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
+ <hbox class="cn_class" id="batch_class"/>
+ <label class="cn_prefix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
+ <hbox class="cn_prefix" id="batch_prefix"/>
<label value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;" control="marc_cn_menulist"/>
<hbox id="marc_cn"/>
- <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
- <hbox id="batch_suffix"/>
+ <label class="cn_suffix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
+ <hbox class="cn_suffix" id="batch_suffix"/>
<hbox id="batch_button_box"/>
</hbox>
<spacer flex="1" />
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.js b/Open-ILS/xul/staff_client/server/cat/volume_editor.js
index 92aeb21..db6e1b8 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.js
@@ -24,10 +24,16 @@ function my_init() {
for (var i = 0; i < g.volumes.length; i++) {
var row = document.createElement('row'); rows.appendChild(row);
var lib_label = document.createElement('label'); row.appendChild(lib_label);
- var class_ml = g.render_class_menu(i); row.appendChild(class_ml);
- var prefix_ml = g.render_prefix_menu(i); row.appendChild(prefix_ml);
+ var class_ml = g.render_class_menu(i);
+ class_ml.setAttribute('class','cn_class');
+ row.appendChild(class_ml);
+ var prefix_ml = g.render_prefix_menu(i);
+ prefix_ml.setAttribute('class','cn_prefix');
+ row.appendChild(prefix_ml);
var label_tb = document.createElement('textbox'); row.appendChild(label_tb);
- var suffix_ml = g.render_suffix_menu(i); row.appendChild(suffix_ml);
+ var suffix_ml = g.render_suffix_menu(i);
+ suffix_ml.setAttribute('class','cn_suffix');
+ row.appendChild(suffix_ml);
if (!first_tb) { first_tb = label_tb; }
var lib_id = g.volumes[i].owning_lib();
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
index 5a4e5c6..b6e1d58 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -6,6 +6,7 @@
<!-- STYLESHEETS -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="/xul/server/skin/cat.css" type="text/css"?>
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<!-- LOCALIZATION -->
@@ -49,18 +50,18 @@
<grid flex="1">
<columns>
<column />
- <column />
- <column />
+ <column class="cn_class"/>
+ <column class="cn_prefix"/>
<column flex="1"/>
- <column />
+ <column class="cn_suffix"/>
</columns>
<rows id="rows">
<row>
<label value="&staff.cat.volume_editor.owning_lib;" class="header"/>
- <label value="&staff.cat.volume_editor.classification;" class="header"/>
- <label value="&staff.cat.volume_editor.prefix;" class="header"/>
+ <label value="&staff.cat.volume_editor.classification;" class="header cn_class"/>
+ <label value="&staff.cat.volume_editor.prefix;" class="header cn_prefix"/>
<label value="&staff.cat.volume_editor.label;" class="header"/>
- <label value="&staff.cat.volume_editor.suffix;" class="header"/>
+ <label value="&staff.cat.volume_editor.suffix;" class="header cn_suffix"/>
</row>
</rows>
</grid>
diff --git a/Open-ILS/xul/staff_client/server/skin/cat.css b/Open-ILS/xul/staff_client/server/skin/cat.css
index 151df8a..d17d0df 100644
--- a/Open-ILS/xul/staff_client/server/skin/cat.css
+++ b/Open-ILS/xul/staff_client/server/skin/cat.css
@@ -9,3 +9,11 @@
.copy_editor_field_required { border: solid thin red; }
hbox#batch_bar { background-color: gray; }
+
+/* How you might hide the classification, affix, and parts columns in the volume creator/editor */
+/*
+.cn_class { display: none; }
+.cn_prefix { display: none; }
+.cn_suffix { display: none; }
+.part_column { display: none; }
+*/
commit 7586c71c879108607eaaeeedaedff633dde14685
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri May 20 02:59:31 2011 -0400
usability tweak, spread the template bar across the top of both panes for the horizontal unified vol/copy creator/editor
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
index df1b459..fb22e32 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
@@ -31,9 +31,9 @@
<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
<script type="text/javascript" src="volume_copy_editor.js"/>
+ <hbox id="template_bar_holder"/>
<hbox flex="1">
<vbox id="top_pane" flex="1" oils_persist="width">
- <hbox id="template_bar_holder"/>
<browser id="volume_pane" flex="1" />
</vbox>
<splitter
-----------------------------------------------------------------------
Summary of changes:
.../staff_client/server/cat/volume_copy_creator.js | 32 +++++++++--
.../server/cat/volume_copy_creator.xul | 58 ++++++++++++++------
.../staff_client/server/cat/volume_copy_editor.js | 40 ++++++++++++++
.../staff_client/server/cat/volume_copy_editor.xul | 9 +++
.../server/cat/volume_copy_editor_horiz.xul | 17 ++++++-
.../xul/staff_client/server/cat/volume_editor.js | 12 +++-
.../xul/staff_client/server/cat/volume_editor.xul | 13 +++--
Open-ILS/xul/staff_client/server/skin/cat.css | 10 +++-
8 files changed, 159 insertions(+), 32 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list