diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-02 14:57:24 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-02 14:57:24 -0400 |
commit | 08ec2d996099baf305efd8f28ee267c7fd043390 (patch) | |
tree | f56a7ff22dda9123d363b0a1a5289ffc0b396f79 /src/usr/local/www/vpn_pppoe_edit.php | |
parent | 60e27eb009fd597445342d017a36047367a7ce5d (diff) | |
download | pfsense-08ec2d996099baf305efd8f28ee267c7fd043390.zip pfsense-08ec2d996099baf305efd8f28ee267c7fd043390.tar.gz |
Completes #5159
All duplicated JS removed to included file
Diffstat (limited to 'src/usr/local/www/vpn_pppoe_edit.php')
-rw-r--r-- | src/usr/local/www/vpn_pppoe_edit.php | 180 |
1 files changed, 10 insertions, 170 deletions
diff --git a/src/usr/local/www/vpn_pppoe_edit.php b/src/usr/local/www/vpn_pppoe_edit.php index 6bc2674..d6540a5 100644 --- a/src/usr/local/www/vpn_pppoe_edit.php +++ b/src/usr/local/www/vpn_pppoe_edit.php @@ -543,10 +543,17 @@ if ($usernames != ""){ } } -$section->addInput(new Form_Button( +$btnaddrow = new Form_Button( 'addrow', - 'Add' -))->removeClass('btn-primary')->addClass('btn-success'); + 'Add user' +); + +$btnaddrow->removeClass('btn-primary')->addClass('btn-success'); + +$section->addInput(new Form_StaticText( + null, + ' ' . $btnaddrow +)); // Hidden fields if(isset($id)) { @@ -576,155 +583,6 @@ print_info_box(gettext('Don\'t forget to add a firewall rule to permit traffic f <script> //<![CDATA[ events.push(function(){ - function setMasks() { - // Find all ipaddress masks and make dynamic based on address family of input - $('span.pfIpMask + select').each(function (idx, select){ - var input = $(select).prevAll('input[type=text]'); - - input.on('change', function(e){ - var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128; - if (!isV6) - max = 32; - - if (input.val() == "") - return; - - while (select.options.length > max) - select.remove(0); - - if (select.options.length < max) - { - for (var i=select.options.length; i<=max; i++) - select.options.add(new Option(i, i), 0); - } - }); - - // Fire immediately - input.change(); - }); - } - - // Complicated function to move all help text associated with this input id to the same id - // on the row above. That way if you delete the last row, you don't lose the help - function moveHelpText(id) { - $('#' + id).parent('div').parent('div').find('input').each(function() { // For each <span></span> - var fromId = this.id; - var toId = decrStringInt(fromId); - var helpSpan; - - if(!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) { - - helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone(); - if($(helpSpan).hasClass('help-block')) { - if($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group')) - $('#' + decrStringInt(fromId)).parent('div').after(helpSpan); - else - $('#' + decrStringInt(fromId)).after(helpSpan); - } - } - }); - } - - // Increment the number at the end of the string - function bumpStringInt( str ) { - var data = str.match(/(\D*)(\d+)(\D*)/), newStr = ""; - - if( data ) - newStr = data[ 1 ] + ( Number( data[ 2 ] ) + 1 ) + data[ 3 ]; - - return newStr || str; - } - - // Decrement the number at the end of the string - function decrStringInt( str ) { - var data = str.match(/(\D*)(\d+)(\D*)/), newStr = ""; - - if( data ) - newStr = data[ 1 ] + ( Number( data[ 2 ] ) - 1 ) + data[ 3 ]; - - return newStr || str; - } - - // Called after a delete so that there are no gaps in the numbering. Most of the time the config system doesn't care about - // gaps, but I do :) - function renumber() { - var idx = 0; - - $('.repeatable').each(function() { - - $(this).find('input').each(function() { - $(this).prop("id", this.id.replace(/\d+$/, "") + idx); - $(this).prop("name", this.name.replace(/\d+$/, "") + idx); - }); - - $(this).find('select').each(function() { - $(this).prop("id", this.id.replace(/\d+$/, "") + idx); - $(this).prop("name", this.name.replace(/\d+$/, "") + idx); - }); - - $(this).find('label').attr('for', $(this).find('label').attr('for').replace(/\d+$/, "") + idx); - - idx++; - }); - } - - function delete_row(row) { - $('#' + row).parent('div').parent('div').remove(); - renumber(); - } - - function add_row() { - // Find the lst repeatable group - var lastRepeatableGroup = $('.repeatable:last'); - - // Clone it - var newGroup = lastRepeatableGroup.clone(true); - - // Increment the suffix number for each input elemnt in the new group - $(newGroup).find('input').each(function() { - $(this).prop("id", bumpStringInt(this.id)); - $(this).prop("name", bumpStringInt(this.name)); - if(!$(this).is('[id^=delete]')) - $(this).val(''); - }); - - // Do the same for selectors - $(newGroup).find('select').each(function() { - $(this).prop("id", bumpStringInt(this.id)); - $(this).prop("name", bumpStringInt(this.name)); - // If this selector lists mask bits, we need it to be reset to all 128 options - // and no items selected, so that automatic v4/v6 selection still works - if($(this).is('[id^=address_subnet]')) { - $(this).empty(); - for(idx=128; idx>0; idx--) { - $(this).append($('<option>', { - value: idx, - text: idx - })); - } - } - }); - - // And for "for" tags - $(newGroup).find('label').attr('for', bumpStringInt($(newGroup).find('label').attr('for'))); - $(newGroup).find('label').text(""); // Clear the label. We only want it on the very first row - - // Insert the updated/cloned row - $(lastRepeatableGroup).after(newGroup); - - // Delete any help text from the group we have cloned - $(lastRepeatableGroup).find('.help-block').each(function() { - $(this).remove(); - }); - - setMasks(); - - } - - // Disables the specified input element - function disableInput(id, disable) { - $('#' + id).prop("disabled", disable); - } // show/hide radius server controls function hide_radius(hide) { @@ -764,27 +622,9 @@ events.push(function(){ }); // ---------- On initial page load ------------------------------------------------------------ - hide_radius2(!$('#radiussecenable').prop('checked')); hide_radius(!$('#radiusenable').prop('checked')); - // These are action buttons, not submit buttons - $('[id^=addrow]').prop('type','button'); - $('[id^=delete]').prop('type','button'); - - // ---------- Click checkbox handlers --------------------------------------------------------- - - $('[id^=addrow]').click(function() { - add_row(); - }); - $('[id^=delete]').click(function(event) { - if($('.repeatable').length > 1) { - moveHelpText(event.target.id); - delete_row(event.target.id); - } - else - alert('<?php echo gettext("You may not delete the last one!")?>'); - }); }); //]]> </script> |