Commit de26a17d by Torkel Ödegaard

feat(footer): began work on page footer

parent 152e0853
package dtos
type IndexViewData struct {
User *CurrentUser
Settings map[string]interface{}
AppUrl string
AppSubUrl string
GoogleAnalyticsId string
GoogleTagManagerId string
MainNavLinks []*NavLink
User *CurrentUser
Settings map[string]interface{}
AppUrl string
AppSubUrl string
GoogleAnalyticsId string
GoogleTagManagerId string
MainNavLinks []*NavLink
BuildVersion string
BuildCommit string
NewGrafanaVersionExists bool
NewGrafanaVersion string
}
type PluginCss struct {
......
......@@ -137,11 +137,9 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
"authProxyEnabled": setting.AuthProxyEnabled,
"buildInfo": map[string]interface{}{
"version": setting.BuildVersion,
"commit": setting.BuildCommit,
"buildstamp": setting.BuildStamp,
"latestVersion": plugins.GrafanaLatestVersion,
"hasUpdate": plugins.GrafanaHasUpdate,
"version": setting.BuildVersion,
"commit": setting.BuildCommit,
"buildstamp": setting.BuildStamp,
},
}
......
......@@ -36,11 +36,15 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
LightTheme: prefs.Theme == "light",
Timezone: prefs.Timezone,
},
Settings: settings,
AppUrl: setting.AppUrl,
AppSubUrl: setting.AppSubUrl,
GoogleAnalyticsId: setting.GoogleAnalyticsId,
GoogleTagManagerId: setting.GoogleTagManagerId,
Settings: settings,
AppUrl: setting.AppUrl,
AppSubUrl: setting.AppSubUrl,
GoogleAnalyticsId: setting.GoogleAnalyticsId,
GoogleTagManagerId: setting.GoogleTagManagerId,
BuildVersion: setting.BuildVersion,
BuildCommit: setting.BuildCommit,
NewGrafanaVersion: plugins.GrafanaLatestVersion,
NewGrafanaVersionExists: plugins.GrafanaHasUpdate,
}
if setting.DisableGravatar {
......
......@@ -35,15 +35,6 @@ function (angular, coreModule, config) {
}
};
// build info view model
$scope.buildInfo = {
version: config.buildInfo.version,
commit: config.buildInfo.commit,
buildstamp: new Date(config.buildInfo.buildstamp * 1000),
latestVersion: config.buildInfo.latestVersion,
hasUpdate: config.buildInfo.hasUpdate,
};
$scope.submit = function() {
if ($scope.loginMode) {
$scope.login();
......
......@@ -73,14 +73,5 @@
</div>
</div>
<div class="row" style="margin-top: 50px">
<div class="version-footer text-center small">
Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }}
</div>
<div class="version-footer text-center small" ng-show="buildInfo.hasUpdate">
<a class="external-link" target="_blank" href="http://grafana.org/download">New Grafana Version Available ({{buildInfo.latestVersion}})</a>
</div>
</div>
</div>
</div>
......@@ -67,7 +67,6 @@
</form>
</div>
</div>
</div>
......
......@@ -7,3 +7,6 @@
a { color: darken($gray-1, 25%); }
}
.footer {
padding: 5rem 0 1rem 0;
}
......@@ -39,6 +39,36 @@
</div>
<div ng-view class="main-view"></div>
<footer class="footer">
<div class="row text-center">
<a href="http://docs.grafana.org" target="_blank">
<i class="fa fa-question-circle"></i>
Docs
</a>
<span class="muted">|</a>
<a href="https://grafana.net/support/plans" target="_blank">
<i class="fa fa-question-circle"></i>
Support Plans
</a>
<span class="muted">|</a>
<a href="https://grafana.org/community" target="_blank">
<i class="fa fa-comments"></i>
Community
</a>
<span class="muted">|</a>
<a href="http://docs.grafana.org" target="_blank">
<a href="http://grafana.org" target="_blank">Grafana</a>
<span class="muted">v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
<span class="muted">|</a>
[[if .NewGrafanaVersionExists]]
<a href="http://grafana.org/download" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
<i class="fa fa-question-circle-o"></i>
New version available!
</a>
[[end]]
</div>
</footer>
</grafana-app>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment