UPnP IGD: Improve wording and UI

Close #452

src/router/kromo/dd-wrt/UPnP.asp

@@ -49,30 +49,31 @@ function setUPnPTable(forwards) {
 	}
 	for(var i = 0; i < data.length; i++) {
 		var row = table.insertRow(-1);
+		row.style.height = "15px";
+		row.className = (data[i].enabled ? '' : 'disabled');
 		//IP
 		var cell = row.insertCell(-1);
 		cell.innerHTML = data[i].lanIP;
-		cell.align="right";
-
-		//wan port
-		var cell = row.insertCell(-1);
-		cell.innerHTML = data[i].wanPorts;
-		cell.align="right";
+		cell.align="left";
 
 		//lan port
 		var cell = row.insertCell(-1);
 		cell.innerHTML = data[i].lanPorts;
-		cell.align="right";
+		cell.align="left";
+
+		//wan port
+		var cell = row.insertCell(-1);
+		cell.innerHTML = data[i].wanPorts;
+		cell.align="left";
 
 		//proto
 		var cell = row.insertCell(-1);
 		cell.innerHTML = data[i].proto;
-		cell.align = "center";
+		cell.align = "left";
 
-		row.style.height = "15px";
-		row.className = (data[i].enabled ? '' : 'disabled');
 		//descr
-		row.insertCell(-1).innerHTML = data[i].desc;
+		var cell = row.insertCell(-1);
+		cell.innerHTML = data[i].desc;
 
 		cell = row.insertCell(-1);
 		cell.title = upnp.msg1;
@@ -84,7 +85,7 @@ function setUPnPTable(forwards) {
 function deleteForward(x) {
 	if (x != 'all') {
 		var e = data[x];
-		if (!confirm(share.del + " " + e.desc + "? [" + e.wanPorts + "->" + e.lanPorts + " " + e.lanIP + " " + e.proto + "]")) return;
+		if (!confirm(share.del + " " + e.lanIP + ":" + e.lanPorts + "/" + e.proto + " (" + e.desc + ")?")) return;
 	}
 	else {
 		if (!confirm(upnp.msg2)) return;
@@ -157,9 +158,9 @@ addEvent(window, "unload", function() {
 								<table class="table" cellspacing="6" id="upnp_table" summary="UPnP table">
 									<tbody>
 									<tr>
-										<th><% tran("share.ip"); %></th>
-										<th><% tran("share.from2"); %>&nbsp;(WAN)</th>
-										<th><% tran("share.to2"); %>&nbsp;(LAN)</th>
+										<th width="30%"><% tran("share.ip"); %></th>
+										<th><% tran("share.port"); %></th>
+										<th><% tran("pforward.from"); %></th>
 										<th><% tran("share.proto"); %></th>
 										<th width="30%"><% tran("share.descr"); %></th>
 										<th width="10%" class="center"><% tran("share.del"); %></th>
@@ -181,11 +182,6 @@ addEvent(window, "unload", function() {
 									<input class="spaceradio" type="radio" name="upnp_enable" value="1" <% nvc("upnp_enable","1"); %> onclick="setUPnP(this.value)" /><% tran("share.enable"); %>&nbsp;
 									<input class="spaceradio" type="radio" name="upnp_enable" value="0" <% nvc("upnp_enable","0"); %> onclick="setUPnP(this.value)" /><% tran("share.disable"); %>
 								</div>
-								<div class="setting">
-									<div class="label"><% tran("upnp.clear"); %></div>
-									<input class="spaceradio" type="radio" name="upnpcas" value="1" <% nvc("upnpcas","1"); %> /><% tran("share.enable"); %>&nbsp;
-									<input class="spaceradio" type="radio" name="upnpcas" value="0" <% nvc("upnpcas","0"); %> /><% tran("share.disable"); %>
-								</div>
 							</fieldset><br />
 							<div id="footer" class="submitFooter">
 								<script type="text/javascript">

src/router/kromo/dd-wrt/help/HUPnP.asp

@@ -12,8 +12,6 @@
 				<% tran("hupnp.page2"); %>
 				<dt><% tran("upnp.serv"); %></dt>
 				<% tran("hupnp.page3"); %>
-				<dt><% tran("upnp.clear"); %></dt>
-				<% tran("hupnp.page4"); %>
 			</dl>
 		</div>
 		<div class="also">

src/router/kromo/dd-wrt/help_jp/HUPnP.asp

@@ -15,17 +15,6 @@
 				<dt><% tran("upnp.serv"); %></dt>
 				<dd>UPnP機能を有効にします。</dd>
 
-				<dt><% tran("upnp.clear"); %></dt>
-				<dd>起動時にUPnPによって登録された全てのルールを消去します。</dd>
-
-				<dt><% tran("upnp.url"); %></dt>
-				<dd>この機器を示すURLを登録することができます。ここで登録したURLは、WindowsクライアントPCの「マイネットワーク」に表示されます<br/><br/>
-					<div class="note">
-						<h4>メモ</h4>
-						<div>この設定を変更した時は、機器を再起動する必要があります</div>
-					</div>
-				</dd>
-
 				<dd>設定値を保存する場合は「設定」ボタンをクリックしてください。設定内容を破棄する場合は「キャンセル」ボタンをクリックしてください。</dd>
 			</dl>
 		</div>

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -520,7 +520,7 @@ bmenu.applicationsprforwarding="Port Range Forwarding";
 bmenu.applicationspforwarding="Port Forwarding";
 bmenu.applicationsipforwarding="IP Forwarding (1:1 NAT)";
 bmenu.applicationsptriggering="Port Triggering";
-bmenu.applicationsUpnp="UPnP";
+bmenu.applicationsUpnp="UPnP IGD";
 bmenu.applicationsDMZ="DMZ";
 bmenu.applicationsQoS="QoS";
 bmenu.applicationsP2P="P2P";
@@ -2571,25 +2571,25 @@ hupgrad.page1="<dd>New firmware versions are posted at <a href=\"https:\/\/dd-wr
 
 // ** UPnP.asp **//
 var upnp=new Object();
-upnp.titl="UPnP";
-upnp.h2="Universal Plug and Play (UPnP)";
-upnp.legend="Forwards";
-upnp.legend2="UPnP Configuration";
-upnp.serv="UPnP Service";
+upnp.titl="UPnP IGD";
+upnp.h2="UPnP IGD Service";
+upnp.legend="Active Port Forwards";
+upnp.legend2="UPnP IGD Service Setup";
+upnp.serv="UPnP IGD Service";
 upnp.clear="Clear Port Forwards at Startup";
 upnp.url="Send presentation URL";
-upnp.msg1="Click to delete entry";
-upnp.msg2="Delete all entries?";
+upnp.msg1="Click to delete port forward";
+upnp.msg2="Delete all port forwards?";
 
 //help container
 var hupnp=new Object();
-hupnp.right2="Click the remove icon to delete an individual entry.<br /> Click the <em>" + sbutton.delall + "</em> button to remove all entries.";
-hupnp.right4="Allows applications to automatically configure port forwarding.";
+hupnp.right2="List of ports opened by clients.";
+hupnp.right4='Allows clients to autonomously configure port forwards using the <abbr title="UPnP Internet Gateway Device (Control Protocol)">UPnP IGD</abbr> protocol.';
 
 //help page
-hupnp.page1="<dd>Also known as UPnP it is a set of network protocols used for the automatic configuration of devices. The goals of UPnP are to allow devices to connect seamlessly and to simplify the implementation of home or corporate environment networks. UPnP achieves this by defining and publishing device control protocols built upon open, Internet-based communication standards.</dd>";
-hupnp.page2="<dd>The UPnP forwards table shows all open ports forwarded automatically by the UPnP process. You can delete forwards by clicking <i>remove icon</i> or the <em>" + sbutton.delall + "</em> button to clear the undesired entries.</dd>";
-hupnp.page3="<dd>Allows applications to automatically setup port forwarding rules.</dd>";
+hupnp.page1='<dd>The <a href="https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol" target="_blank" rel="noreferrer"><abbr title="UPnP Internet Gateway Device (Control Protocol)">UPnP IGD</abbr></a> protocol allow clients on the local network to configure port forwards on the router autonomously.</dd>';
+hupnp.page2="<dd>List of ports opened by clients.</dd>";
+hupnp.page3="<dd>Allows clients to autonomously configure port forwards.</dd>";
 hupnp.page4="<dd>If enabled, all UPnP port forwarding rules are deleted when the router starts up.</dd>";
 hupnp.page5="<dd>If enabled, a presentation URL tag is sent with the device description. This allows the router to show up in <em>Windows's My Network Places</em>.<br /><br />div class=\"note\"><h4>Note:</h4><div>When enabling this option you may need to reboot your computer.</div></div></dd><dd>Click the <em>" + sbutton.save + "</em> button to save your settings. Click the <em>" + sbutton.cancel + "</em> button to cancel your unsaved changes.</dd>";