From 1e496ec76c5248506bb457df8455e273e891c479 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 20 Dec 2017 13:12:23 +0100
Subject: [PATCH] dashfolders: permissions tab in dashboard settings

---
 public/app/features/dashboard/acl/acl.html         | 14 +++++++++++++-
 .../app/features/dashboard/settings/settings.html  |  8 ++++++++
 public/app/features/dashboard/settings/settings.ts |  8 ++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html
index 4f9965f7aa8..f50ffbb6b89 100644
--- a/public/app/features/dashboard/acl/acl.html
+++ b/public/app/features/dashboard/acl/acl.html
@@ -1,4 +1,4 @@
-<div>
+<div class="gf-form-group">
   <table class="filter-table gf-form-group">
     <tr ng-repeat="acl in ctrl.items" ng-class="{'gf-form-disabled': acl.inherited}">
       <td style="width: 100%;">
@@ -59,6 +59,18 @@
   </div>
 </div>
 
+<div class="empty-list-cta">
+  <div class="grafana-info-box">
+    <h5>What are Permissions?</h5>
+    <p>An Access Control List (ACL) model is used for to limit access to Dashboard Folders. A user or a Team can be assigned permissions for a folder or for a single dashboard.</p>
+    <p>The permissions that can be assigned for a folder/dashboard are:</p>
+    <p>View, Edit and Admin.</p>
+    Checkout the <a class="external-link" target="_blank" href="http://docs.grafana.org/reference/dashboard_folders/">Dashboard Folders documentation</a> for more information.
+  </div>
+</div>
+
+
+
   <!-- <br> -->
   <!-- <br> -->
   <!-- <br> -->
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index 18dd055ef05..cb80751f2a2 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -93,6 +93,14 @@
 	</div>
 </div>
 
+<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'permissions'" >
+  <h3 class="dashboard-settings__header">Permissions</h3>
+  <dash-acl-modal ng-if="ctrl.dashboard"
+    dashboard="ctrl.dashboard"
+    meta="ctrl.dashboard.meta">
+  </dash-acl-modal>
+</div>
+
 <div class="dashboard-settings__content" ng-if="ctrl.viewId === '404'">
   <h3 class="dashboard-settings__header">Settings view not found</h3>
 
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 2ac718f9f22..4738983de22 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -68,6 +68,14 @@ export class SettingsCtrl {
       });
     }
 
+    if (this.dashboard.id && this.dashboard.meta.canSave) {
+      this.sections.push({
+        title: "Permissions",
+        id: "permissions",
+        icon: "fa fa-fw fa-lock"
+      });
+    }
+
     if (this.dashboard.meta.canMakeEditable) {
       this.sections.push({
         title: 'General',