Merge branch 'master' into websocket

This commit is contained in:
Torkel Ödegaard
2016-03-22 10:31:57 +01:00
40 changed files with 367 additions and 236 deletions

View File

@@ -56,6 +56,7 @@ function (angular, $, _, Tether) {
template += '<a class="panel-menu-link" ';
if (item.click) { template += ' ng-click="' + item.click + '"'; }
if (item.href) { template += ' href="' + item.href + '"'; }
template += '>';
template += item.text + '</a>';
});