refine html page and display callback payload in template page

rrd/templates/portal/group/templates.html

@@ -27,11 +27,10 @@
             {% for v in ts %}
                 <tr>
                     <td>
-                        <a target="_blank" href="/portal/template/view/{{ v.id }}">{{ v.tpl_name }}</a>
+                        <a href="/portal/template/view/{{ v.id }}">{{ v.tpl_name }}</a>
                     </td>
                     <td>
-                        <a target="_blank"
-                           href="/user/about/{{ v.create_user }}">{{ v.create_user }}</a>
+                        <a href="/user/about/{{ v.create_user }}">{{ v.create_user }}</a>
                     </td>
                     <td>
                         <a href="javascript:tpl_unbind_group('{{ v.id }}', '{{ group.id }}');"

rrd/templates/portal/template/view.html

@@ -86,6 +86,23 @@
                 <div class="mt10">
                     callback: {{ data.tpl.action.url }}
                 </div>
+                <pre><code>#callback request payload:
+
+{
+  "endpoint": event.Endpoint,
+  "metric": event.Metric(),
+  "status": event.Status,
+  "step": event.CurrentStep,
+  "priority": event.Priority(),
+  "time": event.FormattedTime(),
+  "tpl_id": event.TplId(),
+  "exp_id": event.ExpressionId(),
+  "stra_id": event.StrategyId(),
+  "tags": "srv=falcon,mount=sda"
+}
+
+# for more infomation, look the code https://github.com/open-falcon/falcon-plus/blob/master/common/model/event.go
+</code></pre>
 
                 <div class="mt10">
                     <label class="checkbox-inline">

rrd/templates/team/create.html

@@ -8,7 +8,6 @@
 			<div style="margin: 0 auto; max-width: 400px;">
 
 				<ol class="breadcrumb">
-					<li><a href="/">首页</a></li>
 					<li><a href="/team/list">用户组列表</a></li>
 					<li class="active">创建用户组</li>
 				</ol>

rrd/templates/team/edit.html

@@ -8,7 +8,6 @@
 			<div style="margin: 0 auto; max-width: 400px;">
 
 				<ol class="breadcrumb">
-					<li><a href="/">首页</a></li>
 					<li><a href="/team/list">用户组列表</a></li>
 					<li class="active">修改用户组</li>
 				</ol>

rrd/templates/team/list.html

@@ -25,7 +25,6 @@
 			<div style="margin: 0 auto; max-width: 500px;">
 
 				<ol class="breadcrumb">
-					<li><a href="/">首页</a></li>
 					<li class="active">用户组管理</li>
 				</ol>
 

rrd/templates/user/about.html

@@ -5,8 +5,12 @@
 <div id="container" class="container-fluid">
 	<div class="row">
 		<div class="col-md-12">
-
 			<div style="margin: 0 auto; max-width: 400px;">
+				<ol class="breadcrumb">
+                    <li><a href="/user/list">通讯录</a></li>
+                    <li class="active">关于{{user.cnname}}</li>
+				</ol>
+
 				<div class="thin-border" style="line-height:24px;">
 					<div>
 						姓名：{{user.cnname}}<br>

rrd/templates/user/edit.html

@@ -6,6 +6,10 @@
 	<div class="row">
 		<div class="col-md-12">
 			<div style="margin: 0 auto; max-width: 400px;">
+				<ol class="breadcrumb">
+					<li><a href="/user/list">通讯录</a></li>
+					<li class="active">编辑用户</li>
+				</ol>
 
 				<div class="panel panel-default">
 					<div class="panel-heading">

rrd/templates/user/list.html

@@ -24,7 +24,6 @@
 			<div style="margin: 0 auto; max-width: 400px;">
 
 				<ol class="breadcrumb">
-					<li><a href="/">首页</a></li>
 					<li class="active">通讯录</li>
 				</ol>
 
@@ -65,7 +64,7 @@
 						{%endif%}
 
                         登录账号：{{user.name}}， 中文名：{{user.cnname}}
-						<a href="/user/about/{{user.id}}" target="_blank" style="text-decoration:none;">
+						<a href="/user/about/{{user.id}}" style="text-decoration:none;">
 							<span class="glyphicon glyphicon-qrcode"></span>
 						</a>
 						<br>

rrd/templates/user/profile.html

@@ -9,7 +9,7 @@
 			<div style="margin: 0 auto; max-width: 400px;">
 
 				<ol class="breadcrumb">
-					<li><a href="/">首页</a></li>
+					<li><a href="/user/list">通讯录</a></li>
 					<li class="active">个人信息维护</li>
 				</ol>
 

rrd/view/__init__.py

@@ -29,7 +29,7 @@ def app_before():
 
     if path.startswith("/screen"):
         g.nav_menu = "nav_screen"
-    elif path.startswith("/portal/hostgroup"):
+    elif path.startswith("/portal/hostgroup") or path.startswith("/portal/group"):
         g.nav_menu = "p_hostgroup"
     elif path.startswith("/portal/template"):
         g.nav_menu = "p_template"
@@ -40,4 +40,4 @@ def app_before():
     elif path.startswith("/portal/alarm-dash"):
         g.nav_menu = "p_alarm-dash"
     else:
-        g.nav_menu = "nav_dashboard"
+        g.nav_menu = ""

rrd/view/portal/api.py

@@ -114,7 +114,7 @@ def api_metric_query():
         return []
 
     metrics = r.json() or []
-    metrics.append(q)
+    metrics = [q,] + metrics
 
     return jsonify(data=[{'name': name} for name in metrics])