[open-ils-commits] r17452 - in branches/rel_2_0/Open-ILS: web/opac/locale/en-US web/templates/default/conify/global/config xul/staff_client/chrome/content/main (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Sep 2 17:02:20 EDT 2010
Author: erickson
Date: 2010-09-02 17:02:15 -0400 (Thu, 02 Sep 2010)
New Revision: 17452
Added:
branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2
branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2
branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2
branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2
Modified:
branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd
branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js
branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Log:
back-porting: conify UIs for circ/hold-related config.rule_ tables
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 20:11:17 UTC (rev 17451)
+++ branches/rel_2_0/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-09-02 21:02:15 UTC (rev 17452)
@@ -699,6 +699,10 @@
<!ENTITY staff.main.menu.admin.server_admin.conify.circulation_modifier.label "Circulation Modifiers">
<!ENTITY staff.main.menu.admin.server_admin.conify.org_unit_setting_type "Organization Unit Setting Types">
<!ENTITY staff.main.menu.admin.server_admin.conify.usr_setting_type "User Setting Types">
+<!ENTITY staff.main.menu.admin.server_admin.conify.config_rule_circ_duration "Circulation Duration Rules">
+<!ENTITY staff.main.menu.admin.server_admin.conify.config_rule_recurring_fine "Circulation Recurring Fine Rules">
+<!ENTITY staff.main.menu.admin.server_admin.conify.config_rule_max_fine "Circulation Max Fine Rules">
+<!ENTITY staff.main.menu.admin.server_admin.conify.config_rule_age_hold_protect "Age Hold Protect Rules">
<!ENTITY staff.main.menu.admin.server_admin.conify.global_flag.label "Global Flags">
<!ENTITY staff.main.menu.admin.server_admin.acq.label "Acquisitions">
Copied: branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2 (from rev 17316, trunk/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2)
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2 (rev 0)
+++ branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2 2010-09-02 21:02:15 UTC (rev 17452)
@@ -0,0 +1,27 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Age Hold Protect Rules' %]
+<script type="text/javascript">
+ dojo.require('openils.Util');
+ dojo.require('openils.widget.AutoGrid');
+ openils.Util.addOnLoad( function() { ruleAgeProtectGrid.loadAll(); } );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Age Hold Protect Rules</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='ruleAgeProtectGrid.showCreateDialog()'>New Age Hold Protect Rule</button>
+ <button dojoType='dijit.form.Button' onClick='ruleAgeProtectGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <div>
+ <table jsId="ruleAgeProtectGrid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['name', 'age', 'prox']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ fmClass='crahp'
+ editOnEnter='true'/>
+</div>
+[% END %]
+
+
Copied: branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2 (from rev 17316, trunk/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2)
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2 (rev 0)
+++ branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2 2010-09-02 21:02:15 UTC (rev 17452)
@@ -0,0 +1,27 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Circ Duration Rules' %]
+<script type="text/javascript">
+ dojo.require('openils.Util');
+ dojo.require('openils.widget.AutoGrid');
+ openils.Util.addOnLoad( function() { ruleCircDurationGrid.loadAll(); } );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Circ Duration Rules</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='ruleCircDurationGrid.showCreateDialog()'>New Duration Rule</button>
+ <button dojoType='dijit.form.Button' onClick='ruleCircDurationGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <div>
+ <table jsId="ruleCircDurationGrid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['name', 'max_renewals', 'shrt', 'normal', 'extended']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ fmClass='crcd'
+ editOnEnter='true'/>
+</div>
+[% END %]
+
+
Copied: branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2 (from rev 17316, trunk/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2)
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2 (rev 0)
+++ branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2 2010-09-02 21:02:15 UTC (rev 17452)
@@ -0,0 +1,27 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Circ Max Fine Rules' %]
+<script type="text/javascript">
+ dojo.require('openils.Util');
+ dojo.require('openils.widget.AutoGrid');
+ openils.Util.addOnLoad( function() { ruleMaxFineGrid.loadAll(); } );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Circ Max Fine Rules</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='ruleMaxFineGrid.showCreateDialog()'>New Max Fine Rule</button>
+ <button dojoType='dijit.form.Button' onClick='ruleMaxFineGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <div>
+ <table jsId="ruleMaxFineGrid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['name', 'amount', 'is_percent']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ fmClass='crmf'
+ editOnEnter='true'/>
+</div>
+[% END %]
+
+
Copied: branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2 (from rev 17316, trunk/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2)
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2 (rev 0)
+++ branches/rel_2_0/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2 2010-09-02 21:02:15 UTC (rev 17452)
@@ -0,0 +1,27 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Recurring Fine Rules' %]
+<script type="text/javascript">
+ dojo.require('openils.Util');
+ dojo.require('openils.widget.AutoGrid');
+ openils.Util.addOnLoad( function() { ruleRecurringFineGrid.loadAll(); } );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Recurring Fine Rules</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='ruleRecurringFineGrid.showCreateDialog()'>New Recurring Fine Rule</button>
+ <button dojoType='dijit.form.Button' onClick='ruleRecurringFineGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <div>
+ <table jsId="ruleRecurringFineGrid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['name', 'recurrence_interval', 'low', 'normal', 'high']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ fmClass='crrf'
+ editOnEnter='true'/>
+</div>
+[% END %]
+
+
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-09-02 20:11:17 UTC (rev 17451)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-09-02 21:02:15 UTC (rev 17452)
@@ -604,6 +604,22 @@
['oncommand'],
function() { open_eg_web_page('conify/global/permission/grp_penalty_threshold'); }
],
+ 'cmd_server_admin_config_rule_circ_duration' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/config/rule_circ_duration'); }
+ ],
+ 'cmd_server_admin_config_rule_recurring_fine' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/config/rule_recurring_fine'); }
+ ],
+ 'cmd_server_admin_config_rule_max_fine' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/config/rule_max_fine'); }
+ ],
+ 'cmd_server_admin_config_rule_age_hold_protect' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/config/rule_age_hold_protect'); }
+ ],
'cmd_local_admin_external_text_editor' : [
['oncommand'],
function() {
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-09-02 20:11:17 UTC (rev 17451)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-09-02 21:02:15 UTC (rev 17452)
@@ -158,6 +158,10 @@
<command id="cmd_server_admin_global_flag"/>
<command id="cmd_server_admin_org_unit_setting_type"/>
<command id="cmd_server_admin_usr_setting_type"/>
+ <command id="cmd_server_admin_config_rule_circ_duration"/>
+ <command id="cmd_server_admin_config_rule_recurring_fine"/>
+ <command id="cmd_server_admin_config_rule_max_fine"/>
+ <command id="cmd_server_admin_config_rule_age_hold_protect"/>
<command id="cmd_server_admin_booking_resource" />
<command id="cmd_server_admin_booking_resource_type" />
<command id="cmd_server_admin_booking_resource_attr" />
@@ -383,6 +387,10 @@
<menuitem label="&staff.main.menu.admin.server_admin.conify.global_flag.label;" command="cmd_server_admin_global_flag"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.org_unit_setting_type;" command="cmd_server_admin_org_unit_setting_type"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.usr_setting_type;" command="cmd_server_admin_usr_setting_type"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.config_rule_circ_duration;" command="cmd_server_admin_config_rule_circ_duration"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.config_rule_recurring_fine;" command="cmd_server_admin_config_rule_recurring_fine"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.config_rule_max_fine;" command="cmd_server_admin_config_rule_max_fine"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.config_rule_age_hold_protect;" command="cmd_server_admin_config_rule_age_hold_protect"/>
<menu id="main.menu.admin.server.acq" label="&staff.main.menu.admin.server_admin.acq.label;" accesskey="&staff.main.menu.admin.server_admin.acq.accesskey;">
<menupopup id="main.menu.admin.server.acq.popup">
<menuitem label="&staff.main.menu.admin.server_admin.acq.fund.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund.accesskey;" command="cmd_server_admin_acq_fund" />
More information about the open-ils-commits
mailing list