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 'master' into style-changes-bulletfactory

Browse Source 
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
This commit is contained in:
Torkel Ödegaard
2016-02-11 21:23:54 +01:00
parent d8b43a3d76 ac5f7ecdea
commit 2ea548850e
219 changed files with 7229 additions and 33067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
<ul class="sidemenu sidemenu-main">
<li class="sidemenu-org-section dropdown" ng-if="ctrl.isSignedIn">
<li class="sidemenu-org-section" ng-if="ctrl.isSignedIn">
<div class="sidemenu-org" data-toggle="dropdown" ng-click="ctrl.openUserDropdown()">
<div class="sidemenu-org-avatar">
<img ng-src="{{ctrl.user.gravatarUrl}}">
@@ -44,6 +44,13 @@
</span>
<span class="sidemenu-item-text">{{item.text}}</span>
</a>
<ul class="dropdown-menu" role="menu" ng-if="item.children">
<li ng-repeat="child in item.children">
<a href="{{child.url}}">
{{child.text}}
</a>
</li>
</ul>
</li>
<ul class="sidemenu sidemenu-small" style="margin-top:50px" ng-if="ctrl.systemSection">