opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 03:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show Grafana version and build in Help menu

Browse Source 
* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name
This commit is contained in:
David Kaltschmidt
2018-04-16 13:37:05 +02:00
parent ee303c03e9
commit 712212d6aa
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/index.go
View File

@ -118,9 +118,14 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
}) })
if c.IsSignedIn { if c.IsSignedIn {
// Only set login if it's different from the name
var login string
if c.SignedInUser.Login != c.SignedInUser.NameOrFallback() {
login = c.SignedInUser.Login
}
profileNode := &dtos.NavLink{ profileNode := &dtos.NavLink{
Text: c.SignedInUser.NameOrFallback(), Text: c.SignedInUser.NameOrFallback(),
SubTitle: c.SignedInUser.Login, SubTitle: login,
Id: "profile", Id: "profile",
Img: data.User.GravatarUrl, Img: data.User.GravatarUrl,
Url: setting.AppSubUrl + "/profile", Url: setting.AppSubUrl + "/profile",
@ -284,6 +289,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
data.NavTree = append(data.NavTree, &dtos.NavLink{ data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Help", Text: "Help",
SubTitle: fmt.Sprintf(`Grafana version: %s+%s`, setting.BuildVersion, setting.BuildCommit),
Id: "help", Id: "help",
Url: "#", Url: "#",
Icon: "gicon gicon-question", Icon: "gicon gicon-question",

5
public/app/core/components/sidemenu/sidemenu.html
View File

@ -70,9 +70,12 @@
{{::child.text}} {{::child.text}}
</a> </a>
</li> </li>
<li ng-if="item.subTitle" class="side-menu-subtitle">
<span class="sidemenu-item-text">{{::item.subTitle}}</span>
</li>
<li class="side-menu-header"> <li class="side-menu-header">
<span class="sidemenu-item-text">{{::item.text}}</span> <span class="sidemenu-item-text">{{::item.text}}</span>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>

8
public/sass/components/_sidemenu.scss
View File

@ -149,6 +149,14 @@
color: #ebedf2; color: #ebedf2;
} }
.side-menu-subtitle {
padding: 0.5rem 0.5rem 0.5rem 1rem;
font-size: $font-size-sm;
color: $text-color-weak;
border-top: 1px solid $dropdownDividerBottom;
margin-top: 0.25rem;
}
li.sidemenu-org-switcher { li.sidemenu-org-switcher {
border-bottom: 1px solid $dropdownDividerBottom; border-bottom: 1px solid $dropdownDividerBottom;
} }