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

small fixes to overlay buttons + insert order

Browse Source
This commit is contained in:
Mads Rasmussen
2016-11-17 10:33:15 +01:00
parent 1a80e94bca
commit 597a10fc5d
4 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.controller.js
View File

@@ -22,9 +22,9 @@
vm.macroPickerOverlay = {
view: "macropicker",
show: true,
title: "Insert macro",
dialogData: {},
show: true,
submit: function(model) {
$scope.model.insert = {

18
src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
View File

@@ -2,23 +2,23 @@
<div class="umb-insert-code-boxes">
<div class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
<div class="umb-insert-code-box__title">Macro</div>
<div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
</div>
<div class="umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
<div class="umb-insert-code-box__title">Value</div>
<div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
</div>
<div class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
<div class="umb-insert-code-box__title">Dictionary</div>
<div class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
<div class="umb-insert-code-box__title">Partial view</div>
<div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
</div>
<div class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
<div class="umb-insert-code-box__title">Partial</div>
<div class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
<div class="umb-insert-code-box__title">Macro</div>
<div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
</div>
<div class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
<div class="umb-insert-code-box__title">Dictionary</div>
<div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
</div>

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

@@ -200,7 +200,6 @@
multiPicker: false,
show: true,
title: "Insert dictionary item",
select: function(node){
//crappy hack due to dictionary items not in umbracoNode table
var code = "@Umbraco.GetDictionaryValue(\"" + node.name + "\")";
@@ -209,11 +208,6 @@
vm.dictionaryItemOverlay.show = false;
vm.dictionaryItemOverlay = null;
},
submit: function (model) {
console.log(model);
},
close: function (model) {
vm.dictionaryItemOverlay.show = false;
vm.dictionaryItemOverlay = null;
@@ -230,7 +224,6 @@
multiPicker: false,
show: true,
title: "Insert Partial view",
select: function(node){
//crappy hack due to dictionary items not in umbracoNode table
var code = "@Html.Partial(\"" + node.name + "\")";
@@ -239,13 +232,6 @@
vm.partialItemOverlay.show = false;
vm.partialItemOverlay = null;
},
submit: function (model) {
console.log(model);
vm.partialItemOverlay.show = false;
vm.partialItemOverlay = null;
},
close: function (model) {
vm.partialItemOverlay.show = false;
vm.partialItemOverlay = null;
@@ -288,8 +274,9 @@
vm.sectionsOverlay = {
view: "templatesections",
show: true,
isMasterTemplate: true,
submitButtonLabel: "Insert",
show: true,
submit: function(model) {
if (model.insertType === 'renderBody') {
@@ -374,7 +361,7 @@
return templateName;
} else {
return "No template";
return "No master";
}
}

2
src/Umbraco.Web.UI.Client/src/views/templates/edit.html
View File

@@ -41,9 +41,9 @@
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
<li><a href="" ng-click="vm.openPageFieldOverlay()">Value</a></li>
<li><a href="" ng-click="vm.openPartialOverlay()">Partial view</a></li>
<li><a href="" ng-click="vm.openDictionaryItemOverlay()">Dictionary</a></li>
<li><a href="" ng-click="vm.openMacroOverlay()">Macro</a></li>
<li><a href="" ng-click="vm.openPartialOverlay()">Partial view</a></li>
</ul>
</div>