1.修复不能添加子节点组的问题

2.修改部分国际化翻译

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 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 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>