Add in dropdowns to file tree

services/web/app/views/project/editor/file-tree.jade

@@ -74,6 +74,25 @@ script(type='text/ng-template', id='entityListItemTemplate')
 					on-enter="finishRenaming()"
 				)
 
+				span.dropdown(ng-show="entity.selected")
+					a.dropdown-toggle(href)
+						i.fa.fa-chevron-down
+
+					ul.dropdown-menu.dropdown-menu-right
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="startRenaming()"
+							) Rename
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="openDeleteModal()"
+							) Delete
+
+
 		.entity(ng-if="entity.type == 'folder'", ng-controller="FileTreeFolderController")
 			.entity-name(
 				ng-click="select()"
@@ -108,6 +127,44 @@ script(type='text/ng-template', id='entityListItemTemplate')
 					on-enter="finishRenaming()"
 				)
 
+				span.dropdown(ng-show="entity.selected")
+					a.dropdown-toggle(href)
+						i.fa.fa-chevron-down
+
+					ul.dropdown-menu.dropdown-menu-right
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="startRenaming()"
+							) Rename
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="openDeleteModal()"
+							) Delete
+						li.divider
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="openNewDocModal()"
+							) New File
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="openNewFolderModal()"
+							) New Folder
+						li
+							a(
+								href="#"
+								prevent-default="click"
+								ng-click="openUploadFileModal()"
+							) Upload File
+
+
 			ul.list-unstyled(
 				ng-if="entity.type == 'folder'"
 				ng-show="expanded"

services/web/public/coffee/app/directives/fineUpload.coffee

@@ -37,8 +37,6 @@ define [
 				params     = scope.params or {}
 				params._csrf = window.csrfToken
 
-				console.log "PARAMS", params
-
 				new qq.FineUploader
 					element: element[0]
 					multiple: multiple

services/web/public/coffee/app/directives/stopPropagation.coffee

@@ -8,3 +8,11 @@ define [
 				element.bind attrs.stopPropagation, (e) ->
 					e.stopPropagation()
 		}
+
+	App.directive "preventDefault", ($http) ->
+		return {
+			restrict: "A",
+			link: (scope, element, attrs) ->
+				element.bind attrs.preventDefault, (e) ->
+					e.preventDefault()
+		}

services/web/public/coffee/app/ide/file-tree/FileTreeManager.coffee

@@ -137,29 +137,18 @@ define [
 
 			return null
 
-		createDocInCurrentFolder: (name, callback = (error, doc) ->) ->
+		createDoc: (name, parent_folder = @getCurrentFolder()) ->
 			# We'll wait for the socket.io notification to actually
 			# add the doc for us.
-			parent_folder = @getCurrentFolder()
+			@ide.$http.post "/project/#{@ide.project_id}/doc", {
-			$.ajax {
+				name: name,
-				url:  "/project/#{@ide.project_id}/doc"
+				parent_folder_id: parent_folder?.id
-				type: "POST"
+				_csrf: window.csrfToken
-				contentType: "application/json; charset=utf-8"
-				data: JSON.stringify {
-					name: name,
-					parent_folder_id: parent_folder?.id
-					_csrf: window.csrfToken
-				}
-				dataType: "json"
-				success: (doc) ->
-					callback(null, doc)
-				failure: (error) -> callback(error)
 			}
 
-		createFolderInCurrentFolder: (name) ->
+		createFolder: (name, parent_folder = @getCurrentFolder()) ->
 			# We'll wait for the socket.io notification to actually
 			# add the folder for us.
-			parent_folder = @getCurrentFolder()
 			return @ide.$http.post "/project/#{@ide.project_id}/folder", {
 				name: name,
 				parent_folder_id: parent_folder?.id

services/web/public/coffee/app/ide/file-tree/controllers/FileTreeController.coffee

@@ -1,17 +1,23 @@
 define [
 	"base"
 ], (App) ->
-	App.controller "FileTreeController", ["$scope", "$modal", ($scope, $modal) ->
+	App.controller "FileTreeController", ["$scope", "$modal", "ide", ($scope, $modal, ide) ->
 		$scope.openNewDocModal = () ->
 			$modal.open(
 				templateUrl: "newDocModalTemplate"
 				controller:  "NewDocModalController"
+				resolve: {
+					parent_folder: () -> ide.fileTreeManager.getCurrentFolder()
+				}
 			)
 
 		$scope.openNewFolderModal = () ->
 			$modal.open(
 				templateUrl: "newFolderModalTemplate"
 				controller:  "NewFolderModalController"
+				resolve: {
+					parent_folder: () -> ide.fileTreeManager.getCurrentFolder()
+				}
 			)
 
 		$scope.openUploadFileModal = () ->
@@ -19,6 +25,9 @@ define [
 				templateUrl: "uploadFileModalTemplate"
 				controller:  "UploadFileModalController"
 				scope: $scope
+				resolve: {
+					parent_folder: () -> ide.fileTreeManager.getCurrentFolder()
+				}
 			)
 
 		$scope.orderByFoldersFirst = (entity) ->
@@ -33,8 +42,8 @@ define [
 	]
 
 	App.controller "NewDocModalController", [
-		"$scope", "ide", "$modalInstance", "$timeout",
+		"$scope", "ide", "$modalInstance", "$timeout", "parent_folder",
-		($scope,   ide,   $modalInstance,   $timeout) ->
+		($scope,   ide,   $modalInstance,   $timeout,   parent_folder) ->
 			$scope.inputs = 
 				name: "name.tex"
 			$scope.state =
@@ -48,7 +57,7 @@ define [
 			$scope.create = () ->
 				$scope.state.inflight = true
 				ide.fileTreeManager
-					.createDocInCurrentFolder($scope.inputs.name)
+					.createDoc($scope.inputs.name, parent_folder)
 					.success () ->
 						$scope.state.inflight = false
 						$modalInstance.close()
@@ -58,8 +67,8 @@ define [
 	]
 
 	App.controller "NewFolderModalController", [
-		"$scope", "ide", "$modalInstance", "$timeout",
+		"$scope", "ide", "$modalInstance", "$timeout", "parent_folder",
-		($scope,   ide,   $modalInstance,   $timeout) ->
+		($scope,   ide,   $modalInstance,   $timeout,   parent_folder) ->
 			$scope.inputs = 
 				name: "name"
 			$scope.state =
@@ -73,7 +82,7 @@ define [
 			$scope.create = () ->
 				$scope.state.inflight = true
 				ide.fileTreeManager
-					.createFolderInCurrentFolder($scope.inputs.name)
+					.createFolder($scope.inputs.name, parent_folder)
 					.success () ->
 						$scope.state.inflight = false
 						$modalInstance.close()
@@ -83,9 +92,9 @@ define [
 	]
 
 	App.controller "UploadFileModalController", [
-		"$scope", "ide", "$modalInstance", "$timeout",
+		"$scope", "ide", "$modalInstance", "$timeout", "parent_folder",
-		($scope,   ide,   $modalInstance,   $timeout) ->
+		($scope,   ide,   $modalInstance,   $timeout,   parent_folder) ->
-			parent_folder = ide.fileTreeManager.getCurrentFolder()
+			console.log "PArent folder", parent_folder
 			$scope.parent_folder_id = parent_folder?.id
 
 			uploadCount = 0

services/web/public/coffee/app/ide/file-tree/controllers/FileTreeFolderController.coffee

@@ -1,7 +1,7 @@
 define [
 	"base"
 ], (App) ->
-	App.controller "FileTreeFolderController", ["$scope", "ide", ($scope, ide) ->
+	App.controller "FileTreeFolderController", ["$scope", "ide", "$modal", ($scope, ide, $modal) ->
 		$scope.expanded = false
 
 		$scope.toggleExpanded = () ->
@@ -17,4 +17,33 @@ define [
 			# that doesn't inherit from previous scopes.
 			return '0' if entity.type == "folder"
 			return '1'
+
+		$scope.openNewDocModal = () ->
+			$modal.open(
+				templateUrl: "newDocModalTemplate"
+				controller:  "NewDocModalController"
+				resolve: {
+					parent_folder: () -> $scope.entity
+				}
+			)
+
+		$scope.openNewFolderModal = () ->
+			$modal.open(
+				templateUrl: "newFolderModalTemplate"
+				controller:  "NewFolderModalController"
+				resolve: {
+					parent_folder: () -> $scope.entity
+				}
+			)
+
+		$scope.openUploadFileModal = () ->
+			$scope.project_id = ide.project_id
+			$modal.open(
+				templateUrl: "uploadFileModalTemplate"
+				controller:  "UploadFileModalController"
+				scope: $scope
+				resolve: {
+					parent_folder: () -> $scope.entity
+				}
+			)
 	]

services/web/public/stylesheets/app/editor.less

@@ -129,6 +129,15 @@
 					i.fa-folder-open, i.fa-folder, i.fa-file, i.fa-image {
 						color: @link-color;
 					}
+					padding-right: 32px;
+				}
+			}
+
+			.dropdown {
+				position: absolute;
+				right: 0;
+				> a {
+					padding: 0 12px;
 				}
 			}
 		}