From fc0fe61c2f85cd7cdc641448c1261bd89decb6f0 Mon Sep 17 00:00:00 2001 From: Rune Strand Date: Thu, 10 Dec 2015 14:49:13 +0100 Subject: [PATCH] Add ysodOverlay to listview and localized dialog buttons --- .../components/overlays/umboverlay.directive.js | 14 +++++++++++++- .../views/common/overlays/ysod/ysod.controller.js | 13 +++++++++++++ .../src/views/common/overlays/ysod/ysod.html | 15 +++++++++++++++ .../views/components/overlays/umb-overlay.html | 6 +++--- .../listview/listview.controller.js | 9 ++++++++- .../views/propertyeditors/listview/listview.html | 7 +++++++ src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 3 ++- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/no.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 1 + src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 1 + 24 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js index b9fae638ef..294e2767ac 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js @@ -7,7 +7,7 @@ (function() { 'use strict'; - function OverlayDirective($timeout, formHelper, overlayHelper) { + function OverlayDirective($timeout, formHelper, overlayHelper, localizationService) { function link(scope, el, attr, ctrl) { @@ -21,6 +21,8 @@ setView(); + setButtonText(); + registerOverlay(); modelCopy = makeModelCopy(scope.model); @@ -50,6 +52,15 @@ } + function setButtonText() { + if (!scope.model.closeButtonLabelKey && !scope.model.closeButtonLabel) { + scope.model.closeButtonLabel = localizationService.localize("general_close").then(function (value) {return value;}); + } + if (!scope.model.submitButtonLabelKey && !scope.model.submitButtonLabel) { + scope.model.submitButtonLabel = localizationService.localize("general_submit").then(function (value) {return value;}); + } + } + function registerOverlay() { overlayNumber = overlayHelper.registerOverlay(); @@ -234,6 +245,7 @@ scope.model = modelCopy; scope.model.close(scope.model); } else { + scope.model.show = false; scope.model = null; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js new file mode 100644 index 0000000000..89f490d0d8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js @@ -0,0 +1,13 @@ +angular.module("umbraco") + .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) { + + if (!$scope.model.title) { + $scope.model.title = "Received an error from the server"; + } + + if ($scope.model.data && $scope.model.data.StackTrace) { + //trim whitespace + $scope.model.data.StackTrace = $scope.model.data.StackTrace.trim(); + } + + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html new file mode 100644 index 0000000000..f28648a42a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html @@ -0,0 +1,15 @@ +
+ +

{{model.errorMsg}}

+

{{model.data.ExceptionMessage || model.data.Message}}

+ +
+
Exception Details:
+ {{model.data.ExceptionType}}: {{model.data.ExceptionMessage}} +
+ +
+
Stacktrace:
+ 
{{model.data.StackTrace}}
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html index eb4478e4e7..5e060b0919 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html @@ -21,10 +21,10 @@ -
+
- - + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index d499ad6142..fe5868c139 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -107,7 +107,14 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie //check if response is ysod if(err.status && err.status >= 500) { - dialogService.ysodDialog(err); + + // Open ysod overlay + $scope.ysodOverlay = { + view : "ysod", + errorMsg : err.errorMsg, + data : err.data, + show : true + }; } $timeout(function() { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index cd7a74c910..879471e6bc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -169,4 +169,11 @@ view="copyDialog.view"> + + +
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 2c6a71b8ea..17ef64c9ca 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -375,6 +375,7 @@ Zobrazit stránku při odeslání Rozměr Seřadit + Submit Typ Pro hledání pište... Nahoru diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 6baccf2680..e8f6ba6b89 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -389,6 +389,7 @@ Hvilken side skal vises efter at formularen er sendt Størrelse Sortér + Submit Type Skriv for at søge... Op diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 8e9bc9687c..9ed3e5c7ca 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -390,6 +390,7 @@ Seite beim Senden anzeigen Größe Sortieren + Submit Typ Durchsuchen ... nach oben diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index e4d7d8f4d6..18ee3aa54d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -404,6 +404,7 @@ Show page on Send Size Sort + Submit Type Type to search... Up 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 7cd3b28b59..94fa9b4cf6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -67,7 +67,7 @@ Select Select current folder - Do something else + Do something else Bold Cancel Paragraph Indent Insert form field @@ -404,6 +404,7 @@ Show page on Send Size Sort + Submit Type Type to search... Up diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index 801be4fc7a..89fe01519f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -393,6 +393,7 @@ Mostrar página al enviar Tamaño Ordenar + Submit Tipo Tipo que buscar... Arriba diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 667e5dc30f..370e4aabc0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -380,6 +380,7 @@ Afficher la page à l'envoi Taille Trier + Submit Type Rechercher... Haut diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index dbb17c9d58..3f98296ed3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -316,6 +316,7 @@ הצג עמוד בשליחה גודל סדר + Submit סוג הקלד לחיפוש... למעלה diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index d1a2761221..e5322a6b45 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -309,6 +309,7 @@ Mostra la pagina inviata Dimensione Ordina + Submit Tipo Su diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index 2087a7cb35..216877a80c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -394,6 +394,7 @@ 送信後にページを表示 サイズ 並べ替え + Submit 型 検索... 上 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 8d98f5cebd..463612f781 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -309,6 +309,7 @@ 전송된 페이지보기 사이즈 정렬 + Submit 타입 검색유형... 위로 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 6d0fdc3c80..2c01de8fc7 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -397,6 +397,7 @@ Toon pagina bij versturen Formaat Sorteren + Submit Type Type om te zoeken... Omhoog diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index bbd1edd4cc..b839146f77 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -319,6 +319,7 @@ Hvilken side skal vises etter at skjemaet er sendt Størrelse Sorter + Submit Type Søk... Opp diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index a56138fd2f..4426a682d0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -307,6 +307,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Pokaż stronę "wyślij" Rozmiar Sortuj + Submit Typ Szukaj W górę diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 19d4e97a62..fe89656dfc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -306,6 +306,7 @@ Mostrar página durante envio Tamanho Classificar + Submit Tipo Digite para buscar... Acima diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index 678a08659a..70eb37f6f8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -386,6 +386,7 @@ Показать страницу при отправке Размер Сортировать + Submit Тип Что искать? Вверх diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index 0f1f4d8b21..e81e9ccc13 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -378,6 +378,7 @@ Vilken sida skall visas när formuläret är skickat Storlek Sortera + Submit Skriv Skriv för att söka... Upp diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index 408d1c0194..5d5e123cc3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -349,6 +349,7 @@ 在发送时预览 大小 排序 + Submit 类型 输入内容开始查找… 上