some more changes by Florian Ehlig: grouping in "other protocols" section

1 files changed, 88 insertions, 65 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 6322e91..4b77d54 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -1095,8 +1095,8 @@
                         <type>submit</type>
                 </field>
                 <field>
-                        <name>Enable/Disable other protocols</name>
-                        <type>listtopic</type>
+                        <name>Remote Service / Terminalemulation</name>
+			<type>listtopic</type>
                 </field>		
                 <field>
                         <name>MSRDP</name>
@@ -1119,9 +1119,9 @@
 			<typehint>Microsoft Remote Desktop Protocol</typehint>
                 </field>
                 <field>
-                        <name>PPTP</name>
+                        <name>VNC</name>
+			<bindstofield>ezshaper->step6->vnc</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->pptp</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1136,12 +1136,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Microsoft Point to Point tunneling protocol</typehint>
+			<typehint>Virtual Network Computing</typehint>
                 </field>
                 <field>
-                        <name>IPSEC</name>
+                        <name>AppleRemoteDesktop</name>
+			<bindstofield>ezshaper->step6->appleremotedesktop</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->ipsec</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1156,12 +1156,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>IPSEC VPN traffic</typehint>
+			<typehint>Apple Remote Desktop</typehint>
                 </field>
                 <field>
-                        <name>StreamingMP3</name>
+                        <name>PCAnywhere</name>
+			<bindstofield>ezshaper->step6->pcanywhere</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->streamingmp3</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1176,7 +1176,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Streaming Media</typehint>
+			<typehint>Symantec PC Anywhere</typehint>
+                </field>
+                <field>
+                        <name>Messengers</name>
+			<type>listtopic</type>
                 </field>
                 <field>
                         <name>IRC</name>
@@ -1199,9 +1203,9 @@
 			<typehint>Internet Relay Chat</typehint>
                 </field>
                 <field>
-                        <name>DNS</name>
+                        <name>ICQ</name>
+			<bindstofield>ezshaper->step6->icq</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->dns</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1216,12 +1220,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Domain Name Services</typehint>
+			<typehint>ICQ</typehint>
                 </field>
                 <field>
-                        <name>HTTP</name>
+                        <name>MSN</name>
+			<bindstofield>ezshaper->step6->msnmessenger</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->http</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1236,12 +1240,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>HTTP and HTTPS aka Web Traffic</typehint>
+			<typehint>MSN Messenger</typehint>
                 </field>
                 <field>
-                        <name>SMTP</name>
+                <name>Teamspeak</name>
+			<bindstofield>ezshaper->step6->teamspeak</bindstofield>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->smtp</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1256,12 +1260,16 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Mail Protocol</typehint>
+			<typehint>TeamSpeak</typehint>
                 </field>
                 <field>
-                        <name>POP3</name>
+                        <name>VPN</name>
+			<type>listtopic</type>
+                </field>
+                <field>
+                        <name>PPTP</name>
 			<type>select</type>
-			<bindstofield>ezshaper->step6->pop3</bindstofield>
+			<bindstofield>ezshaper->step6->pptp</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1276,12 +1284,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>POP3 Protocol</typehint>
+			<typehint>Microsoft Point to Point tunneling protocol</typehint>
                 </field>
                 <field>
-                        <name>ICMP</name>
-			<bindstofield>ezshaper->step6->icmp</bindstofield>
+                        <name>IPSEC</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->ipsec</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1296,12 +1304,16 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>ICMP Protocol</typehint>
+			<typehint>IPSEC VPN traffic</typehint>
                 </field>
                 <field>
-                        <name>IMAP</name>
-			<bindstofield>ezshaper->step6->imap</bindstofield>
+                        <name>Multimedia/Streaming</name>
+			<type>listtopic</type>
+                </field>
+                <field>
+                        <name>StreamingMP3</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->streamingmp3</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1316,11 +1328,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>IMAP Protocol</typehint>
+			<typehint>Streaming Media</typehint>
                 </field>
                 <field>
-                        <name>SMB</name>
-			<bindstofield>ezshaper->step6->smb</bindstofield>
+                        <name>RTSP</name>
+			<bindstofield>ezshaper->step6->rtsp</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1336,12 +1348,16 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Microsoft SMB Protocol and friends</typehint>
+			<typehint>RealTime streaming protocol</typehint>
                 </field>
                 <field>
-                        <name>RTSP</name>
-			<bindstofield>ezshaper->step6->rtsp</bindstofield>
+                        <name>Web</name>
+			<type>listtopic</type>
+                </field>
+                <field>
+                        <name>HTTP</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->http</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1356,12 +1372,16 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>RealTime streaming protocol</typehint>
+			<typehint>HTTP and HTTPS aka Web Traffic</typehint>
                 </field>
                 <field>
-                        <name>SNMP</name>
-			<bindstofield>ezshaper->step6->snmp</bindstofield>
+                        <name>Mail</name>
+			<type>listtopic</type>
+                </field>
+                <field>
+                        <name>SMTP</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->smtp</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1376,12 +1396,12 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Simple Network Management Protocol</typehint>
+			<typehint>Mail Protocol</typehint>
                 </field>
                 <field>
-                        <name>VNC</name>
-			<bindstofield>ezshaper->step6->vnc</bindstofield>
+                        <name>POP3</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->pop3</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1396,11 +1416,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Virtual Network Computing</typehint>
-                </field>			
+			<typehint>POP3 Protocol</typehint>
+                </field>
                 <field>
-                        <name>AppleRemoteDesktop</name>
-			<bindstofield>ezshaper->step6->appleremotedesktop</bindstofield>
+                        <name>IMAP</name>
+			<bindstofield>ezshaper->step6->imap</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1416,11 +1436,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Apple Remote Desktop</typehint>
+			<typehint>IMAP Protocol</typehint>
                 </field>
                 <field>
-                        <name>ICQ</name>
-			<bindstofield>ezshaper->step6->icq</bindstofield>
+                        <name>LotusNotes</name>
+			<bindstofield>ezshaper->step6->lotusnotes</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1436,12 +1456,16 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>ICQ</typehint>
+			<typehint>Lotus Notes</typehint>
                 </field>
                 <field>
-                        <name>LotusNotes</name>
-			<bindstofield>ezshaper->step6->lotusnotes</bindstofield>
+                        <name>Miscellaneous</name>
+			<type>listtopic</type>
+                </field>
+                               <field>
+                        <name>DNS</name>
 			<type>select</type>
+			<bindstofield>ezshaper->step6->dns</bindstofield>
 			<options>
 				<option>
 					<name>Higher priority</name>
@@ -1456,11 +1480,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Lotus Notes</typehint>
+			<typehint>Domain Name Services</typehint>
                 </field>
                 <field>
-                        <name>MSN</name>
-			<bindstofield>ezshaper->step6->msnmessenger</bindstofield>
+                        <name>ICMP</name>
+			<bindstofield>ezshaper->step6->icmp</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1476,11 +1500,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>MSN Messenger</typehint>
+			<typehint>ICMP Protocol</typehint>
                 </field>
                 <field>
-                        <name>MySQLServer</name>
-			<bindstofield>ezshaper->step6->mysqlserver</bindstofield>
+                        <name>SMB</name>
+			<bindstofield>ezshaper->step6->smb</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1496,11 +1520,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>MySQL Server</typehint>
+			<typehint>Microsoft SMB Protocol and friends</typehint>
                 </field>
                 <field>
-                        <name>PCAnywhere</name>
-			<bindstofield>ezshaper->step6->pcanywhere</bindstofield>
+                        <name>SNMP</name>
+			<bindstofield>ezshaper->step6->snmp</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1516,11 +1540,11 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>Symantec PC Anywhere</typehint>
-                </field>
+			<typehint>Simple Network Management Protocol</typehint>
+                </field> 
                 <field>
-                        <name>Teamspeak</name>
-			<bindstofield>ezshaper->step6->teamspeak</bindstofield>
+                        <name>MySQLServer</name>
+			<bindstofield>ezshaper->step6->mysqlserver</bindstofield>
 			<type>select</type>
 			<options>
 				<option>
@@ -1536,9 +1560,8 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>TeamSpeak</typehint>
+			<typehint>MySQL Server</typehint>
                 </field>
-                
                 <field>
                         <name>Next</name>
                         <type>submit</type>