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

feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-09 14:20:41 +01:00
parent 9dcfe6dc39
commit f0ecbd3878
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/index.go
View File

@ -52,12 +52,15 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
Text: "Dashboards",
Icon: "fa fa-fw fa-th-large",
Url: setting.AppSubUrl + "/",
Children: []*dtos.NavLink{
{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
},
// Children: []*dtos.NavLink{
// {Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
// {Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
// },
})
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"})
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"})
if c.OrgRole == m.ROLE_ADMIN {
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
Text: "Data Sources",

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

@ -1,7 +1,7 @@
<ul class="sidemenu sidemenu-main">
<li class="sidemenu-org-section" ng-if="ctrl.isSignedIn">
<div class="sidemenu-org">
<div class="sidemenu-org" data-toggle="dropdown" ng-click="ctrl.openUserDropdown()">
<div class="sidemenu-org-avatar">
<img ng-src="{{ctrl.user.gravatarUrl}}">
</div>
@ -43,7 +43,6 @@
<img ng-src="{{item.img}}" ng-show="item.img">
</span>
<span class="sidemenu-item-text">{{item.text}}</span>
<i class="fa fa-caret-right small" ng-show="item.children"></i>
</a>
<ul class="dropdown-menu" role="menu" ng-if="item.children">
<li ng-repeat="child in item.children">

1
public/app/core/components/sidemenu/sidemenu.ts
View File

@ -38,7 +38,6 @@ export class SideMenuCtrl {
setupMainNav() {
this.mainLinks = config.bootData.mainNavLinks;
this.openUserDropdown();
}
openUserDropdown() {

7
public/less/sidemenu.less
View File

@ -76,13 +76,6 @@
color: @linkColor;
}
}
li:hover {
position: relative;
.dropdown-menu {
display: block;
}
}
}
.sidemenu-main-link {