yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing up a bunch of close buttons in the context menu dialogs

Browse Source
This commit is contained in:
Mads Rasmussen
2018-11-13 17:38:22 +01:00
parent d7f59adc64
commit 17497e7cc7
22 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -422,8 +422,7 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
appState.setMenuState("menuActions", data.menuItems);
appState.setMenuState("dialogTitle", args.node.name);
//we're not opening a dialog, return null.
return $q.resolve(null);
return $q.resolve();
});
},

4
src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function AssignDomainController($scope, localizationService, languageResource, contentResource) {
function AssignDomainController($scope, localizationService, languageResource, contentResource, navigationService) {
var vm = this;
vm.closeDialog = closeDialog;
@@ -73,7 +73,7 @@
}
function closeDialog() {
$scope.nav.hideDialog();
navigationService.hideDialog();
}
function addDomain() {

6
src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
View File

@@ -77,7 +77,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
}
$scope.recursive = true;
}
}
}
$scope.closeDialog = function() {
navigationService.hideDialog();
};
$scope.hideSearch = function () {
$scope.searchInfo.showSearch = false;

6
src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
View File

@@ -73,7 +73,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
$scope.onSearchResults = function (results) {
$scope.searchInfo.results = results;
$scope.searchInfo.showSearch = true;
};
};
$scope.close = function() {
navigationService.hideDialog();
};
$scope.move = function () {

5
src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
View File

@@ -27,6 +27,7 @@
vm.save = save;
vm.sort = sort;
vm.close = close;
function onInit() {
vm.loading = true;
@@ -74,6 +75,10 @@
vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
}
function close() {
navigationService.hideDialog();
}
onInit();
}

2
src/Umbraco.Web.UI.Client/src/views/content/copy.html
View File

@@ -84,7 +84,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
<a class="btn btn-link" ng-click="closeDialog()" ng-if="!busy">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="copy()" ng-disabled="busy">

2
src/Umbraco.Web.UI.Client/src/views/content/create.html
View File

@@ -49,7 +49,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<button class="btn btn-info" ng-click="closeDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>

2
src/Umbraco.Web.UI.Client/src/views/content/move.html
View File

@@ -74,7 +74,7 @@
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
<a class="btn btn-link" ng-click="close()" ng-if="!busy">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="move()" ng-disabled="busy">

2
src/Umbraco.Web.UI.Client/src/views/content/sort.html
View File

@@ -72,7 +72,7 @@
<umb-button
type="button"
button-style="link"
action="nav.hideDialog()"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button

3
src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.controller.js
View File

@@ -54,5 +54,8 @@ angular.module("umbraco")
$scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
}
$scope.close = function() {
navigationService.hideDialog();
};
});

2
src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
View File

@@ -45,7 +45,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
<a class="btn btn-link" ng-click="close()" ng-if="!busy">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="copy()" ng-disabled="busy">

2
src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
View File

@@ -1,6 +1,6 @@
<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ExportController">
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" ng-click="nav.hideDialog()">
<a class="btn btn-link" ng-click="cancel()">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="export()">

5
src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
View File

@@ -68,4 +68,9 @@ angular.module("umbraco")
contentTypeResource.import(vm.model.tempFileName);
vm.state = "done";
}
$scope.close = function() {
navigationService.hideDialog();
};
});

2
src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
View File

@@ -21,7 +21,7 @@
<localize key="general_or">or</localize>
<a class="btn-link" ng-click="nav.hideDialog()">
<a class="btn-link" ng-click="close()">
<localize key="cancel">Cancel</localize>
</a>
</form>

7
src/Umbraco.Web.UI.Client/src/views/documenttypes/move.controller.js
View File

@@ -57,7 +57,10 @@ angular.module("umbraco")
$scope.onTreeInit = function () {
$scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
}
};
$scope.close = function() {
navigationService.hideDialog();
};
});

2
src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
View File

@@ -45,7 +45,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
<a class="btn btn-link" ng-click="close()" ng-if="!busy">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="move()" ng-disabled="busy">

6
src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
View File

@@ -47,7 +47,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
$scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
$scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
$scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
}
}
$scope.close = function() {
navigationService.hideDialog();
};
$scope.move = function () {
mediaResource.move({ parentId: $scope.target.id, id: node.id })

5
src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
View File

@@ -81,4 +81,9 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
$scope.error = err;
});
};
$scope.close = function() {
navigationService.hideDialog();
};
});

5
src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
View File

@@ -27,6 +27,7 @@
vm.save = save;
vm.sort = sort;
vm.close = close;
function onInit() {
vm.loading = true;
@@ -74,6 +75,10 @@
vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
}
function close() {
navigationService.hideDialog();
}
onInit();
}

2
src/Umbraco.Web.UI.Client/src/views/media/move.html
View File

@@ -50,7 +50,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
<button class="btn btn-primary" ng-click="move()"><localize key="actions_move">Move</localize></button>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/media/restore.html
View File

@@ -20,7 +20,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success == true">
<a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/media/sort.html
View File

@@ -72,7 +72,7 @@
<umb-button
type="button"
button-style="link"
action="nav.hideDialog()"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button