From c98126f8121cacc6af1eda3c5445d94eb5d4c0e3 Mon Sep 17 00:00:00 2001 From: dman776 Date: Sun, 21 Mar 2021 19:14:29 -0500 Subject: [PATCH] feature: add "none" type advanced config options to simplify the UI (#81) --- files/www/cgi-bin/advancedconfig | 38 +++++++++++++------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/files/www/cgi-bin/advancedconfig b/files/www/cgi-bin/advancedconfig index fa2c018c..66e7a44d 100755 --- a/files/www/cgi-bin/advancedconfig +++ b/files/www/cgi-bin/advancedconfig @@ -136,15 +136,15 @@ push @setting, { }; push @setting, { key => "aredn.olsr.restart", - type => "boolean", - desc => "Value doesn't matter. Will restart OLSR when saving setting -- wait up to 2 or 3 minutes to receive response.", + type => "none", + desc => "Will restart OLSR when saving setting -- wait up to 2 or 3 minutes to receive response.", default => "0", postcallback => "olsr_restart()" }; push @setting, { key => "aredn.aam.refresh", - type => "boolean", - desc => "Value doesn't matter. Will attempt to pull any AREDN Alert messages.", + type => "none", + desc => "Attempt to pull any AREDN Alert messages.", default => "0", postcallback => "aam_refresh()" }; @@ -156,8 +156,8 @@ push @setting, { }; push @setting, { key => "aredn.aam.purge", - type => "boolean", - desc => "Value doesn't matter. Will immediately purge/delete all AREDN (and local) Alerts from this node.", + type => "none", + desc => "Immediately purge/delete all AREDN (and local) Alerts from this node.", default => "", postcallback => "alert_purge()" }; @@ -429,30 +429,22 @@ foreach(@setting) EOF - print "" if($setting[$scount]->{'type'} eq "string"); - - #print "" if($setting[$scount]->{'type'} eq "boolean" and $sval == 1 ); - #print "" if($setting[$scount]->{'type'} eq "boolean" and $sval == 0 ); - #print " ON" if($setting[$scount]->{'type'} eq "boolean" and $sval == 1 ); - #print " OFF" if($setting[$scount]->{'type'} eq "boolean" and $sval == 0); - - - - + print "" if($setting[$scount]->{'type'} eq "string"); print "OFFON" if($setting[$scount]->{'type'} eq "boolean" and $sval == 1 ); print "OFFON" if($setting[$scount]->{'type'} eq "boolean" and $sval == 0 ); - - #print "" if($setting[$scount]->{'type'} eq "boolean" and $sval == 1 ); - #print "" if($setting[$scount]->{'type'} eq "boolean" and $sval == 0 ); - #print " Currently: ON" if($setting[$scount]->{'type'} eq "boolean" and $sval == 1 ); - #print " Currently: OFF" if($setting[$scount]->{'type'} eq "boolean" and $sval == 0); + print "(Value not applicable)" if($setting[$scount]->{'type'} eq "none"); print < -

EOF - print "{'default'}';\">" if($setting[$scount]->{'type'} ne "boolean"); + if($setting[$scount]->{'type'} ne "none") + { + print "

"; + } else { + print "

"; + } + print "{'default'}';\">" if($setting[$scount]->{'type'} eq "string"); print "{'default'}' );\">" if($setting[$scount]->{'type'} eq "boolean"); print <