Commit db95a01f by Torkel Ödegaard

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

parents 3c650156 7d0ca63b
......@@ -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>
......
......@@ -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>
......@@ -12,6 +12,7 @@ export interface NavModelItem {
hideFromTabs?: boolean;
divider?: boolean;
children: NavModelItem[];
target?: string;
}
export class NavModel {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment