optimize chart page

710leo · 710leo · commit 1f2f1641b51a · 2016-08-19T22:52:49.000+08:00
diff --git a/handler/domain_handler.go b/handler/domain_handler.go
@@ -48,6 +48,7 @@ func UrlStatus(w http.ResponseWriter, r *http.Request) {
 	strategy, err := model.GetStrategyById(sid)
 	errors.MaybePanic(err)
 
+	render.Data(r, "AlarmOn", g.Config.Alarm.Enable)
 	render.Data(r, "TimeData", timeData)
 	render.Data(r, "Id", sid)
 	render.Data(r, "Url", strategy.Url)
diff --git a/static/css/g.css b/static/css/g.css
@@ -45,6 +45,11 @@
 	padding-bottom:15px;
 }
 
+#alarm_title{
+	text-align:center;
+	margin-top: 20px;
+}
+
 .col-sm-2 {
 	padding-right:0px;
 	padding-left:0px;
diff --git a/utils/utils.go b/utils/utils.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"log"
 	"regexp"
 	"strings"
 	"time"
diff --git a/views/chart/index.html b/views/chart/index.html
@@ -8,8 +8,9 @@
 
     <body>
     <div id="main"></div>
-
+    {{ if .AlarmOn }}
     <div id="event">
+    <div id="alarm_title">告警历史</div>
     <table class="table table-hover table-bordered table-striped">
             <thead>
             <tr>
@@ -34,7 +35,9 @@
                 {{end}}
             </tbody>
         </table>
+
        </div>
+       {{ end }}
 
 
     <script type="text/javascript">
