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

Merge pull request #9545 from umbraco/v7/bugfix/9484

Browse Source 
Change dialog
This commit is contained in:
Warren Buckley
2020-12-14 11:43:54 +00:00
committed by GitHub
parent 289017a307 734d33fe1c
commit 3c610e7992
5 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
View File

@@ -228,9 +228,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
// Ask to re-enter preview mode?
const localizeVarsFallback = {
"returnToPreviewHeadline": "Preview content?",
"returnToPreviewDescription":"You have ended preview mode, do you want to continue previewing this content?",
"returnToPreviewButton":"Preview"
"returnToPreviewHeadline": "Preview website?",
"returnToPreviewDescription":"You have ended preview mode, do you want to enable it again to view the latest saved version of your website?",
"returnToPreviewAcceptButton":"Preview latest version",
"returnToPreviewDeclineButton":"View published version"
};
const umbLocalizedVars = Object.assign(localizeVarsFallback, $window.umbLocalizedVars);
@@ -333,10 +334,20 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
<div class="umbraco-preview-dialog__question">${umbLocalizedVars.returnToPreviewDescription}</div>`;
con.appendChild(modal);
var declineButton = document.createElement("button");
declineButton.type = "button";
declineButton.innerHTML = umbLocalizedVars.returnToPreviewDeclineButton;
declineButton.addEventListener("click", () => {
bodyEl.removeChild(fragment);
$scope.exitPreview();
hasPreviewDialog = false;
});
modal.appendChild(declineButton);
var continueButton = document.createElement("button");
continueButton.type = "button";
continueButton.className = "umbraco-preview-dialog__continue";
continueButton.innerHTML = umbLocalizedVars.returnToPreviewButton;
continueButton.innerHTML = umbLocalizedVars.returnToPreviewAcceptButton;
continueButton.addEventListener("click", () => {
bodyEl.removeChild(fragment);
reenterPreviewMode();

6
src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
View File

@@ -22,7 +22,8 @@
var OpenWebsiteTitle = textService.Localize("preview", "openWebsiteTitle");
var returnToPreviewHeadline = textService.Localize("preview", "returnToPreviewHeadline");
var returnToPreviewDescription = textService.Localize("preview", "returnToPreviewDescription");
var returnToPreviewButton = textService.Localize("preview", "returnToPreviewButton");
var returnToPreviewAcceptButton = textService.Localize("preview", "returnToPreviewAcceptButton");
var returnToPreviewDeclineButton = textService.Localize("preview", "returnToPreviewDeclineButton");
}
<!DOCTYPE html>
<html lang="en">
@@ -39,7 +40,8 @@
window.umbLocalizedVars = {
'returnToPreviewHeadline': '@returnToPreviewHeadline',
'returnToPreviewDescription':'@returnToPreviewDescription',
'returnToPreviewButton':'@returnToPreviewButton'
'returnToPreviewAcceptButton':'@returnToPreviewAcceptButton',
'returnToPreviewDeclineButton':'@returnToPreviewDeclineButton'
};
</script>
</head>

5
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -1873,8 +1873,9 @@ Mange hilsner fra Umbraco robotten
<key alias="openWebsiteLabel">Vis i nyt vindue</key>
<key alias="openWebsiteTitle">Åben forhåndsvisning i nyt vindue</key>
<key alias="returnToPreviewHeadline">Forhåndsvisning af indholdet?</key>
<key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du se dette indhold i forhåndsvisning?</key>
<key alias="returnToPreviewButton">Fortsæt</key>
<key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at se seneste gemte version af indholdet?</key>
<key alias="returnToPreviewButton">Start forhåndsvisning</key>
<key alias="returnToPreviewDeclineButton">Se udgivet indhold</key>
<key alias="viewPublishedContentHeadline">Se udgivet indhold?</key>
<key alias="viewPublishedContentDescription">Du er i forhåndsvisning, vil du afslutte for at se den udgivet version?</key>
<key alias="viewPublishedContentAcceptButton">Se udgivet version</key>

7
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -2531,9 +2531,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="endTitle">End preview mode</key>
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview content?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
<key alias="returnToPreviewButton">Preview</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>
<key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
<key alias="viewPublishedContentAcceptButton">View published version</key>

7
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -2553,9 +2553,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="endTitle">End preview mode</key>
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview content?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
<key alias="returnToPreviewButton">Preview</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>
<key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
<key alias="viewPublishedContentAcceptButton">View published version</key>