From c5232cbbb986a834d4546cff38f38179b151441e Mon Sep 17 00:00:00 2001 From: gnhb Date: Thu, 3 Jun 2010 23:07:44 +0700 Subject: Rework GUI to hide advanced options and display via button. requested by Ermal. --- usr/local/www/interfaces_ppps_edit.php | 202 +++++++++++---------- .../javascript/interfaces_ppps_edit/ppps_edit.js | 55 ++++-- 2 files changed, 148 insertions(+), 109 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 5d4df19..4e95852 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -519,38 +519,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" -
- - - - - - - - - - - - - - - - - - -
+
@@ -602,29 +571,6 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" - - - > -
- - - - - - -
When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?> - - - - - - > -
- - - @@ -636,6 +582,8 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" + + @@ -643,53 +591,92 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" - + - - + + - - - + + + - - + + - - - + + + - - - + + + - + + + + + + + + +
- -
+ + + + + + + + + + + + + +
+
- - + +
- -
-
- - + +
+
- -
-
- -
-
@@ -762,7 +749,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" - +
@@ -794,13 +781,30 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" - + + - + - + + + + > +
+ + + + + + +
When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?> + + + >  @@ -809,7 +813,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" stamping or SACK, which modify TCP options between sequential packets. - + >  @@ -820,7 +824,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" gets to discover that it must reduce the fragment size or drop the IP Don't Fragment option from its outgoing data. - + ShortSeq >  @@ -828,21 +832,29 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" It is not necessary to disable this for connections that are not multi-link."); ?> - + ACFComp > 
- + ProtoComp > 
- + +   + +

+ + + 0 + + Link Parameters diff --git a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js index 1df660f..513dbdd 100644 --- a/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js +++ b/usr/local/www/javascript/interfaces_ppps_edit/ppps_edit.js @@ -14,16 +14,34 @@ function update_select_list(new_options, select_list){ show_hide_linkfields(select_list); } -function clear_selected(list_name){ - var select_list = document.iform[list_name]; - for(var j=0; j < select_list.options.length; j++){ - select_list.options[j].selected = 0; +function show_advanced(hide){ + var select_list = document.iform["interfaces[]"].options; + var adv_rows = parseInt($('adv_rows').innerHTML); + var adv_show = Boolean(parseInt($('adv_show').innerHTML)); + var status = Boolean(parseInt(hide)); + if (status){ + $('advanced_').hide(); + for(var j=0; j < adv_rows; j++){ + var advanced = "advanced_" + j.toString(); + $(advanced).show(); + } + $('adv_show').innerHTML = "1"; + show_hide_linkfields(select_list); + } else { + $('advanced_').show(); + for(var j=0; j < adv_rows; j++){ + var advanced = "advanced_" + j.toString(); + $(advanced).hide(); + } + $('adv_show').innerHTML = "0"; + show_hide_linkfields(select_list); } } function show_hide_linkfields(options){ var i = 0; var port_count = parseInt($('port_count').innerHTML); + var adv_show = Boolean(parseInt($('adv_show').innerHTML)); for(var j=0; j < port_count; j++){ var count = j.toString(); var type = $('type').value; @@ -62,13 +80,17 @@ function show_hide_linkfields(options){ $(localip).name = "localip[" + options[i].value + "]"; $(subnet).name = "subnet[" + options[i].value + "]"; $(gateway).name = "gateway[" + options[i].value + "]"; - if (type == 'pptp' || type == 'ppp' || type == 'l2tp'){ + if (type == 'ppp' && adv_show){ $(ipfields).show(); - if (type == 'pptp' || type == 'l2tp'){ - $(subnet).disabled = false; - } } - $(link).show(); + if (type == 'pptp' || type == 'l2tp'){ + $(subnet).disabled = false; + $(ipfields).show(); + $('pptp').show(); + } + if (adv_show){ + $(link).show(); + } i++; break; } @@ -82,9 +104,11 @@ function updateType(t){ var serialports = $('serialports').innerHTML; var ports = $('ports').innerHTML; var select_list = document.iform["interfaces[]"].options; + $('adv_show').innerHTML = "0"; + show_advanced('0'); switch(t) { case "select": { - $('ppp','pppoe','pptp','prefil_ppp').invoke('hide'); + $('ppp','pppoe','pptp').invoke('hide'); select_list.length = 0; select_list[0] = new Option("Select Link Type First",""); break; @@ -92,21 +116,24 @@ function updateType(t){ case "ppp": { update_select_list(serialports, select_list); $('select','pppoe','pptp').invoke('hide'); - $('prefil_ppp').show(); country_list(); break; } case "pppoe": { update_select_list(ports, select_list); - $('select','ppp','pptp','prefil_ppp').invoke('hide'); + $('select','ppp','pptp').invoke('hide'); break; } case "l2tp": { - t = "pptp"; + $('pptp_label').innerHTML = "L2TP Configuration"; + update_select_list(ports, select_list); + $('select','ppp','pppoe').invoke('hide'); + break; } case "pptp": { update_select_list(ports, select_list); - $('select','ppp','pppoe','prefil_ppp').invoke('hide'); + $('select','ppp','pppoe').invoke('hide'); + $('pptp_label').innerHTML = "PPTP Configuration"; break; } default: -- cgit v1.1