modify alarm jsp

cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp

@@ -36,7 +36,7 @@
 			<thead>
 				<tr class="odd">
 					<th>项目名</th>
-					<th>操作&nbsp;&nbsp;<a class="btn btn-primary btn-small" href="?op=alarmRuleAdd&type=exception" target="_blank">新增</a></th>
+					<th>操作&nbsp;&nbsp;<a class="btn btn-primary btn-small" href="?op=alarmRuleAdd&type=exception">新增</a></th>
 				</tr></thead><tbody>
 				<c:forEach var="item" items="${model.userSubStates}"
 					varStatus="status">
@@ -50,7 +50,7 @@
 									<a class="btn btn-danger btn-small" href="?op=exceptionAlarmRuleSub&alarmRuleId=${item.alarmRule.id}&subState=1" onclick="return sub(this)">取消</a>
 								</c:otherwise>
 							</c:choose> 
-							<a class="btn btn-primary btn-small" href="?op=alarmRuleUpdate&alarmRuleId=${item.alarmRule.id}"  target="_blank">编辑</a> 
+							<a class="btn btn-primary btn-small" href="?op=alarmRuleUpdate&alarmRuleId=${item.alarmRule.id}&type=exception">编辑</a> 
 							<a class="btn btn-danger btn-small" href="?op=exceptionAlarmRuleDelete&alarmRuleId=${item.alarmRule.id}">删除</a> 
 						</td>
 					</tr>

cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp

@@ -36,22 +36,22 @@
 		</div>
 		<div class="span10">
 			</br>
-			<table border="1" rules="all">
+			<table  class="alarm table table-striped table-bordered  table-condensed"  border="1" rules="all">
 				<tr>
-					<td>&nbsp;&nbsp;收件人</td>
+					<th>&nbsp;&nbsp;收件人</th>
 					<td>${model.mailRecord.receivers}</td>
 				</tr>
 				<tr>
-					<td>发送时间</td>
+					<th>发送时间</th>
 					<td>${w:format(model.mailRecord.creationDate,'yyyy-MM-dd
 						HH:mm:ss')}</td>
 				</tr>
 				<tr>
-					<td>邮件标题</td>
+					<th>邮件标题</th>
 					<td>${model.mailRecord.title}</td>
 				</tr>
 				<tr>
-					<td>邮件内容</td>
+					<th>邮件内容</th>
 					<td><div>${model.mailRecord.content}</div></td>
 				</tr>
 			</table>

cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp

@@ -13,7 +13,20 @@
 <res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 
+	<script type="text/javascript">
+		$(document).ready(function() {
+			var id = '${payload.type}';
+			if(id=='exception'){
+				$('#exceptionAlarmRules').addClass("active");
+			}else{
+				$('#serviceAlarmRules').addClass("active");
+			}
+		});
+	</script>
 	<div class="row-fluid">
+		<div class="span2">
+		<%@include file="./alarm.jsp"%>
+		</div>
 		<div class="span6">
 			<form name="alarmModify" id="form" method="post"
 				action="${model.pageUri}?op=alarmRuleUpdateSubmit">
@@ -40,7 +53,7 @@
 				</table>
 			</form>
 		</div>
-		<div class="span6">
+		<div class="span4">
 			<h3 class='text-error text-error'>样本内容(可以copy右侧内容修改简单参数即可)</h3>
 			<xmp>${model.alarmTemplate.content}</xmp>
 			<h3 class='text-error'>说明事项</h3>

cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp

@@ -13,7 +13,22 @@
 <res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 
+	<script type="text/javascript">
+		$(document).ready(function() {
+			var id = '${payload.type}';
+			if(id=='exception'){
+				$('#exceptionAlarmRules').addClass("active");
+			}else{
+				$('#serviceAlarmRules').addClass("active");
+			}
+		});
+	</script>
+	
+	<div class="container-fluid">
 	<div class="row-fluid">
+        <div class="span2">
+		<%@include file="./alarm.jsp"%>
+		</div>
 		<div class="span6">
 			<form name="alarmModify" id="form" method="post"
 				action="${model.pageUri}?op=alarmRuleUpdateSubmit">
@@ -37,7 +52,7 @@
 				</table>
 			</form>
 		</div>
-		<div class="span6">
+		<div class="span4">
 			<h3 class='text-error text-error'>样本内容(可以copy右侧内容修改简单参数即可)</h3>
 			<xmp>${model.alarmTemplate.content}</xmp>
 			<h3 class='text-error'>说明事项</h3>
@@ -72,5 +87,5 @@
 				interval="3" alarm-interval="120" alarm="SMS" /></xmp>
 			<p class="text-warning">duration2表示在一定的3分钟时间内错误出现在250到2500000之间之间，会发SMS告警，在120分钟内只会告警一次。（目前SMS不启作用，仍然会用邮件，邮件标题有SMS)</p>
 		</div>
-	</div>
+	</div></div>
 </a:body>

cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp

@@ -37,7 +37,7 @@
 				<thead>
 				<tr class="odd">
 					<td>项目名</td>
-					<td>操作&nbsp;&nbsp; <a class="btn btn-primary btn-small" href="?op=alarmRuleAdd&type=service" target="_blank">新增</a></td>
+					<td>操作&nbsp;&nbsp; <a class="btn btn-primary btn-small" href="?op=alarmRuleAdd&type=service">新增</a></td>
 				</tr></thead><tbody>
 				<c:forEach var="item" items="${model.userSubStates}"
 					varStatus="status">
@@ -51,7 +51,7 @@
 									<a  class="btn btn-danger btn-small" href="?op=serviceAlarmRuleSub&alarmRuleId=${item.alarmRule.id}&subState=1" onclick="return sub(this)">取消</a>
 								</c:otherwise>
 							</c:choose> 
-							<a  class="btn btn-primary btn-small" href="?op=alarmRuleUpdate&alarmRuleId=${item.alarmRule.id}"  target="_blank">编辑</a> 
+							<a  class="btn btn-primary btn-small" href="?op=alarmRuleUpdate&alarmRuleId=${item.alarmRule.id}&type=service">编辑</a> 
 							<a  class="btn btn-danger btn-small" href="?op=serviceAlarmRuleDelete&alarmRuleId=${item.alarmRule.id}">删除</a> 
 						</td>
 					</tr>