From a01926b8781a225f7592502905e147215b6d6f29 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 17 Sep 2015 10:37:35 -0400
Subject: [PATCH] (html) Improve folder subscription dialog box

---
 UI/Templates/ContactsUI/UIxContactsUserFolders.wox       | 9 ++++++++-
 UI/WebServerResources/js/Common/sgSubscribe.directive.js | 8 ++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index 09395f232..5ed122760 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -7,8 +7,15 @@
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix">
   <md-dialog flex="50" flex-sm="100">
+    <md-toolbar>
+      <div class="md-toolbar-tools">
+        <div class="sg-md-title md-flex"><var:string label:value="Subscribe to a shared folder"/></div>
+        <md-button class="md-icon-button" ng-click="subscribe.close()">
+          <md-icon label:aria-label="Close">close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
     <md-dialog-content>
-      <h2 class="md-title"><var:string label:value="Subscribe to a shared folder"/></h2>
       <md-input-container>
         <label><md-icon>search</md-icon><var:string label:value="Search User"/></label>
         <input type="input"
diff --git a/UI/WebServerResources/js/Common/sgSubscribe.directive.js b/UI/WebServerResources/js/Common/sgSubscribe.directive.js
index e87821f4a..4b7685885 100644
--- a/UI/WebServerResources/js/Common/sgSubscribe.directive.js
+++ b/UI/WebServerResources/js/Common/sgSubscribe.directive.js
@@ -59,8 +59,8 @@
   /**
    * @ngInject
    */
-  sgSubscribeController.$inject = ['folderType', 'onFolderSelect', 'User'];
-  function sgSubscribeController(folderType, onFolderSelect, User) {
+  sgSubscribeController.$inject = ['$mdDialog', 'folderType', 'onFolderSelect', 'User'];
+  function sgSubscribeController($mdDialog, folderType, onFolderSelect, User) {
     var vm = this;
 
     vm.selectedUser = null;
@@ -103,6 +103,10 @@
     vm.selectFolder = function(folder) {
       onFolderSelect({folderData: folder});
     };
+
+    vm.close = function() {
+      $mdDialog.hide();
+    };
   }
 
   angular