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

Merge remote-tracking branch 'origin/temp-template-editor' into temp-template-editor

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Editors/TemplateQueryController.cs
#	src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
This commit is contained in:
Per Ploug
2016-12-29 02:16:58 +01:00
parent 2ec3278637 19f7e6bd88
commit 00adffc8b3
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
View File

@@ -37,11 +37,6 @@
$scope.model.title = "Insert value";
}
// set default subtitle
if(!$scope.model.subtitle) {
$scope.model.subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
}
// Load all fields
contentTypeResource.getAllPropertyTypeAliases().then(function (array) {
vm.properties = array;

2
src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
View File

@@ -53,7 +53,6 @@
<div class="controls">
<label class="control-label" for="recursive">
Recursive
<small>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</small>
</label>
<input type="checkbox" name="recursive" ng-model="vm.recursive">
Yes, make it recursive
@@ -87,7 +86,6 @@
<div>
<label class="control-label">
Casing
<small>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</small>
</label>
</div>
<a href ng-click="vm.setCasingOption('uppercase')" class="btn" style="text-transform: uppercase;"><i class="icon icon-check" ng-if="vm.casingUpper"></i> Uppercase</a>

6
src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
View File

@@ -19,10 +19,10 @@
function onInit() {
if($scope.model.isMasterTemplate) {
$scope.model.insertType = 'renderBody';
} else {
if($scope.model.hasMaster) {
$scope.model.insertType = 'addSection';
} else {
$scope.model.insertType = 'renderBody';
}
}

4
src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Overlays.TemplateSectionsOverlay as vm">
<div class="umb-insert-code-box" ng-click="vm.select('renderBody')">
<div ng-if="!model.hasMaster" class="umb-insert-code-box" ng-click="vm.select('renderBody')">
<div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderBody' }"><i class="icon icon-check"></i></div>
<div class="umb-insert-code-box__title">Render child template</div>
<div class="umb-insert-code-box__description">
@@ -9,7 +9,7 @@
</div>
</div>
<div class="umb-insert-code-box" ng-click="vm.select('renderSection')">
<div ng-if="!model.hasMaster" class="umb-insert-code-box" ng-click="vm.select('renderSection')">
<div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderSection' }"><i class="icon icon-check"></i></div>
<div class="umb-insert-code-box__title">Render a named section</div>