[open-ils-commits] r17551 - in branches/rel_2_0/Open-ILS: web/opac/locale/en-US xul/staff_client/server/cat xul/staff_client/server/circ xul/staff_client/server/locale/en-US xul/staff_client/server/skin (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Sep 9 16:37:14 EDT 2010
Author: phasefx
Date: 2010-09-09 16:37:08 -0400 (Thu, 09 Sep 2010)
New Revision: 17551
Modified:
branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd
branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.js
branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
branches/rel_2_0/Open-ILS/xul/staff_client/server/skin/global.css
Log:
merge r17549 from trunk for brief bib summary bar
Modified: branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-09-09 20:37:08 UTC (rev 17551)
@@ -2312,11 +2312,17 @@
<!ENTITY staff.cat.bib_brief.author.accesskey "">
<!ENTITY staff.cat.bib_brief.edition.label "Edition:">
<!ENTITY staff.cat.bib_brief.edition.accesskey "">
-<!ENTITY staff.cat.bib_brief.pub_date.label "Publication Date:">
+<!ENTITY staff.cat.bib_brief.pub_date.label "Pub Date:">
<!ENTITY staff.cat.bib_brief.pub_date.accesskey "">
+<!ENTITY staff.cat.bib_brief.call_number.label "Bib Call #:">
+<!ENTITY staff.cat.bib_brief.call_number.accesskey "">
<!-- "TCN" is an abbreviation for "title control number" -->
<!ENTITY staff.cat.bib_brief.title_control_number.label "TCN:">
<!ENTITY staff.cat.bib_brief.title_control_number.accesskey "">
+<!ENTITY staff.cat.bib_brief.biblio_record_entry_id.label "Record ID:">
+<!ENTITY staff.cat.bib_brief.biblio_record_entry_id.accesskey "">
+<!ENTITY staff.cat.bib_brief.biblio_record_entry_owner.label "Record Owner:">
+<!ENTITY staff.cat.bib_brief.biblio_record_entry_owner.accesskey "">
<!ENTITY staff.cat.bib_brief.created_by.label "Created By:">
<!ENTITY staff.cat.bib_brief.created_by.accesskey "">
<!ENTITY staff.cat.bib_brief.last_edited_by.label "Last Edited By:">
@@ -3317,7 +3323,8 @@
<!ENTITY staff.circ.alternate_copy_summary.Alert.label "Alert">
<!ENTITY staff.circ.alternate_copy_summary.Alternate_View.label "Alternate View">
<!ENTITY staff.circ.alternate_copy_summary.Barcode.label "Barcode">
-<!ENTITY staff.circ.alternate_copy_summary.Call_Number.label "Call Number">
+<!ENTITY staff.circ.alternate_copy_summary.Call_Number.label "Item Call #">
+<!ENTITY staff.circ.alternate_copy_summary.Call_Number.accesskey "">
<!ENTITY staff.circ.alternate_copy_summary.Cataloging_Info.label "Cataloging Info">
<!ENTITY staff.circ.alternate_copy_summary.Cataloging_Info.accesskey "I">
<!ENTITY staff.circ.alternate_copy_summary.Checkin_Scan_Time.label "Checkin Scan Time">
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.js 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.js 2010-09-09 20:37:08 UTC (rev 17551)
@@ -71,7 +71,8 @@
//dump('value = ' + value + '\n');
var n = set(c.id, value ? value : '');
if (c.id == 'tcn_source') set_tooltip('tcn',value);
- if (c.id == 'doc_id') set_tooltip('title',value);
+ if (c.id == 'title') set_tooltip('title',value);
+ if (c.id == 'author') set_tooltip('author',value);
//dump('set text on ' + n + ' elements\n');
} else {
//dump('render is not a function\n');
@@ -81,6 +82,30 @@
}
}
+ // Let's fetch a bib call number
+ JSAN.use('OpenILS.data');
+ var data = new OpenILS.data();
+ var label_class = data.hash.aous['cat.default_classification_scheme'];
+ if (!label_class) {
+ label_class = { "value": 1 };
+ }
+ var cn_blob_array = net.simple_request('BLOB_MARC_CALLNUMBERS_RETRIEVE',[params.mvr_id, label_class.value]);
+ if (! cn_blob_array) { cn_blob_array = []; }
+ var tooltip_text = '';
+ for (var i = 0; i < cn_blob_array.length; i++) {
+ var cn_blob_obj = cn_blob_array[i];
+ for (var j in cn_blob_obj) {
+ tooltip_text += j + ' : ' + cn_blob_obj[j] + '\n';
+ }
+ }
+ if (tooltip_text) {
+ var cn_blob_obj = cn_blob_array[0];
+ for (var j in cn_blob_obj) {
+ set('bib_call_number',cn_blob_obj[j]);
+ }
+ set_tooltip('bib_call_number',tooltip_text);
+ }
+
} catch(E) {
alert(location.href + '\nError in bib_brief_overlay(' + js2JSON(params) + '): ' + E);
return;
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul 2010-09-09 20:37:08 UTC (rev 17551)
@@ -10,35 +10,45 @@
<grid id="bib_brief_grid" flex="0">
<columns>
<column />
- <column flex="1" />
<column />
<column />
<column />
<column />
<column />
<column />
+ <column />
</columns>
<rows id="bib_brief_grid_rows">
<row id="bib_brief_grid_row1" position="1">
- <label value="&staff.cat.bib_brief.title.label;" accesskey="&staff.cat.bib_brief.title.accesskey;" control="title"/>
- <textbox id="title" name="title" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.edition.label;" accesskey="&staff.cat.bib_brief.edition.accesskey;" control="edition"/>
- <textbox id="edition" name="edition" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.created_by.label;" accesskey="&staff.cat.bib_brief.created_by.accesskey;" control="creator"/>
- <textbox id="creator" name="creator" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.last_edited_by.label;" accesskey="&staff.cat.bib_brief.last_edited_by.accesskey;" control="editor"/>
- <textbox id="editor" name="editor" readonly="true" context="clipboard"/>
+ <label value="&staff.cat.bib_brief.title.label;" accesskey="&staff.cat.bib_brief.title.accesskey;" control="title" class="emphasis"/>
+ <textbox id="title" name="title" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <label value="&staff.cat.bib_brief.edition.label;" accesskey="&staff.cat.bib_brief.edition.accesskey;" control="edition" class="emphasis"/>
+ <textbox id="edition" name="edition" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <label value="&staff.cat.bib_brief.title_control_number.label;" accesskey="&staff.cat.bib_brief.title_control_number.accesskey;" control="tcn" class="emphasis"/>
+ <textbox id="tcn" name="tcn" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <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">
- <label value="&staff.cat.bib_brief.author.label;" accesskey="&staff.cat.bib_brief.author.accesskey;" control="author"/>
- <textbox id="author" name="author" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.pub_date.label;" accesskey="&staff.cat.bib_brief.pub_date.accesskey;" control="pubdate"/>
- <textbox id="pubdate" name="pubdate" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.title_control_number.label;" accesskey="&staff.cat.bib_brief.title_control_number.accesskey;" control="tcn"/>
- <textbox id="tcn" name="tcn" readonly="true" context="clipboard"/>
- <label value="&staff.cat.bib_brief.last_edited_on.label;" accesskey="&staff.cat.bib_brief.last_edited_on.accesskey;" control="edit_date"/>
- <textbox id="edit_date" name="edit_date" readonly="true" context="clipboard"/>
+ <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"/>
+ <textbox id="pubdate" name="pubdate" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <label value="&staff.cat.bib_brief.biblio_record_entry_id.label;" accesskey="&staff.cat.bib_brief.biblio_record_entry_id.accesskey;" control="mvr_doc_id" class="emphasis"/>
+ <textbox id="mvr_doc_id" name="mvr_doc_id" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <label value="&staff.cat.bib_brief.last_edited_by.label;" accesskey="&staff.cat.bib_brief.last_edited_by.accesskey;" control="editor" class="emphasis"/>
+ <textbox id="editor" name="editor" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
</row>
+ <row id="bib_brief_grid_row3" position="3">
+ <label id="bib_call_number_label" value="&staff.cat.bib_brief.call_number.label;" accesskey="&staff.cat.bib_brief.call_number.accesskey;" control="bib_call_number" class="emphasis"/>
+ <textbox id="bib_call_number" name="bib_call_number" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <hbox id="placeholder1"/>
+ <hbox id="placeholder2"/>
+ <label value="&staff.cat.bib_brief.biblio_record_entry_owner.label;" accesskey="&staff.cat.bib_brief.biblio_record_entry_owner.accesskey;" control="owner" class="emphasis"/>
+ <textbox id="owner" name="owner" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ <label value="&staff.cat.bib_brief.last_edited_on.label;" accesskey="&staff.cat.bib_brief.last_edited_on.accesskey;" control="edit_date" class="emphasis"/>
+ <textbox id="edit_date" name="edit_date" readonly="true" context="clipboard" class="plain" onfocus="this.select()"/>
+ </row>
</rows>
</grid>
</overlay>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul 2010-09-09 20:37:08 UTC (rev 17551)
@@ -42,9 +42,15 @@
<!-- Most of this gets filled in by bib_brief_overlay.xul -->
<grid id="bib_brief_grid">
<rows id="bib_brief_grid_rows">
- <row>
- <label value="&staff.circ.alternate_copy_summary.Call_Number.label;" accesskey="&staff.circ.alternate_copy_summary.call_number.accesskey;" control="call_number"/>
- <textbox name="call_number" readonly="true" context="clipboard"/>
+ <row id="bib_brief_grid_row3">
+ <label id="bib_call_number_label"/>
+ <textbox id="bib_call_number"/>
+ <hbox id="placeholder1" flex="1">
+ <label value="&staff.circ.alternate_copy_summary.Call_Number.label;" accesskey="&staff.circ.alternate_copy_summary.Call_Number.accesskey;" control="call_number" class="emphasis"/>
+ </hbox>
+ <hbox id="placeholder2" flex="1">
+ <textbox name="call_number" readonly="true" context="clipboard" class="plain"/>
+ </hbox>
</row>
</rows>
</grid>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js 2010-09-09 20:37:08 UTC (rev 17551)
@@ -1237,6 +1237,16 @@
{
'persist' : 'hidden width ordinal',
'fm_class' : 'bre',
+ 'id' : 'owner',
+ 'label' : document.getElementById('circStrings').getString('staff.circ.utils.owner'),
+ 'flex' : 1,
+ 'primary' : false,
+ 'hidden' : true,
+ 'editable' : false, 'render' : function(my) { return my.bre ? (typeof my.bre.owner() == 'object' ? my.bre.owner().shortname() : data.hash.aou[my.bre.owner()].shortname() ) : ''; }
+ },
+ {
+ 'persist' : 'hidden width ordinal',
+ 'fm_class' : 'bre',
'id' : 'creator',
'label' : document.getElementById('circStrings').getString('staff.circ.utils.creator'),
'flex' : 1,
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties 2010-09-09 20:37:08 UTC (rev 17551)
@@ -276,6 +276,7 @@
staff.circ.utils.pubdate=Publication Date
staff.circ.utils.publisher=Publisher
staff.circ.utils.creator=Created By
+staff.circ.utils.owner=Owned By
staff.circ.utils.editor=Edited By
# TCN is an acronym for Title Control Number
staff.circ.utils.tcn=TCN
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/skin/global.css
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/skin/global.css 2010-09-09 20:35:47 UTC (rev 17550)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/skin/global.css 2010-09-09 20:37:08 UTC (rev 17551)
@@ -100,6 +100,7 @@
.header { font-weight: bold; }
.header1 { font-weight: bold; font-size: large; }
+.emphasis { font-weight: bold; }
.tan { background-color: #D2B48C; }
.sandy_brown { background-color: #F4A460; }
More information about the open-ils-commits
mailing list