[open-ils-commits] r11140 - in branches/rel_1_4/Open-ILS: web/opac/locale/en-US xul/staff_client/server/admin

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-11-11 14:47:57 -0500 (Tue, 11 Nov 2008)
New Revision: 11140

Modified:
   branches/rel_1_4/Open-ILS/web/opac/locale/en-US/lang.dtd
   branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
Log:
updated some labels for better sorting.  appending asterisk after setting name where appropriate

Modified: branches/rel_1_4/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/rel_1_4/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-11-11 19:43:10 UTC (rev 11139)
+++ branches/rel_1_4/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-11-11 19:47:57 UTC (rev 11140)
@@ -1471,18 +1471,18 @@
 <!ENTITY staff.server.admin.org_settings.update_success "Update succeeded.">
 <!ENTITY staff.server.admin.org_settings.apply_all.confirm "This will update the setting for all of the locations listed in the dropdown menu. Are you sure you wish to continue?">
 
-<!ENTITY staff.server.admin.org_settings.circ.hold_expire_alert_interval "Hold Expiration Alert Interval">
+<!ENTITY staff.server.admin.org_settings.circ.hold_expire_alert_interval "Holds: Expire Alert Interval">
 <!ENTITY staff.server.admin.org_settings.circ.hold_expire_alert_interval.desc "Amount of time before a hold expires at which point the patron should be alerted">
-<!ENTITY staff.server.admin.org_settings.circ.hold_expire_interval "Default Hold Expirate Interval">
+<!ENTITY staff.server.admin.org_settings.circ.hold_expire_interval "Holds: Expire Interval">
 <!ENTITY staff.server.admin.org_settings.circ.hold_expire_interval.desc 'Amount of time after a hold is placed before the hold expires.  Example "100 days"'>
 <!ENTITY staff.server.admin.org_settings.global.credit.allow "Allow Credit Card Payments">
 <!ENTITY staff.server.admin.org_settings.global.credit.allow.desc "If enabled, patrons will be able to pay fines accrued at this location via credit card">
 <!ENTITY staff.server.admin.org_settings.global.default_locale "Default Locale">
 <!ENTITY staff.server.admin.org_settings.circ.void_overdue_on_lost "Void overdue fines when items are marked lost">
-<!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft 'Soft hold stalling interval'>
+<!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft 'Holds: Soft stalling interval'>
 <!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft.desc 'How long to wait before allowing remote items to be opportunisticaly captured for a hold.  Example "5 days"'>
-<!ENTITY staff.server.admin.org_settings.circ.hold_boundary.hard "Hard hold boundary">
-<!ENTITY staff.server.admin.org_settings.circ.hold_boundary.soft "Soft hold boundary">
+<!ENTITY staff.server.admin.org_settings.circ.hold_boundary.hard "Holds: Hard boundary">
+<!ENTITY staff.server.admin.org_settings.circ.hold_boundary.soft "Holds: Soft boundary">
 <!ENTITY staff.server.admin.org_settings.opac.barcode_regex "Patron barcode format">
 <!ENTITY staff.server.admin.org_settings.opac.barcode_regex.desc 'Regular expression defining the patron barcode format'>
 <!ENTITY staff.server.admin.org_settings.circ.item_checkout_history.max "Maximum previous checkouts displayed">
@@ -1492,7 +1492,6 @@
 
 
 
-
 <!ENTITY staff.server.admin.stat_cat.title "Evergreen: Statistical Category Editor">
 <!ENTITY staff.server.admin.stat_cat.greeting "Welcome ">
 <!ENTITY staff.server.admin.stat_cat.heading " Statistical Category Editor">

Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js	2008-11-11 19:43:10 UTC (rev 11139)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js	2008-11-11 19:47:57 UTC (rev 11140)
@@ -133,7 +133,7 @@
             return fieldmapper.aou.findOrgUnit(value).shortname();
         case 'label':
             if(setting.noInherit)
-                return '* ' + value;
+                return value + ' *';
             return value;
         case 'value':
             if(setting.type == 'bool') {