[open-ils-commits] r10729 - in trunk/Open-ILS:
web/opac/locale/en-US xul/staff_client/server/admin
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Sep 29 12:15:19 EDT 2008
Author: erickson
Date: 2008-09-29 12:15:17 -0400 (Mon, 29 Sep 2008)
New Revision: 10729
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
Log:
added a new pile of settings. added a flag to indicate when a value is not inherited from the parent org settings at runtime
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-09-29 15:30:35 UTC (rev 10728)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-09-29 16:15:17 UTC (rev 10729)
@@ -1464,13 +1464,28 @@
<!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.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.desc 'Amount of time after a hold is placed before the hold expires\nExample "100 days"'>
+<!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.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.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">
+<!ENTITY staff.server.admin.org_settings.circ.item_checkout_history.max.desc
+ "This is maximum number of previous circulations the staff client will display when investigating item details">
+<!ENTITY staff.server.admin.org_settings.circ.reshelving_complete.interval "Change reshelving status interval">
+<!ENTITY staff.server.admin.org_settings.circ.reshelving_complete.interval.desc
+ 'Amount of time to wait before changing an item from "reshelving" status to "available". Examples "1 day", "6 hours"'>
+
<!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: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js 2008-09-29 15:30:35 UTC (rev 10728)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js 2008-09-29 16:15:17 UTC (rev 10729)
@@ -131,6 +131,10 @@
switch(this.field) {
case 'context':
return fieldmapper.aou.findOrgUnit(value).shortname();
+ case 'label':
+ if(setting.noInherit)
+ return '* ' + value;
+ return value;
case 'value':
if(setting.type == 'bool') {
if(value)
Modified: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2008-09-29 15:30:35 UTC (rev 10728)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2008-09-29 16:15:17 UTC (rev 10729)
@@ -26,6 +26,7 @@
<script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
<script type="text/javascript" src='org_unit_settings.js'></script>
<script>
+ // Configure the different settings
var osSettings = {
'circ.lost_materials_processing_fee' : {
label : '&staff.server.admin.org_settings.lost_fee;',
@@ -38,10 +39,12 @@
'auth.opac_timeout' : {
label : '&staff.server.admin.org_settings.opac_timeout;',
type : 'number',
+ noInherit : true
},
'auth.staff_timeout' : {
label : '&staff.server.admin.org_settings.staff_timeout;',
type : 'number',
+ noInherit : true
},
'org.bounced_emails' : {
label : '&staff.server.admin.org_settings.from_address;',
@@ -63,6 +66,35 @@
'global.default_locale' : {
label : '&staff.server.admin.org_settings.global.default_locale;',
},
+ 'circ.void_overdue_on_lost' : {
+ label : '&staff.server.admin.org_settings.circ.void_overdue_on_lost;',
+ type : 'bool'
+ },
+ 'circ.hold_stalling.soft' : {
+ label : '&staff.server.admin.org_settings.circ.hold_stalling.soft;',
+ desc : '&staff.server.admin.org_settings.circ.hold_stalling.soft.desc;',
+ },
+ 'circ.hold_boundary.hard' : {
+ label : '&staff.server.admin.org_settings.circ.hold_boundary.hard;',
+ type : 'number'
+ },
+ 'circ.hold_boundary.soft' : {
+ label : '&staff.server.admin.org_settings.circ.hold_boundary.soft;',
+ type : 'number'
+ },
+ 'opac.barcode_regex' : {
+ label : '&staff.server.admin.org_settings.opac.barcode_regex;',
+ desc : '&staff.server.admin.org_settings.opac.barcode_regex.desc;'
+ },
+ 'circ.item_checkout_history.max' : {
+ label : '&staff.server.admin.org_settings.circ.item_checkout_history.max;',
+ desc : '&staff.server.admin.org_settings.circ.item_checkout_history.max.desc;'
+ },
+ 'circ.reshelving_complete.interval' : {
+ label : '&staff.server.admin.org_settings.circ.reshelving_complete.interval;',
+ desc : '&staff.server.admin.org_settings.circ.reshelving_complete.interval.desc;',
+ noInherit : true
+ }
};
</script>
</head>
@@ -70,10 +102,13 @@
<div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">
<div dojoType="dijit.layout.ContentPane" layoutAlign='top'>
<h1>Org Unit Settings</h1><br/>
- Context Location
- <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='osContextSelector'
- searchAttr="shortname" autocomplete="true" labelAttr='shortname' onchange='osChangeContext();'>
- </select>
+ <span>Context Location</span>
+ <span>
+ <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='osContextSelector'
+ searchAttr="shortname" autocomplete="true" labelAttr='shortname' onchange='osChangeContext();'>
+ </select>
+ </span>
+ <span> * Indicates the setting is not inherited from the parent at run time</span>
</div>
<div dojoType="dijit.layout.ContentPane" layoutAlign='client' class='tall'>
<script>
@@ -97,7 +132,7 @@
<table class='form_table'>
<thead>
<tr><td colspan='2' align='center'><div id='os-edit-name'/></td></tr>
- <tr><td colspan='2' align='center'><div id='os-edit-desc'/></td></tr>
+ <tr><td colspan='2' align='center'><div id='os-edit-desc' style='max-width:600px;'/></td></tr>
</thead>
<tbody>
<tr>
@@ -122,10 +157,10 @@
</tr>
<tr>
<td>
- <button dojoType='dijit.form.Button' onclick='osEditSetting();'>Update Setting</button>
+ <button dojoType='dijit.form.Button' onclick='osEditSetting(true);'>Delete Setting</button>
</td>
<td>
- <button dojoType='dijit.form.Button' onclick='osEditSetting(true);'>Delete Setting</button>
+ <button dojoType='dijit.form.Button' onclick='osEditSetting();'>Update Setting</button>
</td>
</tr>
</tbody>
More information about the open-ils-commits
mailing list