Merge pull request #66 from atellwu/abtest3

优化管理端的界面；sendheartbeat在批量update多个run的状态时，触发了多次，改为1次

cat-home/src/main/java/com/dianping/cat/system/page/abtest/Handler.java

@@ -173,7 +173,6 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 						}
 					}
 
-					abTestEntityServer.sendHeartbeat();
 				} catch (NumberFormatException e) {
 					// do nothing
 					Cat.logError(e);
@@ -181,6 +180,8 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 					Cat.logError(e);
 				}
 			}
+			
+			abTestEntityServer.sendHeartbeat();
 
 			if (error.getArguments().isEmpty()) {
 				ErrorObject success = new ErrorObject("success");

cat-home/src/main/webapp/js/abtestAllTest.js

@@ -3,7 +3,6 @@ $(document)
 				function() {
 					$('#ckall').click(
 							function() {
-								console.log("ddd");
 								if ($('#ckall').is(':checked')) {
 									$(".table input[type='checkbox']").prop(
 											'checked', true);
@@ -51,6 +50,9 @@ $(document)
 													.substring(0, index)
 													+ "&suspend=1&ids=" + id;
 										} else {
+											if (url.indexOf("?") == -1) {
+												url = url + '?';
+											}
 											window.location.href = url
 													+ "&suspend=1&ids=" + id;
 										}

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

@@ -7,10 +7,11 @@
 <jsp:useBean id="payload" type="com.dianping.cat.system.page.abtest.Payload" scope="request" />
 <jsp:useBean id="model" type="com.dianping.cat.system.page.abtest.Model" scope="request" />
 <style>
-#content{
-    width:1200px;
-    margin:0 auto;
+#content {
+	width: 1200px;
+	margin: 0 auto;
 }
+
 div.controls input {
 	height: 30px;
 }
@@ -77,6 +78,17 @@ div.controls input {
             <h5>Basic Information</h5>
             <hr style="margin-top: 20px;">
             <input type="hidden" name="id" value="${model.abtest.id}"> <input type="hidden" name="op" value="detail">
+            <c:if test="${model.abtest.caseId != null}">
+               <div class="control-group">
+                  <label class="control-label">Case Id <i tips="" data-trigger="hover" class="icon-question-sign"
+                     data-toggle="popover" data-placement="top" data-original-title="tips"
+                     data-content="It's important, because your client's code should use this 'Case Id' to specify a ABTest Case"></i>
+                  </label>
+                  <div class="controls" style="margin-top:4px;">
+                     <strong style="font-size:16px">${model.abtest.caseId}</strong>
+                  </div>
+               </div>
+            </c:if>
             <div class="control-group">
                <label class="control-label">AB Test Name <i tips="" data-trigger="hover" class="icon-question-sign"
                   data-toggle="popover" data-placement="top" data-original-title="tips"
@@ -214,7 +226,7 @@ div.controls input {
 					//input
 					$('#form input').removeAttr("readonly");
 					$('#txtStrategyConfig').removeAttr("readonly");
-					$('#inputName').attr("readonly","readonly");
+					$('#inputName').attr("readonly", "readonly");
 					//$('#form select').removeAttr("disabled");
 					$("#domains").select2("enable");
 					$("#datetimepicker1>span").removeClass('hide');
@@ -229,7 +241,7 @@ div.controls input {
 					if (changed) {
 						$("#cancleAffirmModal").modal('show');
 					} else {
-						$('#form input').attr("readonly","readonly");
+						$('#form input').attr("readonly", "readonly");
 						$('#form select').attr("disabled", "disabled");
 						$("#domains").select2("disable");
 						$("#datetimepicker1>span").addClass('hide');

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

@@ -47,4 +47,11 @@
 			</ul>
 		</div>
 	</div>
+   
+    <div style="width:600px;margin: 0 auto;">
+        <h3 style="color:#1D8BE0;"> Report function is under construction...</h3>
+       <img style="margin: 0 auto;" src="${res.img.local['wangzhanjianshezhong.jpg']}">
+    </div>
+   
+   
 </a:body>
\ No newline at end of file