Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker

# Conflicts: # src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js # src/Umbraco.Web.UI.Client/src/less/sections.less
2020-03-11 12:00:19 +01:00
parent 92aabf6bc4 007fe8d894
commit d4dae19888
175 changed files with 2192 additions and 835 deletions
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -29,13 +29,13 @@
            @* a single image *@
            if (media.IsDocumentType("Image"))
            {
-                @Render(media);
+                @Render(media)
            }

            @* a folder with images under it *@
            foreach (var image in media.Children())
            {
-                @Render(image);
+                @Render(image)
            }
        }
    </div>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -81,7 +81,7 @@
    <key alias="save">Uložit</key>
    <key alias="saveAndPublish">Uložit a publikovat</key>
    <key alias="saveToPublish">Uložit a odeslat ke schválení</key>
-    <key alias="showPage">Náhled</key>
+    <key alias="saveAndPreview">Náhled</key>
    <key alias="showPageDisabled">Náhled je deaktivován, protože není přiřazena žádná šablona</key>
    <key alias="styleChoose">Vybrat styl</key>
    <key alias="styleShow">Zobrazit styly</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -139,7 +139,7 @@
    <key alias="saveToPublish">Gem og send til udgivelse</key>
    <key alias="saveListView">Gem listevisning</key>
    <key alias="schedulePublish">Planlæg</key>
-    <key alias="showPage">Forhåndsvisning</key>
+    <key alias="saveAndPreview">Forhåndsvisning</key>
    <key alias="showPageDisabled">Forhåndsvisning er deaktiveret fordi der ikke er nogen skabelon tildelt</key>
    <key alias="styleChoose">Vælg formattering</key>
    <key alias="styleShow">Vis koder</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -140,7 +140,7 @@
    <key alias="saveToPublish">Speichern und zur Abnahme übergeben</key>
    <key alias="saveListView">Listenansicht sichern</key>
    <key alias="schedulePublish">Veröffentlichung planen</key>
-    <key alias="showPage">Vorschau</key>
+    <key alias="saveAndPreview">Vorschau</key>
    <key alias="showPageDisabled">Die Vorschaufunktion ist deaktiviert, da keine Vorlage zugewiesen ist</key>
    <key alias="styleChoose">Stil auswählen</key>
    <key alias="styleShow">Stil anzeigen</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -141,7 +141,7 @@
    <key alias="saveToPublish">Save and send for approval</key>
    <key alias="saveListView">Save list view</key>
    <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
+    <key alias="saveAndPreview">Save and preview</key>
    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
    <key alias="styleChoose">Choose style</key>
    <key alias="styleShow">Show styles</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -139,7 +139,7 @@
    <key alias="saveToPublish">Send for approval</key>
    <key alias="saveListView">Save list view</key>
    <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
+    <key alias="saveAndPreview">Save and preview</key>
    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
    <key alias="styleChoose">Choose style</key>
    <key alias="styleShow">Show styles</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -124,7 +124,7 @@
    <key alias="saveAndPublish">Guardar y publicar</key>
    <key alias="saveToPublish">Guardar y enviar para aprobación</key>
    <key alias="saveListView">Guardar vista de lista</key>
-    <key alias="showPage">Previsualizar</key>
+    <key alias="saveAndPreview">Previsualizar</key>
    <key alias="showPageDisabled">La previsualización está deshabilitada porque no hay ninguna plantilla asignada</key>
    <key alias="styleChoose">Elegir estilo</key>
    <key alias="styleShow">Mostrar estilos</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -124,7 +124,7 @@
    <key alias="saveAndSchedule">Sauver et planifier</key>
    <key alias="saveToPublish">Sauver et envoyer pour approbation</key>
    <key alias="saveListView">Sauver la mise en page de la liste</key>
-    <key alias="showPage">Prévisualiser</key>
+    <key alias="saveAndPreview">Prévisualiser</key>
    <key alias="showPageDisabled">La prévisualisation est désactivée car aucun modèle n'a été assigné.</key>
    <key alias="styleChoose">Choisir un style</key>
    <key alias="styleShow">Afficher les styles</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -68,7 +68,7 @@
    <key alias="save">שמור</key>
    <key alias="saveAndPublish">שמור ופרסם</key>
    <key alias="saveToPublish">שמור ושלח לאישור</key>
-    <key alias="showPage">תצוגה מקדימה</key>
+    <key alias="saveAndPreview">תצוגה מקדימה</key>
    <key alias="styleChoose">בחר עיצוב</key>
    <key alias="styleShow">הצג עיצוב</key>
    <key alias="tableInsert">הוספת טבלה</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -69,7 +69,7 @@
    <key alias="save">Salva</key>
    <key alias="saveAndPublish">Salva e pubblica</key>
    <key alias="saveToPublish">Salva e invia per approvazione</key>
-    <key alias="showPage">Anteprima</key>
+    <key alias="saveAndPreview">Anteprima</key>
    <key alias="showPageDisabled"><![CDATA[L'anteprima è disabilitata dato che non è stato assegnato alcun template]]></key>
    <key alias="styleChoose">Scegli lo stile</key>
    <key alias="styleShow">Mostra gli stili</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -85,7 +85,7 @@
    <key alias="saveAndPublish">保存及び公開</key>
    <key alias="saveToPublish">保存して承認に送る</key>
    <key alias="saveListView">リスト ビューの保存</key>
-    <key alias="showPage">プレビュー</key>
+    <key alias="saveAndPreview">プレビュー</key>
    <key alias="showPageDisabled">テンプレートが指定されていないのでプレビューは無効になっています</key>
    <key alias="styleChoose">スタイルの選択</key>
    <key alias="styleShow">スタイルの表示</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -67,7 +67,7 @@
    <key alias="save">저장</key>
    <key alias="saveAndPublish">저장 후 발행</key>
    <key alias="saveToPublish">저장 후 승인을 위해 전송</key>
-    <key alias="showPage">미리보기</key>
+    <key alias="saveAndPreview">미리보기</key>
    <key alias="styleChoose">스타일 선택</key>
    <key alias="styleShow">스타일 보기</key>
    <key alias="tableInsert">테이블 삽입</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -83,7 +83,7 @@
    <key alias="saveAndPublish">Lagre og publiser</key>
    <key alias="saveAndSchedule">Lagre og planlegge</key>
    <key alias="saveToPublish">Lagre og send til publisering</key>
-    <key alias="showPage">Forhåndsvis</key>
+    <key alias="saveAndPreview">Forhåndsvis</key>
    <key alias="showPageDisabled">Forhåndsvisning er deaktivert siden det ikke er angitt noen mal</key>
    <key alias="styleChoose">Velg formattering</key>
    <key alias="styleShow">Vis stiler</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -90,7 +90,7 @@
    <key alias="saveAndPublish">Opslaan en publiceren</key>
    <key alias="saveToPublish">Opslaan en verzenden voor goedkeuring</key>
    <key alias="saveListView">Sla list view op</key>
-    <key alias="showPage">voorbeeld bekijken</key>
+    <key alias="saveAndPreview">voorbeeld bekijken</key>
    <key alias="showPageDisabled">Voorbeeld bekijken is uitgeschakeld omdat er geen template is geselecteerd</key>
    <key alias="styleChoose">Stijl kiezen</key>
    <key alias="styleShow">Stijlen tonen</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -121,7 +121,7 @@
    <key alias="saveAndPublish">Zapisz i publikuj</key>
    <key alias="saveToPublish">Zapisz i wyślij do zaakceptowania</key>
    <key alias="saveListView">Zapisz widok listy</key>
-    <key alias="showPage">Podgląd</key>
+    <key alias="saveAndPreview">Podgląd</key>
    <key alias="showPageDisabled">Podgląd jest wyłączony, ponieważ żaden szablon nie został przydzielony</key>
    <key alias="styleChoose">Wybierz styl</key>
    <key alias="styleShow">Pokaż style</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
@@ -67,7 +67,7 @@
    <key alias="save">Salvar</key>
    <key alias="saveAndPublish">Salvar e publicar</key>
    <key alias="saveToPublish">Salvar e mandar para aprovação</key>
-    <key alias="showPage">Prévia</key>
+    <key alias="saveAndPreview">Prévia</key>
    <key alias="styleChoose">Escolha estilo</key>
    <key alias="styleShow">Mostrar estilos</key>
    <key alias="tableInsert">Inserir tabela</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -155,7 +155,7 @@
    <key alias="saveToPublish">Направить на публикацию</key>
    <key alias="saveListView">Сохранить список</key>
    <key alias="select">Выбрать</key>
-    <key alias="showPage">Предварительный просмотр</key>
+    <key alias="saveAndPreview">Предварительный просмотр</key>
    <key alias="showPageDisabled">Предварительный просмотр запрещен, так как документу не сопоставлен шаблон</key>
    <key alias="somethingElse">Другие действия</key>
    <key alias="styleChoose">Выбрать стиль</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -134,7 +134,7 @@
    <key alias="saveToPublish">Spara och skicka för godkännande</key>
    <key alias="schedulePublish">Schemaläggning</key>
    <key alias="select">Välj</key>
-    <key alias="showPage">Förhandsgranska</key>
+    <key alias="saveAndPreview">Förhandsgranska</key>
    <key alias="showPageDisabled">Förhandsgranskning är avstängt på grund av att det inte finns någon mall tilldelad</key>
    <key alias="somethingElse">Ångra</key>
    <key alias="styleChoose">Välj stil</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -85,7 +85,7 @@
    <key alias="save">Kaydet</key>
    <key alias="saveAndPublish">Kaydet ve Yayınla</key>
    <key alias="saveToPublish">Kaydet ve Onay için gönder</key>
-    <key alias="showPage">Önizle</key>
+    <key alias="saveAndPreview">Önizle</key>
    <key alias="showPageDisabled">Önizleme kapalı, Atanmış şablon yok</key>
    <key alias="styleChoose">Stili seçin</key>
    <key alias="styleShow">Stilleri Göster</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -90,7 +90,7 @@
    <key alias="saveAndPublish">保存并发布</key>
    <key alias="saveToPublish">保存并提交审核</key>
    <key alias="saveListView">保存列表视图</key>
-    <key alias="showPage">预览</key>
+    <key alias="saveAndPreview">预览</key>
    <key alias="showPageDisabled">因未设置模板无法预览</key>
    <key alias="styleChoose">选择样式</key>
    <key alias="styleShow">显示样式</key>
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -87,7 +87,7 @@
    <key alias="saveAndPublish">保存並發佈</key>
    <key alias="saveToPublish">保存並提交審核</key>
    <key alias="saveListView">保存清單檢視</key>
-    <key alias="showPage">預覽</key>
+    <key alias="saveAndPreview">預覽</key>
    <key alias="showPageDisabled">因未設置範本無法預覽</key>
    <key alias="styleChoose">選擇樣式</key>
    <key alias="styleShow">顯示樣式</key>
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
@@ -2,31 +2,31 @@
@using Umbraco.Web.Templates
@using Newtonsoft.Json.Linq

-@* 
+@*
    Razor helpers located at the bottom of this file
 *@

@if (Model != null && Model.sections != null)
 {
    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
-    
+
    <div class="umb-grid">
        @if (oneColumn)
        {
            foreach (var section in Model.sections) {
                <div class="grid-section">
                    @foreach (var row in section.rows) {
-                        @renderRow(row);
+                        @renderRow(row)
                    }
                </div>
-            }   
-        }else { 
+            }
+        }else {
            <div class="row clearfix">
                @foreach (var s in Model.sections) {
                    <div class="grid-section">
                        <div class="col-md-@s.grid column">
                            @foreach (var row in s.rows) {
-                                @renderRow(row);
+                                @renderRow(row)
                            }
                        </div>
                    </div>
@@ -85,4 +85,4 @@

        return new MvcHtmlString(string.Join(" ", attrs));
    }
-}
+}
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -12,7 +12,7 @@
            foreach (var section in Model.sections) {
                <div class="grid-section">
                    @foreach (var row in section.rows) {
-                        @renderRow(row, true);
+                        @renderRow(row, true)
                    }
                </div>
            }
@@ -23,7 +23,7 @@
                        <div class="grid-section">
                            <div class="col-md-@s.grid column">
                                @foreach (var row in s.rows) {
-                                    @renderRow(row, false);
+                                    @renderRow(row, false)
                                }
                            </div>
                        </div>
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
@@ -2,20 +2,24 @@
@using Umbraco.Web.Templates

@if (Model.value != null)
-{   
+{
    var url = Model.value.image;
    if(Model.editor.config != null && Model.editor.config.size != null){
-        url += "?width=" + Model.editor.config.size.width;
-        url += "&height=" + Model.editor.config.size.height;
-
-        if(Model.value.focalPoint != null){
-            url += "&center=" + Model.value.focalPoint.top +"," + Model.value.focalPoint.left;
-            url += "&mode=crop";
-        }
+        url = ImageCropperTemplateExtensions.GetCropUrl(url,
+            width: Model.editor.config.size.width,
+            height: Model.editor.config.size.height,
+            cropDataSet: Model.value.focalPoint == null ? null : new Umbraco.Core.PropertyEditors.ValueConverters.ImageCropperValue
+            {
+                FocalPoint = new Umbraco.Core.PropertyEditors.ValueConverters.ImageCropperValue.ImageCropperFocalPoint
+                {
+                    Top = Model.value.focalPoint.top,
+                    Left = Model.value.focalPoint.left
+                }
+            });
    }

    var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
-    
+
    <img src="@url" alt="@altText">
    
    if (Model.value.caption != null)