From f663a133915502e461e2e3baae1589b8f10061ab Mon Sep 17 00:00:00 2001 From: hartvig Date: Mon, 9 Mar 2015 08:52:21 +0100 Subject: [PATCH 1/6] Updates installer with a new number of tattoos Kudos to Mike Perry for being #3: https://twitter.com/nvmy13t/status/574733012904099840 --- src/Umbraco.Web.UI.Client/src/installer/installer.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index 1ab84900f4..f2df5dea2b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -28,7 +28,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop 'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company', "There's a pretty big chance, you've visited a website powered by Umbraco today", "'Umbraco-spotting' is the game of spotting big brands running Umbraco", - "At least 2 people have the Umbraco logo tattooed on them", + "At least 3 people have the Umbraco logo tattooed on them", "'Umbraco' is the danish name for an allen key", "Umbraco has been around since 2005, that's a looong time in IT", "More than 400 people from all over the world meet each year in Denmark in June for our annual conference CodeGarden", @@ -335,4 +335,4 @@ angular.module("umbraco.install").factory('installerService', function($rootScop }; return service; -}); \ No newline at end of file +}); From 181f7c1819d2182e8ea5734fcf1b9bd6cd58f9f2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 9 Jun 2015 18:19:26 +0200 Subject: [PATCH 2/6] Adds close button to the preview --- .../src/canvasdesigner/canvasdesigner.controller.js | 8 ++++++++ src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js index 477d1e5f5b..c0646fed0f 100644 --- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js @@ -35,6 +35,14 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider', $scope.previewDevice = device; }; + /*****************************************************************************/ + /* Exit Preview */ + /*****************************************************************************/ + + $scope.exitPreview = function () { + window.top.location.href = "/umbraco/endPreview.aspx?redir=%2f" + $scope.pageId; + }; + /*****************************************************************************/ /* UI designer managment */ /*****************************************************************************/ diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html index 3db48d1940..4bb059464d 100644 --- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html @@ -34,6 +34,9 @@ +
  • + +