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

Start updating the model/controller for editing variants in the back office and wiring up the angular side of things

Browse Source
This commit is contained in:
Shannon
2018-04-03 19:25:43 +10:00
parent 271a100759
commit e7bc4986a5
14 changed files with 151 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
View File

@@ -53,61 +53,6 @@
// We don't get the info tab from the server from version 7.8 so we need to manually add it
//contentEditingHelper.addInfoTab($scope.content.tabs);
// prototype variants
$scope.content.variants = [
{
"cultureDisplayName": "English (United States)",
"culture": "en-US",
"current": true,
"segments" : [
{
"name": "Mobile"
},
{
"name": "Job campign"
}
],
"state": "Published"
},
{
"cultureDisplayName": "Danish",
"culture": "da-DK",
"current": false,
"segments" : [
{
"name": "Mobile"
}
],
"state": "Published"
},
{
"cultureDisplayName": "Spanish (Spain)",
"culture": "es-ES",
"current": false,
"state": "Published (pending changes)"
},
{
"cultureDisplayName": "French (France)",
"culture": "fr-FR",
"current": false,
"segments" : [
{
"name": "Mobile"
},
{
"name": "Job campign"
}
],
"state": "Draft"
},
{
"cultureDisplayName": "German (Germany)",
"culture": "de-DE",
"current": false,
"state": "Draft"
}
];
// prototype content and info apps
var contentApp = {
"name": "Content",

4
src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
View File

@@ -136,13 +136,13 @@
}
// published node
if(node.hasPublishedVersion === true && node.publishDate && node.published === true) {
if(node.publishDate && node.published === true) {
scope.publishStatus.label = localizationService.localize("content_published");
scope.publishStatus.color = "success";
}
// published node with pending changes
if(node.hasPublishedVersion === true && node.publishDate && node.published === false) {
if (node.edited === true && node.publishDate) {
scope.publishStatus.label = localizationService.localize("content_publishedPendingChanges");
scope.publishStatus.color = "success"
}

8
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
View File

@@ -50,15 +50,15 @@
server-validation-field="Alias">
</umb-generate-alias>
<a ng-if="variants.length > 0" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<span>{{vm.currentVariant.cultureDisplayName}}</span>
<a ng-if="variants.length > 1" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<span>{{vm.currentVariant.language.name}}</span>
<ins class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
</a>
<umb-dropdown ng-if="vm.dropdownOpen" style="width: 100%; max-height: 250px; overflow-y: scroll; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
<umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.current}" ng-repeat="variant in variants">
<a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
<span class="umb-variant-switcher__name">{{variant.cultureDisplayName}}</span>
<span class="umb-variant-switcher__name">{{variant.language.name}}</span>
<span class="umb-variant-switcher__state">{{variant.state}}</span>
</a>
<div ng-if="splitViewOpen !== true" class="umb-variant-switcher__split-view" ng-click="openInSplitView($event, variant)">Open in split view</div>
@@ -115,4 +115,4 @@
view="dialogModel.view">
</umb-overlay>
</div>
</div>