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

fixing item picker title and master template title

Browse Source
This commit is contained in:
Mads Rasmussen
2018-06-06 11:26:34 +02:00
parent 33be5a4960
commit eb6da7a41a
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
View File

@@ -1,16 +1,22 @@
function ItemPickerOverlay($scope, localizationService) {
if (!$scope.model.title) {
$scope.model.title = localizationService.localize("defaultdialogs_selectItem");
}
function onInit() {
$scope.model.hideSubmitButton = true;
$scope.model.hideSubmitButton = true;
if (!$scope.model.title) {
localizationService.localize("defaultdialogs_selectItem").then(function(value){
$scope.model.title = value;
});
}
}
$scope.selectItem = function(item) {
$scope.model.selectedItem = item;
$scope.submitForm($scope.model);
};
onInit();
}
angular.module("umbraco").controller("Umbraco.Overlays.ItemPickerOverlay", ItemPickerOverlay);

56
src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
View File

@@ -569,34 +569,38 @@
}
});
vm.masterTemplateOverlay = {
view: "itempicker",
title: localizationService.localize("template_mastertemplate"),
availableItems: availableMasterTemplates,
show: true,
submit: function(model) {
localizationService.localize("template_mastertemplate").then(function(value){
var title = value;
var template = model.selectedItem;
if (template && template.alias) {
vm.template.masterTemplateAlias = template.alias;
setLayout(template.alias + ".cshtml");
} else {
vm.template.masterTemplateAlias = null;
setLayout(null);
vm.masterTemplateOverlay = {
view: "itempicker",
title: title,
availableItems: availableMasterTemplates,
show: true,
submit: function(model) {
var template = model.selectedItem;
if (template && template.alias) {
vm.template.masterTemplateAlias = template.alias;
setLayout(template.alias + ".cshtml");
} else {
vm.template.masterTemplateAlias = null;
setLayout(null);
}
vm.masterTemplateOverlay.show = false;
vm.masterTemplateOverlay = null;
},
close: function(oldModel) {
// close dialog
vm.masterTemplateOverlay.show = false;
vm.masterTemplateOverlay = null;
// focus editor
vm.editor.focus();
}
vm.masterTemplateOverlay.show = false;
vm.masterTemplateOverlay = null;
},
close: function(oldModel) {
// close dialog
vm.masterTemplateOverlay.show = false;
vm.masterTemplateOverlay = null;
// focus editor
vm.editor.focus();
}
};
};
});
}