Merge branch 'develop' of github.com:grafana/grafana into develop

This commit is contained in:
Torkel Ödegaard 2017-12-13 16:31:11 +01:00
commit db95a01feb
3 changed files with 5 additions and 4 deletions

View File

@ -19,7 +19,7 @@ function TabItem(tab: NavModelItem) {
return (
<li className="gf-tabs-item" key={tab.url}>
<a className={tabClasses} href={tab.url}>
<a className={tabClasses} target={tab.target} href={tab.url}>
<i className={tab.icon} />
{tab.text}
</a>

View File

@ -90,9 +90,9 @@
buttonIcon: 'gicon gicon-dashboard-new',
buttonLink: '/dashboard/new?folderId={{ctrl.folderId}}',
buttonTitle: 'Create Dashboard',
proTip: 'You can bulk move dashboards into this folder from the main dashboard list.',
proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list',
proTipLinkTitle: 'Learn more',
proTip: 'Add dashboards into your folder at ->',
proTipLink: '/dashboards',
proTipLinkTitle: 'Manage dashboards',
proTipTarget: '_blank'
}" />
</div>

View File

@ -12,6 +12,7 @@ export interface NavModelItem {
hideFromTabs?: boolean;
divider?: boolean;
children: NavModelItem[];
target?: string;
}
export class NavModel {