IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-07 14:15:35 +01:00
commit 955dcf2418
1 changed files with 94 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/views/index.template.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -24,7 +25,9 @@
<div class="page-alert-list"> <div class="page-alert-list">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert"> <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-icon">
<i class="{{alert.icon}}"></i>
</div>
<div class="alert-body"> <div class="alert-body">
<div class="alert-title">{{alert.title}}</div> <div class="alert-title">{{alert.title}}</div>
<div class="alert-text" ng-bind='alert.text'></div> <div class="alert-text" ng-bind='alert.text'></div>
@ -40,23 +43,23 @@
<div ng-view></div> <div ng-view></div>
<footer class="footer"> <footer class="footer">
<div class="row text&#45;center"> <div class="text-center">
<ul> <ul>
<li> <li>
<a href="http://docs.grafana.org" target="_blank"> <a href="http://docs.grafana.org" target="_blank">
<i class="fa fa&#45;file&#45;code&#45;o"></i> <i class="fa fa-file-code-o"></i>
Docs Docs
</a> </a>
</li> </li>
<li> <li>
<a href="https://grafana.com/services/support" target="_blank"> <a href="https://grafana.com/services/support" target="_blank">
<i class="fa fa&#45;support"></i> <i class="fa fa-support"></i>
Support Plans Support Plans
</a> </a>
</li> </li>
<li> <li>
<a href="https://community.grafana.com/" target="_blank"> <a href="https://community.grafana.com/" target="_blank">
<i class="fa fa&#45;comments&#45;o"></i> <i class="fa fa-comments-o"></i>
Community Community
</a> </a>
</li> </li>
@ -66,7 +69,7 @@
</li> </li>
[[if .NewGrafanaVersionExists]] [[if .NewGrafanaVersionExists]]
<li> <li>
<a href="https://grafana.com/get" target="_blank" bs&#45;tooltip="'[[.NewGrafanaVersion]]'"> <a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
New version available! New version available!
</a> </a>
</li> </li>
@ -84,9 +87,7 @@
settings: [[.Settings]], settings: [[.Settings]],
navTree: [[.NavTree]] navTree: [[.NavTree]]
}; };
</script> </script> [[if .GoogleTagManagerId]]
[[if .GoogleTagManagerId]]
<script> <script>
dataLayer = [{ dataLayer = [{
'IsSignedIn': '[[.User.IsSignedIn]]', 'IsSignedIn': '[[.User.IsSignedIn]]',
@ -98,12 +99,16 @@
}]; }];
</script> </script>
<!-- Google Tag Manager --> <!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=[[.GoogleTagManagerId]]" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <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], <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); 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> })(window, document, 'script', 'dataLayer', '[[.GoogleTagManagerId]]');</script>
<!-- End Google Tag Manager --> <!-- End Google Tag Manager -->
[[end]] [[end]]
</body> </body>
</html> </html>