From ef1684ca36da8cfdc491e9b16c15bd44cdb14e16 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 24 Sep 2018 13:44:02 +0200 Subject: [PATCH] wip add rollback scaffolding --- .../content/content.rollback.controller.js | 68 +++++++++++++++++++ .../src/views/content/rollback.html | 55 +++++++++++++++ .../Umbraco/config/lang/en_us.xml | 2 +- 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/content/rollback.html diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js new file mode 100644 index 0000000000..bf830fc900 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js @@ -0,0 +1,68 @@ +(function () { + "use strict"; + + function ContentRollbackController($scope, $timeout) { + + var vm = this; + + vm.rollback = rollback; + vm.loadVersion = loadVersion; + vm.closeDialog = closeDialog; + + function onInit() { + + vm.loading = true; + vm.variantVersions = []; + + // fake load versions + var currentLanguage = $scope.currentNode.metaData.culture; + $timeout(function(){ + vm.versions = { + "currentVersion": { + "id": 1, + "name": "Variant name (Created: 22/08/2018 13.32)" + }, + "previousVersions": [ + { + "id": 1, + "name": "Variant name (Created: 22/08/2018 13.32)" + }, + { + "id": 2, + "name": "Variant name (Created: 21/08/2018 19.25)" + }, + { + "id": 3, + "name": "Variant name (Created: 15/08/2018 22.11)" + } + ] + }; + vm.loading = false; + }, 200); + } + + function rollback() { + console.log("rollback"); + } + + /** + * This will load in a new version + */ + function loadVersion(id) { + console.log("load version", id); + } + + /** + * This will close the dialog + */ + function closeDialog() { + $scope.nav.hideDialog(); + } + + onInit(); + + } + + angular.module("umbraco").controller("Umbraco.Editors.Content.RollbackController", ContentRollbackController); + +})(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rollback.html b/src/Umbraco.Web.UI.Client/src/views/content/rollback.html new file mode 100644 index 0000000000..f90051dd42 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/content/rollback.html @@ -0,0 +1,55 @@ +
+ +
+ + + +
+ +
+
Rollback {{ currentNode.name }}
+

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel semper nibh, sed posuere nulla. Vestibulum viverra libero at rutrum ultricies.

+

+ +
+

{{vm.versions.currentVersion.name}}

+ +
+ +
+ +
+ +
+ +
+
+ + + +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 14e5b64fff..83ce2ae176 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -126,7 +126,6 @@ Edit relations Return to list Save - Save and close Publish Publish… @@ -143,6 +142,7 @@ Save and generate models Undo Redo + Rollback Delete tag Cancel Confirm