浏览代码

Merge branch 'develop' of github.com:grafana/grafana into develop

Torkel Ödegaard 8 年之前
父节点
当前提交
955dcf2418
共有 1 个文件被更改,包括 92 次插入87 次删除
  1. 92 87
      public/views/index.template.html

+ 92 - 87
public/views/index.template.html

@@ -1,109 +1,114 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html lang="en">
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width">
-    <meta name="theme-color" content="#000">
 
 
-    <title>Grafana</title>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width">
+  <meta name="theme-color" content="#000">
 
 
-		<base href="[[.AppSubUrl]]/" />
+  <title>Grafana</title>
 
 
-		<link rel="stylesheet" href="public/build/grafana.[[ .Theme ]].css?v[[ .BuildVersion ]]">
+  <base href="[[.AppSubUrl]]/" />
 
 
-    <link rel="icon" type="image/png" href="public/img/fav32.png">
-    <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28">
+  <link rel="stylesheet" href="public/build/grafana.[[ .Theme ]].css?v[[ .BuildVersion ]]">
 
 
-	</head>
+  <link rel="icon" type="image/png" href="public/img/fav32.png">
+  <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28">
 
 
-	<body ng-cloak class="theme-[[ .Theme ]]">
-		<grafana-app class="grafana-app">
+</head>
 
 
-      <sidemenu class="sidemenu"></sidemenu>
+<body ng-cloak class="theme-[[ .Theme ]]">
+  <grafana-app class="grafana-app">
 
 
-			<div class="page-alert-list">
-				<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
-					<div class="alert-icon"><i class="{{alert.icon}}"></i></div>
-					<div class="alert-body">
-						<div class="alert-title">{{alert.title}}</div>
-						<div class="alert-text" ng-bind='alert.text'></div>
-					</div>
-					<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
-						<i class="fa fa fa-remove"></i>
-					</button>
-				</div>
-			</div>
+    <sidemenu class="sidemenu"></sidemenu>
 
 
-			<div class="main-view">
-          <div class="scroll-canvas" grafana-scrollbar>
-            <div ng-view></div>
+    <div class="page-alert-list">
+      <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
+        <div class="alert-icon">
+          <i class="{{alert.icon}}"></i>
+        </div>
+        <div class="alert-body">
+          <div class="alert-title">{{alert.title}}</div>
+          <div class="alert-text" ng-bind='alert.text'></div>
+        </div>
+        <button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
+          <i class="fa fa fa-remove"></i>
+        </button>
+      </div>
+    </div>
+
+    <div class="main-view">
+      <div class="scroll-canvas" grafana-scrollbar>
+        <div ng-view></div>
 
 
-            <footer class="footer">
-              <div class="row text&#45;center">
-                <ul>
-                  <li>
-                    <a href="http://docs.grafana.org" target="_blank">
-                      <i class="fa fa&#45;file&#45;code&#45;o"></i>
-                      Docs
-                    </a>
-                  </li>
-                  <li>
-                    <a href="https://grafana.com/services/support" target="_blank">
-                      <i class="fa fa&#45;support"></i>
-                      Support Plans
-                    </a>
-                  </li>
-                  <li>
-                    <a href="https://community.grafana.com/" target="_blank">
-                      <i class="fa fa&#45;comments&#45;o"></i>
-                      Community
-                    </a>
-                  </li>
-                  <li>
-                    <a href="https://grafana.com" target="_blank">Grafana</a>
-                    <span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
-                  </li>
-                  [[if .NewGrafanaVersionExists]]
-                  <li>
-                    <a href="https://grafana.com/get" target="_blank" bs&#45;tooltip="'[[.NewGrafanaVersion]]'">
-                      New version available!
-                    </a>
-                  </li>
-                  [[end]]
-                </ul>
-              </div>
-            </footer>
+        <footer class="footer">
+          <div class="text-center">
+            <ul>
+              <li>
+                <a href="http://docs.grafana.org" target="_blank">
+                  <i class="fa fa-file-code-o"></i>
+                  Docs
+                </a>
+              </li>
+              <li>
+                <a href="https://grafana.com/services/support" target="_blank">
+                  <i class="fa fa-support"></i>
+                  Support Plans
+                </a>
+              </li>
+              <li>
+                <a href="https://community.grafana.com/" target="_blank">
+                  <i class="fa fa-comments-o"></i>
+                  Community
+                </a>
+              </li>
+              <li>
+                <a href="https://grafana.com" target="_blank">Grafana</a>
+                <span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
+              </li>
+              [[if .NewGrafanaVersionExists]]
+              <li>
+                <a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
+                  New version available!
+                </a>
+              </li>
+              [[end]]
+            </ul>
           </div>
           </div>
+        </footer>
       </div>
       </div>
-    </grafana-app>
+    </div>
+  </grafana-app>
 
 
-    <script>
+  <script>
     window.grafanaBootData = {
     window.grafanaBootData = {
-      user:[[.User]],
+      user: [[.User]],
       settings: [[.Settings]],
       settings: [[.Settings]],
       navTree: [[.NavTree]]
       navTree: [[.NavTree]]
     };
     };
-    </script>
+  </script> [[if .GoogleTagManagerId]]
+  <script>
+    dataLayer = [{
+      'IsSignedIn': '[[.User.IsSignedIn]]',
+      'Email': '[[.User.Email]]',
+      'Name': '[[.User.Name]]',
+      'UserId': '[[.User.Id]]',
+      'OrgId': '[[.User.OrgId]]',
+      'OrgName': '[[.User.OrgName]]',
+    }];
+  </script>
+  <!-- Google Tag Manager -->
+  <noscript>
+    <iframe src="//www.googletagmanager.com/ns.html?id=[[.GoogleTagManagerId]]" height="0" width="0" style="display:none;visibility:hidden"></iframe>
+  </noscript>
+  <script>(function (w, d, s, l, i) {
+    w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' }); var f = d.getElementsByTagName(s)[0],
+      j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', '[[.GoogleTagManagerId]]');</script>
+  <!-- End Google Tag Manager -->
+  [[end]]
 
 
-	[[if .GoogleTagManagerId]]
-		<script>
-			dataLayer = [{
-				'IsSignedIn': '[[.User.IsSignedIn]]',
-				'Email': '[[.User.Email]]',
-				'Name': '[[.User.Name]]',
-				'UserId': '[[.User.Id]]',
-				'OrgId': '[[.User.OrgId]]',
-				'OrgName': '[[.User.OrgName]]',
-			}];
-		</script>
-		<!-- Google Tag Manager -->
-		<noscript><iframe src="//www.googletagmanager.com/ns.html?id=[[.GoogleTagManagerId]]" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-			j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','[[.GoogleTagManagerId]]');</script>
-		<!-- End Google Tag Manager -->
-	[[end]]
+</body>
 
 
-  </body>
 </html>
 </html>