From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larsen To: development@lists.ipfire.org Subject: [PATCH] Mark required input fields with a star Date: Thu, 04 Jun 2015 23:31:08 +0200 Message-ID: <5570C39C.3070403@web.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6999719132087155708==" List-Id: --===============6999719132087155708== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Mark required input fields with a star as nowadays this is the de-facto default. Before, it was the other way around and optional fields were marked. Fixes bug 10847. Signed-off-by: Lars Schuhmacher --- html/cgi-bin/connscheduler.cgi | 10 ++--- html/cgi-bin/dhcp.cgi | 51 ++++++++++++------------ html/cgi-bin/dnsforward.cgi | 8 ++-- html/cgi-bin/hosts.cgi | 10 ++--- html/cgi-bin/mac.cgi | 12 +++--- html/cgi-bin/modem.cgi | 17 ++++---- html/cgi-bin/ovpnmain.cgi | 73 +++++++++++++++++----------------- html/cgi-bin/pppsetup.cgi | 38 +++++++++--------- html/cgi-bin/proxy.cgi | 78 ++++++++++++++++++-----------------= -- html/cgi-bin/qos.cgi | 6 +-- html/cgi-bin/time.cgi | 6 +-- html/cgi-bin/tor.cgi | 18 ++++----- html/cgi-bin/updatexlrator.cgi | 4 +- html/cgi-bin/urlfilter.cgi | 48 +++++++++++------------ html/cgi-bin/vpnmain.cgi | 63 +++++++++++++++--------------- html/cgi-bin/wakeonlan.cgi | 6 +-- html/cgi-bin/wireless.cgi | 8 ++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- src/squid-accounting/accounting.cgi | 44 ++++++++++----------- 27 files changed, 253 insertions(+), 265 deletions(-) diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index c3bd0bc..90aae52 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -275,7 +275,7 @@ print < - + - - + - +
$Lang::tr{'ConnSched time'}$Lang::tr{'ConnSched time'} 3D'*'


$Lang::tr{'ConnSched action'} +
$Lang::tr{'ConnSched action'}   


$Lang::tr{'ConnSched days'}
$Lang::tr{'ConnSched days'} 3D'*'  

$Lang::tr{'remark title'} 3D'*'
$Lang::tr{'remark title'}

- + diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index e75207a..29a71e4 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -544,39 +544,39 @@ print < - + - + - + - + - + - + - + - + - + - + - + - + -
3D'*'$Lang::tr{'this field may be blank'}$Lang::tr{'required field'} $Lang::tr{'ip address'}
$Lang::tr{= 'netmask'}:		$netsettings{"${itf}_ADDRESS"}
$netsettings{"${it= f}_NETMASK"}
$Lang::tr{'start address'}$Lang::tr{'start address'} 3D'*' $Lang::tr{'end address'}$Lang::tr{'end address'} 3D'*'
$Lang::tr{'default lease time'}$Lang::tr{'default lease time'} 3D'*' $Lang::tr{'max lease time'}$Lang::tr{'max lease time'} 3D'*'
$Lang::tr{'domain name suffix'} 3D'*'$Lang::tr{'domain name suffix'} $Lang::tr{'dhcp allow bootp'}:
$Lang::tr{'primary dns'}$Lang::tr{'primary dns'} 3D'*' $Lang::tr{'secondary dns'} 3D'*'$Lang::tr{'secondary dns'}
$Lang::tr{'primary ntp server'}: 3D'*'$Lang::tr{'primary ntp server'}: $Lang::tr{'secondary ntp server'}: 3D'*'$Lang::tr{'secondary ntp server'}:
$Lang::tr{'primary wins server address'}: 3D'*'$Lang::tr{'primary wins server address'}: $Lang::tr{'secondary wins server address'}: $Lang::tr{'secondary wins server address'}:
next-server: 3D'*'= next-server: filename: 3D'*' + filename:
@@ -588,7 +588,7 @@ END print < -  $Lang::tr{'this field may be blank'} +  $Lang::tr{'required field'} $warnNTPmessage @@ -622,13 +622,13 @@ if ($opt ne '') { } print < - $Lang::tr{'dhcp advopt name'}: + $Lang::tr{'dhcp advopt name'}: 3D'*' - $Lang::tr{'dhcp advopt value'}: + $Lang::tr{'dhcp advopt value'}: 3D'*' $opt $Lang::tr{'enabled'} - $Lang::tr{'dhcp advopt scope'}: 3D'*' + $Lang::tr{'dhcp advopt scope'}: END ; @@ -649,7 +649,7 @@ print < - + + - + - + - + - -
 $Lang::tr{'dhcp advopt scope help'}$Lang::tr{'dhcp advopt scope help'} @@ -827,29 +827,29 @@ if ($dhcpsettings{'KEY2'} ne '') { } print < - $Lang::tr{'mac address'}:$Lang::tr{'mac address'}: 3D'*' $Lang::tr{'ip address'}:$Lang::tr{'ip address'}: 3D'*' $Lang::tr{'remark'}: =3D'*'$Lang::tr{'remark'}:
$Lang::tr{'enabled'}
$Lang::tr{'dhcp bootp pxe data'}
next-server: 3D'*'= next-server: filename: 3D'*' + filename: root path: 3D'*' + root path:
- +
 $Lang::tr{'this field may be blank'} $Lang::tr{'required field'} @@ -857,7 +857,6 @@ print <
-
END ; #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'ne= w sort order' diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index b66fa46..1afc55f 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -207,20 +207,20 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { print < - $Lang::tr{'dnsforward zone'}: + $Lang::tr{'dnsforward zone'}: 3D'*' $Lang::tr{'enabled'} =20 - $Lang::tr{'dnsforward forward_server'}: + $Lang::tr{'dnsforward forward_server'}:&n= bsp;3D'*' =20 - +
$Lang::tr{'remark'}: 3D'*'$Lang::tr{'remark'}:
@@ -229,7 +229,7 @@ print < - 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index bb7df1f..e3463d1 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -223,7 +223,7 @@ if ($errormessage) { # #
# -# # # @@ -253,12 +253,12 @@ print <
+# # $warnmessage
- + - + - + @@ -268,7 +268,7 @@ print <
$Lang::tr{'host ip'}: $Lang::tr{'host ip'}: =3D'*' $Lang::tr{'hostname'}:$Lang::tr{'hostname'}: 
$Lang::tr{'domain name'}: 3D'*'$Lang::tr{'domain name'}: $Lang::tr{'enabled'}
- +
 $Lang::tr{'this field may be blank'} $Lang::tr{'required field'}
diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi index 1d34363..161be34 100644 --- a/html/cgi-bin/mac.cgi +++ b/html/cgi-bin/mac.cgi @@ -134,7 +134,7 @@ print <  - $Lang::tr{'mac new'} = + $Lang::tr{'mac new'} 3D'*' END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { @@ -159,12 +159,12 @@ END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { print <3D'*' + END ; } else { =20 print <3D'*' + END ; =20 }=20 @@ -179,12 +179,12 @@ END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { print <3D'*' + END ; } else { =20 print <3D'*' + END ; =20 }=20 @@ -195,7 +195,7 @@ print <
- 3D'*' $Lang::tr{'t= his field may be blank'}
+ 3D'*' $Lang::tr{'r= equired field'}
END ; diff --git a/html/cgi-bin/modem.cgi b/html/cgi-bin/modem.cgi index 48d1260..a13f8b2 100644 --- a/html/cgi-bin/modem.cgi +++ b/html/cgi-bin/modem.cgi @@ -78,25 +78,25 @@ print "
\n"; print < - $Lang::tr{'init string'} 3D'*' + $Lang::tr{'init string'} - $Lang::tr{'hangup string'} 3D'*' + $Lang::tr{'hangup string'} - $Lang::tr{'speaker on'} =3D'*' + $Lang::tr{'speaker on'} - $Lang::tr{'speaker off'} =3D'*' + $Lang::tr{'speaker off'} - $Lang::tr{'tone dial'} =3D'*' + $Lang::tr{'tone dial'} - $Lang::tr{'pulse dial'} =3D'*' + $Lang::tr{'pulse dial'} - $Lang::tr{'connect timeout'} + $Lang::tr{'connect timeout'} 3D'*'     @@ -107,8 +107,7 @@ print < - 3D'*'  - $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fb52e68..9e252a9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1956,22 +1956,22 @@ END print < - + - + - + - + - - + @@ -2002,7 +2002,7 @@ END =20 + 3D'*' $Lang::tr{'requ= ired field'}
$Lang::tr{'organization name'}:
$Lang::tr{'organization name'}: <= img src=3D'/blob.gif' alt=3D'*' />  
$Lang::tr{'ipfires hostname'}:
$Lang::tr{'ipfires hostname'}: 3D'*'  
$Lang::tr{'your e-mail'}: 
$Lang::tr{'your e-mail'}:  
$Lang::tr{'your department'}: 
$Lang::tr{'your department'}:  
$Lang::tr{'city'}: $Lang::tr{'city'}:  
$Lang::tr{'state or province'}: 
$Lang::tr{'state or province'}:  
$Lang::tr{'country'}:   
- 3D'*' $Lang::tr{'this= field may be blank'}

@@ -2018,17 +2018,17 @@ END =20
- + - + + 3D'*' $Lang::tr{'requi= red field'}
$Lang::tr{'upload p12 file'}:
$Lang::tr{'upload p12 file'}: = ;3D'*'  
$Lang::tr{'pkcs12 file password'}: 3D'*'
$Lang::tr{'pkcs12 file password'}:  
   
-  $Lang::tr{'this f= ield may be blank'}
END @@ -3101,11 +3101,10 @@ if ( -s "${General::swroot}/ovpn/settings") { =09 $Lang::tr{'net to net vpn'} (Upload Client Package)   -  Import Connection Name +  Import Connection Name  $Lang::tr{'openvpn default'}: Client Packagename
- 3D'*' $Lang::tr{'this field may be blank'} END ; @@ -4487,7 +4486,7 @@ if ($cgiparams{'TYPE'} eq 'net') { &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); print "\n"; =20 - print ""; + print ""; =09 if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { @@ -4526,14 +4525,14 @@ if ($cgiparams{'TYPE'} eq 'net') { =20 - + =20 - + =20 - + =20 @@ -4543,10 +4542,10 @@ if ($cgiparams{'TYPE'} eq 'net') { =09 - + =20 - + =20 @@ -4556,22 +4555,22 @@ if ($cgiparams{'TYPE'} eq 'net') { =20 - + =20 - + =20 - + =20 - =20 @@ -4622,7 +4621,7 @@ END ; } #jumper - print ""; + print ""; print "
$Lang::tr{'name'}:
$Lang::tr{'name'}: =
$Lang::tr{'local subnet'}
$Lang::tr{'local subnet'} = ;3D'*' $Lang::tr{'remote subnet'}$Lang::tr{'remote subnet'} <= img src=3D'/blob.gif' alt=3D'*' />
$Lang::tr{'ovpn subnet'}
$Lang::tr{'ovpn subnet'} = 3D'*' $Lang::tr{'protocol'}
$Lang::tr{'destination port'}:$Lang::tr{'destination port'}: 3D'*' Management Port ($Lang::tr{'openv= pn default'}: $Lang::tr{'destination port'}):  Management Port ($Lang::tr{'openv= pn default'}: $Lang::tr{'destination port'}):
$Lang::tr{'MTU settings'}
$Lang::tr{'MTU'} <= img src=3D'/blob.gif' />
$Lang::tr{'MTU'} $Lang::tr{'openvpn default'}: udp/tcp 1500/1400
fragment  
fragment: $Lang::tr{'openvpn default'}: 1300
mssfix  
mssfix: $Lang::tr{'openvpn default'}: on
$Lang::tr{'comp-lzo'} &= nbsp; +
$Lang::tr{'comp-lzo'} =
$Lang::tr{'remark title'} 
$Lang::tr{'remark title'}
"; =09 if ($cgiparams{'TYPE'} eq 'host') { @@ -4689,12 +4688,12 @@ if ($cgiparams{'TYPE'} eq 'host') {
  $Lang::tr{'genera= te a certificate'}  -  $Lang::tr{'users fullname or syst= em hostname'}: -  $Lang::tr{'users email'}:  -  $Lang::tr{'users department'}:&nb= sp; -  $Lang::tr{'organization name'}:&n= bsp; -  $Lang::tr{'city'}:  -  $Lang::tr{'state or province'}:&n= bsp; +  $Lang::tr{'users fullname or syst= em hostname'}: 3D'*' +  $Lang::tr{'users email'}: +  $Lang::tr{'users department'}: +  $Lang::tr{'organization name'}: +  $Lang::tr{'city'}: +  $Lang::tr{'state or province'}:  $Lang::tr{'country'}:$Lang::tr{'genera= te a certificate'}  -  $Lang::tr{'users fullname or syst= em hostname'}: -  $Lang::tr{'users email'}:  -  $Lang::tr{'users department'}:&nb= sp; -  $Lang::tr{'organization name'}:&n= bsp; -  $Lang::tr{'city'}:  -  $Lang::tr{'state or province'}:&n= bsp; +  $Lang::tr{'users fullname or syst= em hostname'}: 3D'*' +  $Lang::tr{'users email'}: +  $Lang::tr{'users department'}: +  $Lang::tr{'organization name'}: +  $Lang::tr{'city'}: +  $Lang::tr{'state or province'}:  $Lang::tr{'country'}:=  
- 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} END }else{ @@ -4761,7 +4760,7 @@ END        
- 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} =20 END diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 33f521e..72be46e 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -693,7 +693,7 @@ END ; } if ($pppsettings{'TYPE'} =3D~ /^(modem)$/ ) { - print "$Lang::tr= {'number'}\n"; + print "$Lang::tr= {'number'} 3D'*'\n"; print "\n"; if ($pppsettings{'TYPE'} eq 'modem' ) { print "$= Lang::tr{'modem speaker on'}\n"; @@ -711,15 +711,15 @@ END - $Lang::tr{'optional at cmd'} 1&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 1<= /td> - $Lang::tr{'optional at cmd'} 2&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 2<= /td> - $Lang::tr{'optional at cmd'} 3&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 3<= /td> @@ -732,7 +732,7 @@ END =20 print < - $Lang::tr{'idle timeout'} + $Lang::tr{'idle timeout'} 3D'*' @@ -774,11 +774,11 @@ print < - $Lang::tr{'holdoff'}: + $Lang::tr{'holdoff'}: 3D'*' - $Lang::tr{'maximum retries'} + $Lang::tr{'maximum retries'}  END @@ -793,15 +793,15 @@ print <$L= ang::tr{'pptp settings'} - Peer + Peer: 3D'*' - My Netconfig + My Netconfig: 3D'*= - PPTP Route 3D'*' + PPTP Route: =20 @@ -889,12 +889,12 @@ print <$L= ang::tr{'pppoe settings'} - $Lang::tr{'service name'} 3D'*' + $Lang::tr{'service name'} - $Lang::tr{'concentrator name'} 3D'*' + $Lang::tr{'concentrator name'} @@ -909,11 +909,11 @@ print < - MTU 3D'*' + MTU: - MRU 3D'*' + MRU: END @@ -925,9 +925,9 @@ print <$L= ang::tr{'authentication'} - $Lang::tr{'username'} + $Lang::tr{'username'} 3D'*' - $Lang::tr{'password'} + $Lang::tr{'password'} 3D'*' @@ -948,7 +948,7 @@ END } print < - $Lang::tr{'script name'} 3D'*' + $Lang::tr{'script name'}

@@ -969,7 +969,7 @@ print <



- $Lang::tr{'profile name'} + $Lang::tr{'profile name'} 3D'*' @@ -978,7 +978,7 @@ print < $Lang::tr{'legend'}: - 3D'*'&= nbsp;$Lang::tr{'this field may be blank'} + 3D'*'&= nbsp;$Lang::tr{'required field'} END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index ba2455a..6c4e2b0 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -969,13 +969,13 @@ print < $Lang::tr{'advproxy enabled on'} Green: - $Lang::tr{'advproxy proxy port'}: + $Lang::tr{'advproxy proxy port'}:  $Lang::tr{'advproxy transparent on'} Green: - $Lang::tr{'advproxy proxy port transparent= '}: + $Lang::tr{'advproxy proxy port transparent= '}: 3D'*' @@ -988,7 +988,7 @@ if ($netsettings{'BLUE_DEV'}) { print " "; } print <$Lang::tr{'advproxy visible hostname'}: 3D'*' + $Lang::tr{'advproxy visible hostname'}: @@ -1035,7 +1035,7 @@ print < - + END ; my $count =3D `ip n| wc -l`; @@ -1071,19 +1071,19 @@ print < - + - + - + @@ -1119,28 +1119,28 @@ print < - + - + - + - + - + - + - + @@ -1158,7 +1158,7 @@ print < - + @@ -1218,8 +1218,8 @@ print < - - + + @@ -1782,7 +1782,7 @@ END my $val=3Dsprintf"%.3f",$cgiparams{'txt_cent'}; print""; #Optional note - print""; + print""; print"
$Lang::tr{'advproxy redirector child= ren'}
$Lang::tr{'processes'}
$Lang::tr{'processes'}: 3D'*'$Lang::tr{'advproxy via forwarding'}: $Lang::tr{'advproxy upstream proxy host:po= rt'} 3D'*'$Lang::tr{'advproxy upstream proxy host:po= rt'}:
$Lang::tr{'advproxy client IP forwarding'}: $Lang::tr{'advproxy upstream username'}: 3D'*'$Lang::tr{'advproxy upstream username'}:
$Lang::tr{'advproxy username forwarding'}: $Lang::tr{'advproxy upstream password'}: 3D'*'$Lang::tr{'advproxy upstream password'}:
$Lang::tr{'proxy cachemgr'}: $Lang::tr{'advproxy admin mail'}: 3D'*'$Lang::tr{'advproxy admin mail'}:
$Lang::tr{'proxy filedescriptors'}:$Lang::tr{'proxy filedescriptors'}: 3D'*' $Lang::tr{'proxy admin password'}: 3D'*'$Lang::tr{'proxy admin password'}:
$Lang::tr{'advproxy ram cache size'}:$Lang::tr{'advproxy ram cache size'}: 3D'*' $Lang::tr{'advproxy hdd cache size'}:$Lang::tr{'advproxy hdd cache size'}: 3D'*'
$Lang::tr{'advproxy min size'}:$Lang::tr{'advproxy min size'}: 3D'*' $Lang::tr{'advproxy max size'}:$Lang::tr{'advproxy max size'}: 3D'*'
$Lang::tr{'advproxy no cache sites'}: =3D'*'$Lang::tr{'advproxy no cache sites'}:
$Lang::tr{'advproxy standard ports'}:$Lang::tr{'advproxy ssl ports'}:$Lang::tr{'advproxy standard ports'}: = ;3D'*'$Lang::tr{'advproxy ssl ports'}: 

$Lang::tr{'acct cent'}$settings{'CURRENCY'}
3D'*'=$Lang::tr{'acct optional'}
3D'*'=$Lang::tr{'required field'}


"; print"
"; =20 --===============6999719132087155708==--