From f18eeaa9205cfe8e1ea23fc8f076f8a81cd20d24 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 13 Dec 2017 16:08:19 +0100
Subject: [PATCH 1/2] change protip to go to manage dashboards

---
 .../components/manage_dashboards/manage_dashboards.html     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index a19a63a550b..a4def0dc55e 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -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>

From 7d0ca63b7247d86e02a5dc1ef0a8b6919212c8e8 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 13 Dec 2017 16:28:36 +0100
Subject: [PATCH 2/2] navmodel: fix for signout link on pref page

without a target property on the link, the signout tab on
the preferences page returned a 404.
---
 public/app/core/components/PageHeader/PageHeader.tsx | 2 +-
 public/app/core/nav_model_srv.ts                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx
index 5e736332ec2..cee6e59986f 100644
--- a/public/app/core/components/PageHeader/PageHeader.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.tsx
@@ -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>
diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts
index 2807f8fc19c..85d4ccfb7e1 100644
--- a/public/app/core/nav_model_srv.ts
+++ b/public/app/core/nav_model_srv.ts
@@ -12,6 +12,7 @@ export interface NavModelItem {
   hideFromTabs?: boolean;
   divider?: boolean;
   children: NavModelItem[];
+  target?: string;
 }
 
 export class NavModel {