From b67e70b7ff551fa6d6fb27c3f1c63105749af204 Mon Sep 17 00:00:00 2001 From: KIDJourney Date: Tue, 19 Jul 2016 21:22:43 +0800 Subject: [PATCH 1/6] translate some --- index.html | 2 +- pages/acl.html | 52 ++++++++++++++++++++-------------------- pages/firewall.html | 35 +++++++++++++-------------- pages/flowPusher.html | 28 +++++++++++----------- pages/hosts.html | 10 ++++---- pages/index.html | 56 +++++++++++++++++++++---------------------- 6 files changed, 91 insertions(+), 92 deletions(-) diff --git a/index.html b/index.html index 6577b08..0e45219 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,6 @@ - Go to Enter The Application + Go to 正在进入应用 diff --git a/pages/acl.html b/pages/acl.html index 194d82e..e4c5613 100644 --- a/pages/acl.html +++ b/pages/acl.html @@ -6,7 +6,7 @@ - Floodlight OpenFlow Controller - Access Control List + ACL控制 @@ -43,7 +43,7 @@ - Floodlight OpenFlow Controller + SDN控制器
...
-
Subnet Mask 子网掩码 Change
+ data-target="#subnet-modal">变更
@@ -112,27 +112,27 @@

Firewall

aria-label="Close"> - +
- - + +
@@ -147,7 +147,7 @@ aria-label="Close"> - +
@@ -160,8 +160,8 @@
- - + +
@@ -169,8 +169,7 @@
- Add New - Rule + 添加新规则


@@ -180,7 +179,7 @@
- Firewall Rules Table + 防火墙规则列表
diff --git a/pages/flowPusher.html b/pages/flowPusher.html index 6cf1735..1f52295 100644 --- a/pages/flowPusher.html +++ b/pages/flowPusher.html @@ -6,7 +6,7 @@ - Floodlight OpenFlow Controller - Static Flow Pusher + 流表 @@ -43,7 +43,7 @@ - Floodlight OpenFlow Controller + SDN控制器
...
-
Controller Role 控制器规则 Change
+ data-target=".bs-example-modal-sm">修改
@@ -130,13 +130,13 @@

Controller

0
-
Switches
+
交换机
- See All + 查看所有
@@ -152,13 +152,13 @@

Controller

0
-
Hosts
+
主机
- See All + 查看所有
@@ -174,13 +174,13 @@

Controller

0
-
Connections (Links)
+
连接
- See All + 查看所有
@@ -196,13 +196,13 @@

Controller

0
-
Reserved Ports
+
接收端口
- See All + 查看所有
@@ -216,7 +216,7 @@

Controller

- JVM Memory Bloat + JVM内存使用情况
@@ -239,13 +239,13 @@

Controller

- Consumption Detail + 内存使用细节
- Total: + 总计:
@@ -253,7 +253,7 @@

Controller

 - Used: + 已使用:
@@ -261,7 +261,7 @@

Controller

 - Free: + 空闲:
@@ -279,7 +279,7 @@

Controller

- Storage Tables + 存储数据库
@@ -295,7 +295,7 @@

Controller

- Modules Loaded + 已加载的模块
@@ -310,7 +310,7 @@

Controller

- All Modules + 所有模块
@@ -330,27 +330,27 @@

Controller

aria-label="Close"> - +
- - + +
From 66e90c6b8cf6a8029a27d892e52ac176c1da5798 Mon Sep 17 00:00:00 2001 From: KIDJourney Date: Thu, 21 Jul 2016 22:22:20 +0800 Subject: [PATCH 2/6] The atrribute of hosts have changed in new version of floodlight , fix the attribute --- pages/topology.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/topology.html b/pages/topology.html index e8bfcb9..08e2658 100644 --- a/pages/topology.html +++ b/pages/topology.html @@ -217,7 +217,7 @@ if (hosts[i].hasOwnProperty("trueAttachmentPoint") && hosts[i]["trueAttachmentPoint"][0] != null) { edges.push({ from: "h" + hosts[i]["mac"] - , to: "s" + hosts[i]["trueAttachmentPoint"][0].switchDPID, length: EDGE_LENGTH_MAIN, + , to: "s" + hosts[i]["trueAttachmentPoint"][0].switch, length: EDGE_LENGTH_MAIN, title: hosts[i]["trueAttachmentPoint"][0].switchDPID + "/" + hosts[i]["trueAttachmentPoint"][0].port, color: 'green', width: 2 @@ -226,8 +226,8 @@ else { edges.push({ from: "h" + hosts[i]["mac"] - , to: "s" + hosts[i]["attachmentPoint"][0].switchDPID, length: EDGE_LENGTH_MAIN, - title: hosts[i]["attachmentPoint"][0].switchDPID + "/" + hosts[i]["attachmentPoint"][0].port, + , to: "s" + hosts[i]["attachmentPoint"][0].switch, length: EDGE_LENGTH_MAIN, + title: hosts[i]["attachmentPoint"][0].switch + "/" + hosts[i]["attachmentPoint"][0].port, color: 'green', width: 2 }); From 7e4ba9432d44f056f039be617ac339ae6e254abb Mon Sep 17 00:00:00 2001 From: KIDJourney Date: Thu, 21 Jul 2016 22:59:49 +0800 Subject: [PATCH 3/6] translate and fix --- js/navbar.js | 20 +++---- pages/links.html | 32 +++++------ pages/loginmodal.html | 8 +-- pages/statistics.html | 8 +-- pages/switchDetail.html | 116 ++++++++++++++++++++-------------------- pages/switches.html | 16 +++--- pages/topology.html | 8 +-- 7 files changed, 104 insertions(+), 104 deletions(-) diff --git a/js/navbar.js b/js/navbar.js index b58cfc5..823cbc4 100644 --- a/js/navbar.js +++ b/js/navbar.js @@ -3,16 +3,16 @@ */ document.getElementById("navMenu").innerHTML = ''; var ipaddress = $.cookie('cip'); @@ -20,4 +20,4 @@ if (ipaddress == null || ipaddress == "") window.location.href = "login.html"; var restport = $.cookie('cport'); if (restport == null || restport == "") window.location.href = "login.html"; -document.getElementById("home-button-title").innerHTML = "Floodlight OpenFlow Controller - " + ipaddress + ":" + restport; +document.getElementById("home-button-title").innerHTML = "Floodlight控制器 - " + ipaddress + ":" + restport; diff --git a/pages/links.html b/pages/links.html index f6faff5..996b187 100644 --- a/pages/links.html +++ b/pages/links.html @@ -9,7 +9,7 @@ - Floodlight OpenFlow Controller - Links + 链路 @@ -67,7 +67,7 @@
-

Links

+

链路

@@ -76,7 +76,7 @@

Links

- Internal Links + 内部链路
@@ -84,13 +84,13 @@

Links

- - - - - + + + + + - + @@ -111,7 +111,7 @@

Links

- External Links + 外部链路
@@ -119,13 +119,13 @@

Links

- - - - - + + + + + - + diff --git a/pages/loginmodal.html b/pages/loginmodal.html index f354d4f..e99678e 100644 --- a/pages/loginmodal.html +++ b/pages/loginmodal.html @@ -46,20 +46,20 @@
-

Please Enter The Controller's Ip Address and Port

+

请输入控制器REST API IP与端口

- +
- +
+ id="start-button">启动
diff --git a/pages/statistics.html b/pages/statistics.html index 195df52..8fb3e89 100644 --- a/pages/statistics.html +++ b/pages/statistics.html @@ -9,7 +9,7 @@ - Floodlight OpenFlow Controller - Statistics + @@ -90,16 +90,16 @@

Statistics

- + diff --git a/pages/switchDetail.html b/pages/switchDetail.html index 840192b..e3a590a 100644 --- a/pages/switchDetail.html +++ b/pages/switchDetail.html @@ -6,7 +6,7 @@ - SB Admin 2 - Bootstrap Admin Theme + 交换机详情 @@ -57,7 +57,7 @@
-

Switch Detail

+

交换机详情

@@ -67,7 +67,7 @@

Switch Detail

- Switch Detail + 交换机详情
@@ -80,27 +80,27 @@

Switch Detail

 - + - + - + - + - + - + @@ -115,22 +115,22 @@

Switch Detail

- Flow Summary + 流总计
- + - + - + @@ -138,11 +138,11 @@

Switch Detail

- + - + @@ -157,7 +157,7 @@

Switch Detail

- Role Info + 角色信息
@@ -165,22 +165,22 @@

Switch Detail

- +
@@ -195,7 +195,7 @@

Switch Detail

- Port Table + 端口表
@@ -204,15 +204,15 @@

Switch Detail

id="portTable">
- - - - - - - - - + + + + + + + + + @@ -242,7 +242,7 @@

Switch Detail

- Flow Table + 流表
@@ -250,15 +250,15 @@

Switch Detail

id="flowTable">
- - + + - - - - + + + + - +
Flow Count 流数量 :
Packet Count数据包数量 :
Byte大小(Byte) :
:
Buffer缓存 :
Table Count流表数量 :
NoR. PacketsTran. PacketsR. BytesTran. BytesR. DroppedTran. DroppedColl.Duration(s)编号收到的数据包传输的数据包收到的Bytes数传输的Bytes数丢弃的数据包传输被丢去的数据包统计量持续时间
Table NoPkt.Count表编号包数 ByteDuration(s)PriorityIdleTimeoutSecHardTimeoutSec持续时间优先级软超时硬超时 FlagsInstructions动作
@@ -278,7 +278,7 @@

Switch Detail

- Tables + 表
@@ -286,10 +286,10 @@

Switch Detail

id="switchTables"> - tableId - activeCount - lookUpCount - matchCount + 表号 + 激活量 + 查找量 + 匹配量 @@ -303,45 +303,45 @@

Switch Detail

- Groups + 组
- + - + - + - + - + - + - + - + - +
capabilities容量 :
maxGroupsAll最大组 :
maxGroupsSelect最大选择组 :
maxGroupsIndirect最大中间组 :
maxGroupsFf最大组F :
actionsAll所有动作 :
actionsSelect选择的动作 :
actionsIndirect间接动作 :
actionsFf动作Ff :
@@ -363,17 +363,17 @@

Switch Detail

aria-label="Close"> - +
- - - - + + + +
PortUpdated OnBps (RX)Bps (TX)端口更新时间速率（接受）速率 (发送)
diff --git a/pages/switches.html b/pages/switches.html index 2111365..ea47dd0 100644 --- a/pages/switches.html +++ b/pages/switches.html @@ -6,7 +6,7 @@ - Floodlight OpenFlow Controller - Switches + 交换机 @@ -38,7 +38,7 @@ - Floodlight OpenFlow Controller + SDN控制器
@@ -53,7 +53,7 @@
-

Switches

+

交换机

@@ -62,7 +62,7 @@

Switches

- Switches Connected + 连接的交换机
@@ -71,9 +71,9 @@

Switches

width="100%"> - Switch ID - IPv4 Address - Connected Since + 交换机IP + IPv4 地址 + 连接时间 @@ -93,7 +93,7 @@

Switches

- Switch Roles + 交换机规则
diff --git a/pages/topology.html b/pages/topology.html index e8bfcb9..bcbd40b 100644 --- a/pages/topology.html +++ b/pages/topology.html @@ -9,7 +9,7 @@ - Floodlight OpenFlow Controller - Topology + 拓扑 @@ -217,7 +217,7 @@ if (hosts[i].hasOwnProperty("trueAttachmentPoint") && hosts[i]["trueAttachmentPoint"][0] != null) { edges.push({ from: "h" + hosts[i]["mac"] - , to: "s" + hosts[i]["trueAttachmentPoint"][0].switchDPID, length: EDGE_LENGTH_MAIN, + , to: "s" + hosts[i]["trueAttachmentPoint"][0].switch, length: EDGE_LENGTH_MAIN, title: hosts[i]["trueAttachmentPoint"][0].switchDPID + "/" + hosts[i]["trueAttachmentPoint"][0].port, color: 'green', width: 2 @@ -226,8 +226,8 @@ else { edges.push({ from: "h" + hosts[i]["mac"] - , to: "s" + hosts[i]["attachmentPoint"][0].switchDPID, length: EDGE_LENGTH_MAIN, - title: hosts[i]["attachmentPoint"][0].switchDPID + "/" + hosts[i]["attachmentPoint"][0].port, + , to: "s" + hosts[i]["attachmentPoint"][0].switch, length: EDGE_LENGTH_MAIN, + title: hosts[i]["attachmentPoint"][0].switch + "/" + hosts[i]["attachmentPoint"][0].port, color: 'green', width: 2 }); From 01478a4ebd34beab7ccdb618a66ce187e44a8dab Mon Sep 17 00:00:00 2001 From: KIDJourney Date: Thu, 21 Jul 2016 23:06:41 +0800 Subject: [PATCH 4/6] update readme --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 38a9a45..bd465b2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ +#Floodlight Controller webui - ZH + + Translate and fix bugs caused by Floodlight API modification. + + + The Above is origin README. + + + + #Email cbarrin@g.clemson.edu for bug reports and help. # floodlight-WebUI From fde5f696628f336192a6886ae248fa68a2397b22 Mon Sep 17 00:00:00 2001 From: KIDJourney Date: Sat, 23 Jul 2016 01:03:14 +0800 Subject: [PATCH 5/6] fix and modify --- pages/acl.html | 31 ++++----- pages/firewall.html | 48 ++++++------- pages/hosts.html | 12 ++-- pages/index.html | 12 ++-- pages/switchDetail.html | 146 ++++++++++++++++++++-------------------- pages/switches.html | 2 +- 6 files changed, 125 insertions(+), 126 deletions(-) diff --git a/pages/acl.html b/pages/acl.html index e4c5613..4e0da0c 100644 --- a/pages/acl.html +++ b/pages/acl.html @@ -89,16 +89,16 @@

ACL

ID - Source - Dest - Source IP - Mask - Dest IP - Mask - Prot. - Dest TP - Act. - Delete + 源 + 目的 + 源 IP + 掩码 + 目的 IP + 掩码 + 端口. + 目的 TP + 动作. + 是否删除 @@ -204,6 +204,7 @@