[open-ils-commits] r17437 - in branches/rel_2_0/Open-ILS: src/sql/Pg src/sql/Pg/upgrade web/opac/locale/en-US (dbs)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Sep 1 23:29:54 EDT 2010
Author: dbs
Date: 2010-09-01 23:29:51 -0400 (Wed, 01 Sep 2010)
New Revision: 17437
Added:
branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0381.data.spine_label_font_weight.sql
branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0382.schema.asset_copy_location_callnums.sql
Modified:
branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql
branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd
Log:
Backport spine label editing and printing enhancements from trunk
* Automatically add prefix and/or suffix to a spine label if set
in the copy locations editor
* Set default font size, family, and weight along with label height, width,
and left margin for each library via library settings editor.
* Navigate up and down using cursor keys and insert/delete lines with
the insert/delete keys.
* Provide some basic LC formatting for line wrapping.
* Use different print strategies depending on whether we're using
xulrunner 1.9.0 or 1.9.2.
Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-09-02 03:18:53 UTC (rev 17436)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -68,7 +68,7 @@
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0379'); -- phasefx
+INSERT INTO config.upgrade_log (version) VALUES ('0381'); -- dbs
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql 2010-09-02 03:18:53 UTC (rev 17436)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -29,6 +29,8 @@
hold_verify BOOL NOT NULL DEFAULT FALSE,
opac_visible BOOL NOT NULL DEFAULT TRUE,
circulate BOOL NOT NULL DEFAULT TRUE,
+ label_prefix TEXT,
+ label_suffix TEXT,
CONSTRAINT acl_name_once_per_lib UNIQUE (name, owning_lib)
);
Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-09-02 03:18:53 UTC (rev 17436)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -6640,7 +6640,57 @@
'ccs'
);
--- 0383.data.org-setting-circ.do_not_tally_claims_returned.sql
+-- 0380.data.spine_label.sql Add spine label preferences
+INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
+ VALUES
+ ('cat.label.font.size',
+ oils_i18n_gettext('cat.label.font.size',
+ 'Cataloging: Spine and pocket label font size', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.size',
+ 'Set the default font size for spine and pocket labels', 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.label.font.family',
+ oils_i18n_gettext('cat.label.font.family',
+ 'Cataloging: Spine and pocket label font family', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.family',
+ 'Set the preferred font family for spine and pocket labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
+ 'coust', 'description'),
+ 'string'
+ )
+ ,('cat.spine.line.width',
+ oils_i18n_gettext('cat.spine.line.width',
+ 'Cataloging: Spine label line width', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.width',
+ 'Set the default line width for spine labels in number of characters. This specifies the boundary at which lines must be wrapped.',
+ 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.spine.line.height',
+ oils_i18n_gettext('cat.spine.line.height',
+ 'Cataloging: Spine label maximum lines', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.height',
+ 'Set the default maximum number of lines for spine labels.',
+ 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.spine.line.margin',
+ oils_i18n_gettext('cat.spine.line.margin',
+ 'Cataloging: Spine label left margin', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.margin',
+ 'Set the left margin for spine labels in number of characters.',
+ 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.label.font.weight',
+ oils_i18n_gettext('cat.label.font.weight',
+ 'Cataloging: Spine and pocket label font weight', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.weight',
+ 'Set the preferred font weight for spine and pocket labels. You can specify "normal", "bold", "bolder", or "lighter".',
+ 'coust', 'description'),
+ 'string'
+ )
+;
INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
'circ.do_not_tally_claims_returned',
@@ -6656,4 +6706,13 @@
'description'),
'bool'
);
+INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES
+ (1, 'cat.spine.line.margin', 0)
+ ,(1, 'cat.spine.line.height', 9)
+ ,(1, 'cat.spine.line.width', 8)
+ ,(1, 'cat.label.font.family', '"monospace"')
+ ,(1, 'cat.label.font.size', 10)
+ ,(1, 'cat.label.font.weight', '"normal"')
+;
+
Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql (from rev 17341, trunk/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -0,0 +1,56 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0380'); -- dbs
+
+INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
+ VALUES
+ ('cat.label.font.size',
+ oils_i18n_gettext('cat.label.font.size',
+ 'Cataloging: Spine and pocket label font size', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.size',
+ 'Set the default font size for spine and pocket labels', 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.label.font.family',
+ oils_i18n_gettext('cat.label.font.family',
+ 'Cataloging: Spine and pocket label font family', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.family',
+ 'Set the preferred font family for spine and pocket labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
+ 'coust', 'description'),
+ 'string'
+ )
+ ,('cat.spine.line.width',
+ oils_i18n_gettext('cat.spine.line.width',
+ 'Cataloging: Spine label line width', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.width',
+ 'Set the default line width for spine labels in number of characters. This specifies the boundary at which lines must be wrapped.',
+ 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.spine.line.height',
+ oils_i18n_gettext('cat.spine.line.height',
+ 'Cataloging: Spine label maximum lines', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.height',
+ 'Set the default maximum number of lines for spine labels.',
+ 'coust', 'description'),
+ 'integer'
+ )
+ ,('cat.spine.line.margin',
+ oils_i18n_gettext('cat.spine.line.margin',
+ 'Cataloging: Spine label left margin', 'coust', 'label'),
+ oils_i18n_gettext('cat.spine.line.margin',
+ 'Set the left margin for spine labels in number of characters.',
+ 'coust', 'description'),
+ 'integer'
+ )
+;
+
+INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES
+ (1, 'cat.spine.line.margin', 0)
+ ,(1, 'cat.spine.line.height', 9)
+ ,(1, 'cat.spine.line.width', 8)
+ ,(1, 'cat.label.font.family', '"monospace"')
+ ,(1, 'cat.label.font.size', 10)
+;
+
+COMMIT;
Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0381.data.spine_label_font_weight.sql (from rev 17342, trunk/Open-ILS/src/sql/Pg/upgrade/0381.data.spine_label_font_weight.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0381.data.spine_label_font_weight.sql (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0381.data.spine_label_font_weight.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -0,0 +1,21 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0381'); -- dbs
+
+INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
+ VALUES
+ ('cat.label.font.weight',
+ oils_i18n_gettext('cat.label.font.weight',
+ 'Cataloging: Spine and pocket label font weight', 'coust', 'label'),
+ oils_i18n_gettext('cat.label.font.weight',
+ 'Set the preferred font weight for spine and pocket labels. You can specify "normal", "bold", "bolder", or "lighter".',
+ 'coust', 'description'),
+ 'string'
+ )
+;
+
+INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES
+ (1, 'cat.label.font.weight', '"normal"')
+;
+
+COMMIT;
Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0382.schema.asset_copy_location_callnums.sql (from rev 17371, trunk/Open-ILS/src/sql/Pg/upgrade/0382.schema.asset_copy_location_callnums.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0382.schema.asset_copy_location_callnums.sql (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0382.schema.asset_copy_location_callnums.sql 2010-09-02 03:29:51 UTC (rev 17437)
@@ -0,0 +1,10 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0382'); -- dbs
+
+-- Start picking up call number label prefixes and suffixes
+-- from asset.copy_location
+ALTER TABLE asset.copy_location ADD COLUMN label_prefix TEXT;
+ALTER TABLE asset.copy_location ADD COLUMN label_suffix TEXT;
+
+COMMIT;
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-02 03:18:53 UTC (rev 17436)
+++ branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-09-02 03:29:51 UTC (rev 17437)
@@ -1817,10 +1817,14 @@
<!ENTITY staff.server.admin.copy_locations.editor.help "Help">
<!ENTITY staff.server.admin.copy_locations.editor.opac_visible "OPAC Visible">
<!ENTITY staff.server.admin.copy_locations.editor.circulate "Circulate">
+<!ENTITY staff.server.admin.copy_locations.editor.create "Create">
<!ENTITY staff.server.admin.copy_locations.editor.edit "Edit">
<!ENTITY staff.server.admin.copy_locations.editor.delete "Delete">
<!ENTITY staff.server.admin.copy_locations.editor.help.holdable "If a copy location is 'Holdable', copies in that location may have holds placed on them.">
<!ENTITY staff.server.admin.copy_locations.editor.delete.confirm "Are you sure you wish to delete the selected copy location? Note: If copies are currently attached to this location, the delete operation will fail.">
+<!ENTITY staff.server.admin.copy_locations.editor.prefix "Label prefix">
+<!ENTITY staff.server.admin.copy_locations.editor.suffix "Label suffix">
+<!ENTITY staff.server.admin.copy_locations.editor.welcome "Welcome">
<!ENTITY staff.server.admin.copy_locations.submit "Submit">
<!ENTITY staff.server.admin.copy_locations.cancel "Cancel">
<!ENTITY staff.server.admin.copy_locations.update_success "Update Succeeded">
@@ -2560,6 +2564,8 @@
<!ENTITY staff.cat.marcedit.help.accesskey "H">
<!ENTITY staff.cat.marcedit.caption.label "MARC Record">
<!ENTITY staff.cat.marcedit.toggleFFE.label "Fixed Fields -- Record type: ">
+<!ENTITY staff.cat.marcedit.source.caption "Bibliographic source">
+<!ENTITY staff.cat.marcedit.source.submit.label "Update source">
<!ENTITY staff.cat.marc_new.load.label "Load">
<!ENTITY staff.cat.marc_new.load.accesskey "L">
<!ENTITY staff.cat.marc_view.title "MARC View">
@@ -2651,16 +2657,19 @@
<!ENTITY staff.cat.spine_labels.close_window.label "Close Window">
<!ENTITY staff.cat.spine_labels.close_window.accesskey "C">
<!ENTITY staff.cat.spine_labels.font_size.label "Font size (in points):">
+<!ENTITY staff.cat.spine_labels.font_weight.label 'Font weight ("normal" or "bold"):'>
<!ENTITY staff.cat.spine_labels.spine_label.label "Spine Label">
<!ENTITY staff.cat.spine_labels.spine_label.left_margin.label "Left Margin (in characters):">
<!ENTITY staff.cat.spine_labels.spine_label.label_width.label "Label Width (in characters):">
<!ENTITY staff.cat.spine_labels.spine_label.label_length.label "Label Length (in lines):">
<!ENTITY staff.cat.spine_labels.pocket_label.label "Pocket Label">
+<!ENTITY staff.cat.spine_labels.pocket_label.enabled.label "Enabled">
<!ENTITY staff.cat.spine_labels.pocket_label.middle_margin.label "Middle Margin (in characters):">
<!ENTITY staff.cat.spine_labels.pocket_label.label_width.label "Label Width (in characters):">
<!ENTITY staff.cat.spine_labels.pocket_label.label_length.label "Label Length (in lines):">
<!ENTITY staff.cat.spine_labels.pocket_label.title.label "Include Title (wraps on word at label width)">
<!ENTITY staff.cat.spine_labels.on_line.label "On line:">
+<!ENTITY staff.cat.spine_labels.pocket_label.include_author.label "Include Author">
<!ENTITY staff.cat.spine_labels.pocket_label.include_title.label "Include Title (segment after wrapping)">
<!ENTITY staff.cat.spine_labels.indent_title.label "Indent a space?">
<!ENTITY staff.cat.spine_labels.inc_call_number.label "Include Call Number">
More information about the open-ils-commits
mailing list