From 347c0214388bae18616a9003adf84d7be509fa86 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Sun, 20 Mar 2016 16:06:02 +0545 Subject: Reengineer Form_Button setAttribute As per what was done for https://github.com/pfsense/pfsense/pull/2765 - do it to the rest of them. Seems to work OK. --- src/usr/local/www/firewall_nat_edit.php | 3 +-- src/usr/local/www/firewall_rules_edit.php | 9 ++------ src/usr/local/www/firewall_schedule_edit.php | 14 +++--------- src/usr/local/www/interfaces.php | 26 +++++++++------------- src/usr/local/www/interfaces_bridge_edit.php | 4 +--- src/usr/local/www/interfaces_ppps_edit.php | 4 +--- src/usr/local/www/load_balancer_pool_edit.php | 17 +++++--------- src/usr/local/www/pkg_edit.php | 4 +--- .../local/www/services_captiveportal_mac_edit.php | 5 +---- src/usr/local/www/services_dhcp.php | 24 +++++--------------- src/usr/local/www/services_dhcp_edit.php | 17 ++++---------- src/usr/local/www/services_dhcpv6.php | 20 +++++------------ src/usr/local/www/services_ntpd.php | 8 ++----- src/usr/local/www/services_ntpd_gps.php | 8 ++----- src/usr/local/www/system_authservers.php | 3 +-- src/usr/local/www/system_gateways_edit.php | 4 +--- src/usr/local/www/system_groupmanager.php | 9 ++------ src/usr/local/www/system_groupmanager_addprivs.php | 8 ++----- src/usr/local/www/system_usermanager.php | 8 ++----- src/usr/local/www/system_usermanager_addprivs.php | 8 ++----- 20 files changed, 54 insertions(+), 149 deletions(-) (limited to 'src/usr/local') diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 5b92df7..383d026 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -726,7 +726,7 @@ $btnsrcadv = new Form_Button( 'fa-cog' ); -$btnsrcadv->addClass('btn-info btn-sm'); +$btnsrcadv->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( 'Source', @@ -1267,7 +1267,6 @@ events.push(function() { }); // ---------- On initial page load -------------------------------------------------------------------------------- - $("#btnsrcadv").prop('type', 'button'); hideSource(!srcenabled); ext_change(); dst_change($('#interface').val(),'',''); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 21e719a..01312cc 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1366,7 +1366,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { 'Display Advanced', null, 'fa-cog' - ))->addClass('btn-info btn-sm'); + ))->setAttribute('type','button')->addClass('btn-info btn-sm'); } $portValues = ['' => gettext('(other)'), 'any' => gettext('any')]; @@ -1448,7 +1448,7 @@ $btnadv = new Form_Button( 'fa-cog' ); -$btnadv->addClass('btn-info btn-sm'); +$btnadv->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( 'Advanced Options', @@ -1767,8 +1767,6 @@ events.push(function() { $('#btnadvopts').html(' ' + text); } - $('#btnadvopts').prop('type', 'button'); - $('#btnadvopts').click(function(event) { show_advopts(); }); @@ -1963,9 +1961,6 @@ events.push(function() { show_source_port_range(); - // Make it a regular button, not a submit - $("#btnsrcadv").prop('type','button'); - // on click . . $('#srcbeginport').on('change', function() { src_rep_change(); diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 14f9d0c..1a9b4b1 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -471,14 +471,14 @@ $group->add(new Form_Button( 'Add Time', null, 'fa-plus' -))->addClass('btn-success btn-sm'); +))->setAttribute('type','button')->addClass('btn-success btn-sm'); $group->add(new Form_Button( 'btnclrsel', 'Clear selection', null, 'fa-undo' -))->addClass('btn-info btn-sm'); +))->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->add($group); @@ -657,7 +657,7 @@ if ($getSchedule) { 'Delete', null, 'fa-trash' - ))->addClass('btn-xs btn-warning'); + ))->setAttribute('type','button')->addClass('btn-xs btn-warning'); $group->add(new Form_Input( 'schedule' . $counter, @@ -695,24 +695,16 @@ events.push(function() { update_month(); }); - // Make the ‘clear’ button a plain button, not a submit button - $('#btnclrsel').prop('type', 'button'); - $('#btnclrsel').click(function() { clearCalendar(); clearTime(); clearDescr(); }); - // Make the ‘Add time’ button a plain button, not a submit button - $('#btnaddtime').prop('type', 'button'); - $('#btnaddtime').click(function() { processEntries(); }); - $('[id^=Delete]').prop('type', 'button'); - $('[id^=Delete]').click(function(event) { fse_delete_row(event.target.id.slice(6)); }); diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index 45835c4..6adb66a 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -1759,7 +1759,7 @@ $btnmymac = new Form_Button( 'fa-clone' ); -$btnmymac->addClass('btn-success btn-sm'); +$btnmymac->setAttribute('type','button')->addClass('btn-success btn-sm'); $group = new Form_Group('MAC controls'); $group->add($macaddress); @@ -1819,7 +1819,7 @@ $group->add(new Form_Button( 'Add a new gateway', null, 'fa-plus' -))->addClass('btn-success')->setAttribute('data-target', '#newgateway')->setAttribute('data-toggle', 'modal'); +))->setAttribute('type','button')->addClass('btn-success')->setAttribute('data-target', '#newgateway')->setAttribute('data-toggle', 'modal'); $group->setHelp('If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the "Add" button.' . '
' . 'On local LANs the upstream gateway should be "none".' . @@ -1852,7 +1852,7 @@ $group->add(new Form_Button( 'Add a new gateway', null, 'fa-plus' -))->addClass('btn-success')->setAttribute('data-target', '#newgateway6')->setAttribute('data-toggle', 'modal'); +))->setAttribute('type','button')->addClass('btn-success')->setAttribute('data-target', '#newgateway6')->setAttribute('data-toggle', 'modal'); $group->setHelp('If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the "Add" button.' . '
' . 'On local LANs the upstream gateway should be "none". '); @@ -1896,7 +1896,7 @@ $btnaddgw6 = new Form_Button( 'fa-plus' ); -$btnaddgw6->addClass('btn-success'); +$btnaddgw6->setAttribute('type','button')->addClass('btn-success'); $btncnxgw6 = new Form_Button( 'cnx6', @@ -1905,7 +1905,7 @@ $btncnxgw6 = new Form_Button( 'fa-undo' ); -$btncnxgw6->addClass('btn-warning'); +$btncnxgw6->setAttribute('type','button')->addClass('btn-warning'); $modal->addInput(new Form_StaticText( null, @@ -2561,7 +2561,7 @@ $section->addInput(new Form_Button( 'Advanced PPP', isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php', 'fa-cog' -))->addClass('btn-info')->setAttribute('id')->setHelp('Create a new PPP configuration'); +))->setAttribute('type','button')->addClass('btn-info')->setAttribute('id')->setHelp('Create a new PPP configuration'); $form->add($section); @@ -2687,7 +2687,7 @@ $section->addInput(new Form_Button( 'Advanced and MLPPP', isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php', 'fa-cog' -))->addClass('btn-info')->setAttribute('id')->setHelp('Click for additional PPPoE configuration options. Save first if changes have been made.'); +))->setAttribute('type','button')->addClass('btn-info')->setAttribute('id')->setHelp('Click for additional PPPoE configuration options. Save first if changes have been made.'); $form->add($section); @@ -2750,7 +2750,7 @@ $section->addInput(new Form_Button( 'Advanced and MLPPP', isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php', 'fa-cog' -))->addClass('btn-info')->setAttribute('id')->setHelp($mlppp_text . 'Click for additional PPTP and L2TP configuration options. Save first if changes have been made.'); +))->setAttribute('type','button')->addClass('btn-info')->setAttribute('id')->setHelp($mlppp_text . 'Click for additional PPTP and L2TP configuration options. Save first if changes have been made.'); $form->add($section); @@ -3203,7 +3203,7 @@ $btnaddgw = new Form_Button( 'fa-plus' ); -$btnaddgw->addClass('btn-success'); +$btnaddgw->setAttribute('type','button')->addClass('btn-success'); $btncnxgw = new Form_Button( 'cnx', @@ -3212,7 +3212,7 @@ $btncnxgw = new Form_Button( 'fa-undo' ); -$btncnxgw->addClass('btn-warning'); +$btncnxgw->setAttribute('type','button')->addClass('btn-warning'); $modal->addInput(new Form_StaticText( null, @@ -3592,12 +3592,6 @@ events.push(function() { updateType($('#type').val()); updateTypeSix($('#type6').val()); show_reset_settings($('#pppoe-reset-type').val()); - $("#add").prop('type', 'button'); - $("#cnx").prop('type', 'button'); - $("#addgw").prop('type', 'button'); - $("#add6").prop('type', 'button'); - $("#cnx6").prop('type', 'button'); - $("#addgw6").prop('type', 'button'); hideClass('dhcp6advanced', true); hideClass('dhcpadvanced', true); show_dhcp6adv(); diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 523e513..cf2f622 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -452,7 +452,7 @@ $btnadv = new Form_Button( 'fa-cog' ); -$btnadv->addClass('btn-info btn-sm'); +$btnadv->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( 'Advanced Options', @@ -697,8 +697,6 @@ events.push(function() { $('#btnadvopts').html(' ' + text); } - $('#btnadvopts').prop('type', 'button'); - $('#btnadvopts').click(function(event) { show_advopts(); }); diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index 02ff08e..b3c4fa8 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -836,7 +836,7 @@ $btnadv = new Form_Button( 'fa-cog' ); -$btnadv->addClass('btn-info btn-sm'); +$btnadv->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( 'Advanced options', @@ -1051,8 +1051,6 @@ events.push(function() { $('#btnadvopts').html(' ' + text); } // e-o-show_advopts - $('#btnadvopts').prop('type', 'button'); - $('#btnadvopts').click(function(event) { show_advopts(); }); diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 5f6d220..4ac291d 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -282,13 +282,6 @@ events.push(function() { } } - // Make buttons plain buttons, not a submit - $("#btnaddtopool").prop('type','button'); - $("#removeenabled").prop('type','button'); - $("#removedisabled").prop('type','button'); - $("#movetodisabled").prop('type','button'); - $("#movetoenabled").prop('type','button'); - // On click . . $("#btnaddtopool").click(function() { $('[name="servers[]"]').append(new Option($('#ipaddr').val(), $('#ipaddr').val())); @@ -415,7 +408,7 @@ $group->add(new Form_Button( 'Add to pool', null, 'fa-plus' -))->addClass('btn-success'); +))->setAttribute('type','button')->addClass('btn-success'); $section->add($group); @@ -460,14 +453,14 @@ $group->add(new Form_Button( 'Remove', null, 'fa-trash' -))->addClass('btn-danger btn-sm'); +))->setAttribute('type','button')->addClass('btn-danger btn-sm'); $group->add(new Form_Button( 'removeenabled', 'Remove', null, 'fa-trash' -))->addClass('btn-danger btn-sm'); +))->setAttribute('type','button')->addClass('btn-danger btn-sm'); $section->add($group); @@ -478,14 +471,14 @@ $group->add(new Form_Button( 'Move to enabled list', null, 'fa-angle-double-right' -))->addClass('btn-info btn-sm'); +))->setAttribute('type','button')->addClass('btn-info btn-sm'); $group->add(new Form_Button( 'movetodisabled', 'Move to disabled list', null, 'fa-angle-double-left' -))->addClass('btn-info btn-sm'); +))->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->add($group); diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 785f1ea..651f115 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -1518,7 +1518,7 @@ if (!empty($advanced)) { 'Show Advanced Options', null, 'fa-cog' - ))->addClass('btn-info'); + ))->setAttribute('type','button')->addClass('btn-info'); $form->add($advanced); } @@ -1548,8 +1548,6 @@ if ($pkg['fields']['field'] != "") { ?> checkLastRow(); // Show advanced section if you click the showadv button - $('#showadv').prop('type', 'button'); - $("#showadv").click(function() { advanced_visible = !advanced_visible; diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index 89ce6ce..5459e00 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -251,7 +251,7 @@ $btnmymac = new Form_Button( 'fa-clone' ); -$btnmymac->removeClass('btn-primary')->addClass('btn-success btn-sm'); +$btnmymac->setAttribute('type','button')->removeClass('btn-primary')->addClass('btn-success btn-sm'); $group = new Form_Group('MAC Address'); $group->add($macaddress); @@ -312,9 +312,6 @@ print($form);