From 4544d9586262be771dd1afda851a403555ebdb8b Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Tue, 13 Nov 2018 14:56:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=90=E8=8A=82=E7=82=B9=E7=BB=84=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/i18n/globalMessages_en_US.properties        | 10 +++++-----
 .../nodeGroupManage/nodegroupInfoList.jsp           | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/WebRoot/i18n/globalMessages_en_US.properties b/WebRoot/i18n/globalMessages_en_US.properties
index 4c95949..50937b4 100644
--- a/WebRoot/i18n/globalMessages_en_US.properties
+++ b/WebRoot/i18n/globalMessages_en_US.properties
@@ -1602,7 +1602,7 @@ upi.button.reset=Reset
 #nodeBox directory
 ################################################## #####
 #addBoxInfo.jsp page
-abi.message.title=Add Brand Information
+abi.message.title=Add Cabinet Information
 abi.text.boxUType=Cabinet U Position
 abi.message.ispn=The cabinet number already exists. Please re-enter it!
 abi.message.faild=Abnormal Operation!
@@ -1613,7 +1613,7 @@ abi.text.descinfo= Cabinet Description
 abi.message.ispn1=There is an illegal character in the cabinet number. Please enter it again!
 abi.message.selectDefault=Please Select
 abi.button.back=Back
-abi.text.title=Add Brand
+abi.text.title=Cabinet Details
 abi.text.ispn=Number
 abi.text.U=U&nbsp;bit
 abi.text.des=Description
@@ -1660,7 +1660,7 @@ sie.text.roomColPosition=Room Column number
 sie.text.errorInfo=Error Message
 
 #updateBoxInfo.jsp page
-ubi.message.title=Add Brand Information
+ubi.message.title=Add Cabinet Information
 ubi.text.boxUType=Cabinet U position
 ubi.message.faild=Abnormal Operation!
 ubi.text.ispn=Cabinet Number
@@ -1671,7 +1671,7 @@ ubi.text.roomColPosition=Room Column number
 ubi.message.inputInfo=There is an illegal character in the cabinet number. Please enter it again!
 ubi.message.selectDefault=Please Select
 ubi.button.back=Back
-ubi.text.title=Edit Brand
+ubi.text.title=Cabinet Details
 ubi.text.index=Number
 ubi.text.U=U&nbsp;bit
 ubi.text.desc=Description
@@ -5206,7 +5206,7 @@ xt_mk_jbxx.313.mkmc=Setting Alarms
 xt_mk_jbxx.543.mkms=Add New Plugin
 xt_mk_jbxx.12.mkms=New Fault Library
 xt_mk_jbxx.269.mkmc=Monitoring
-xt_mk_jbxx.299.mkmc=Upline
+xt_mk_jbxx.299.mkmc=Online
 xt_mk_jbxx.545.mkms=Remove Plugin
 xt_mk_jbxx.421.mkmc=Monitoring Alarm Setting
 xt_mk_jbxx.307.mkmc=Enabled
diff --git a/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp b/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
index 63501cd..7e58d70 100644
--- a/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
+++ b/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
@@ -746,13 +746,12 @@
 			<div id="maindiv" style="clear:both;">
 				<table border="0" cellpadding="0" cellspacing="0" class="table" id="info" style="">
 					<tr>
-						<td class="color_8">i18n_nginfo.text.nodeGroup_n81i
-							<span>
-								<label>(</label>
-								<input type="checkbox" id="chkShowStopNGroup" onclick="query()" />
-								<label for="chkShowStopNGroup">i18n_nginfo.text.ShowStopNGroup_n81i</label>
-								<label>)</label>
-							</span>
+						<td class="color_8">
+							<span>i18n_nginfo.text.nodeGroup_n81i</span><br/>
+							<span>(</span>
+							<span><input type="checkbox" id="chkShowStopNGroup" onclick="query()" /></span>
+							<span><label for="chkShowStopNGroup">i18n_nginfo.text.ShowStopNGroup_n81i</label></span>
+							<span>)</span>
 						</td>
 						<td class="color_8">i18n_nginfo.text.nodeGroupInfo_n81i</td>
 					</tr>