diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml index dd7acc1372..8d864b437b 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml @@ -25,7 +25,9 @@
- +

Welcome to your Umbraco installation

You're seeing this wonderful page because your website doesn't contain any published content yet.

diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs index e209e45cc4..f08ab2abe5 100644 --- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs @@ -152,8 +152,9 @@ public class ContentSettings internal const string StaticMacroErrors = "Inline"; internal const string StaticDisallowedUploadFiles = "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,xamlx"; internal const bool StaticShowDeprecatedPropertyEditors = false; - internal const string StaticLoginBackgroundImage = "assets/img/login.svg"; - internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_white.svg"; + internal const string StaticLoginBackgroundImage = "assets/img/login.jpg"; + internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_blue.svg"; + internal const string StaticLoginLogoImageAlternative = "assets/img/application/umbraco_logo_blue.svg"; internal const bool StaticHideBackOfficeLogo = false; internal const bool StaticDisableDeleteWhenReferenced = false; internal const bool StaticDisableUnpublishWhenReferenced = false; @@ -219,11 +220,21 @@ public class ContentSettings public string LoginBackgroundImage { get; set; } = StaticLoginBackgroundImage; /// - /// Gets or sets a value for the path to the login screen logo image. + /// Gets or sets a value for the path to the login screen logo image + /// shown on top of the background image set in . /// + /// The alternative version of this logo can be found at . [DefaultValue(StaticLoginLogoImage)] public string LoginLogoImage { get; set; } = StaticLoginLogoImage; + /// + /// Gets or sets a value for the path to the login screen logo image when shown on top + /// of a light background (e.g. in mobile resolutions). + /// + /// This is the alternative version to the regular logo found at . + [DefaultValue(StaticLoginLogoImageAlternative)] + public string LoginLogoImageAlternative { get; set; } = StaticLoginLogoImageAlternative; + /// /// Gets or sets a value indicating whether to hide the backoffice umbraco logo or not. /// diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml index d7093a2ba5..91778b28d4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/bs.xml @@ -1051,13 +1051,13 @@ Da upravljate svojom web lokacijom, jednostavno otvorite Umbraco backoffice i po Obnovite sada da sačuvate svoj rad - Sretna super nedelja - Sretan divan ponedeljak - Sretan specifičan utorak - Sretna divna srijeda - Sretan gromoglasan četvrtak - Sretan zanimljiv petak - Sretna opuštena subota + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli Prijavite se ispod Prijavite se sa Isteklo je vrijeme sesije diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml index 347f963e70..ae768926d4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml @@ -871,13 +871,13 @@ Obnovte nyní pro uložení práce - Šťastnou super neděli - Šťastné šílené pondělí - Šťastné husté úterý - Šťastnou překrásnou středu - Šťastný bouřlivý čtvrtek - Šťastný bláznivý pátek - Šťastnou kočkobotu + Vítejte + Vítejte + Vítejte + Vítejte + Vítejte + Vítejte + Vítejte přihlašte se níže Přihlásit se pomocí Relace vypršela diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml index 86520b6d03..1e76e92382 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml @@ -596,7 +596,7 @@ Ni ellir ailadeiladu'r mynegai hwn oherwydd nad yw wedi'i aseinio IIndexPopulator - + Cynnwys yn y mynegai Ni ddarganfuwyd unrhyw ganlyniadau Dangos %0% - %1% o %2% canlyniad(au) - Tudalen %3% o %4% @@ -1051,13 +1051,13 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang Adnewyddwch rwan er mwyn achub eich gwaith - Dydd Sul Swmpus - Dydd Llun Llwyddiannus - Dydd Mawrth Moethus - Dydd Mercher Melys - Dydd Iau Iachus - Dydd Gwener Gwych - Dydd Sadwrn Syfrdannus + Croeso + Croeso + Croeso + Croeso + Croeso + Croeso + Croeso Mewngofnodwch isod Mewngofnodwch gyda Sesiwn wedi cyrraedd terfyn amser diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index 3e01c0de9b..d8623a90a7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -480,7 +480,7 @@ Rediger ordbogsnøgle Rediger sprog Rediger det valgte medie - Edit webhook + Edit webhook Indsæt lokalt link Indsæt tegn Indsæt grafisk overskrift @@ -1024,13 +1024,13 @@ Forny for at gemme dine ændringer - Så er det søndag! - Smil, det er mandag! - Hurra, det er tirsdag! - Hvilken herlig onsdag! - Glædelig torsdag! - Endelig fredag! - Glædelig lørdag + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen Log ind nedenfor Log ind med Din session er udløbet diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml index 1dce3c2997..32158c85d3 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml @@ -1054,13 +1054,13 @@ Erneuern Sie, um Ihre Arbeit zu speichern ... - Einen wunderbaren Sonntag - Schönen Montag - Einen großartigen Dienstag - Wunderbaren Mittwoch - Donnerwetter Donnerstag - Frohen freundlichen Freitag - Wunderbaren sonnigen Samstag + Willkommen + Willkommen + Willkommen + Willkommen + Willkommen + Willkommen + Willkommen Hier anmelden: Anmelden mit Sitzung abgelaufen diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 3c7bb7b5ca..572fe05dd4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -1067,13 +1067,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Renew now to save your work - Happy super Sunday - Happy marvelous Monday - Happy tubular Tuesday - Happy wonderful Wednesday - Happy thunderous Thursday - Happy funky Friday - Happy Caturday + Welcome + Welcome + Welcome + Welcome + Welcome + Welcome + Welcome Log in below Sign in with Session timed out diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index ed1b923d66..33901735ee 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -1096,13 +1096,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Renew now to save your work - Happy super Sunday - Happy marvelous Monday - Happy tubular Tuesday - Happy wonderful Wednesday - Happy thunderous Thursday - Happy funky Friday - Happy Caturday + Welcome + Welcome + Welcome + Welcome + Welcome + Welcome + Welcome Log in below Sign in with Session timed out diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml index 25f183433a..6a963ceb83 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml @@ -672,13 +672,13 @@ Renovar tu sesión para guardar sus cambios - Feliz super domingo - Feliz lunes - Tremendo martes - Maravilloso miércoles - Fantástico jueves - ¡Ya es viernes! - Resplandeciente sábado + Bienvenido + Bienvenido + Bienvenido + Bienvenido + Bienvenido + Bienvenido + Bienvenido Iniciar sesión La sesión ha caducado © 2001 - %0%
umbraco.com

]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml index a753a054fe..b30dba4a69 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml @@ -892,13 +892,13 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Renouvellez votre session maintenant pour sauvegarder votre travail - Joyeux dimanche détonnant - Joyeux lundi lumineux - Joyeux mardi magique - Joyeux mercredi merveilleux - Joyeux jeudi - Joyeux vendredi - Joyeux chamedi + Bienvenue + Bienvenue + Bienvenue + Bienvenue + Bienvenue + Bienvenue + Bienvenue Connectez-vous ci-dessous Identifiez-vous avec La session a expiré diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml index f0427bbae1..0dbb523dfe 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml @@ -453,6 +453,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont יש לבצע חידוש פעילות על מנת לשמור על התוכן + ברוכים הבאים + ברוכים הבאים + ברוכים הבאים + ברוכים הבאים + ברוכים הבאים + ברוכים הבאים + ברוכים הבאים © 2001 - %0%
umbraco.com

]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml index 51847f3585..920d0be232 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/hr.xml @@ -1041,13 +1041,13 @@ Da bi upravljali svojom web lokacijom, jednostavno otvorite Umbraco backoffice i Obnovite sada da sačuvate svoj rad - Sretna super nedelja - Sretan divan ponedeljak - Sretan specifičan utorak - Sretna divna srijeda - Sretan gromoglasan četvrtak - Sretan zanimljiv petak - Sretna opuštena subota + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli + Dobrodošli Prijavite se u nastavku Prijav sa Isteklo je vrijeme sesije diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml index 7c57a290fe..474600483d 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml @@ -1074,13 +1074,13 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Riconnetti adesso per salvare il tuo lavoro - - - - - - - + Benvenuto + Benvenuto + Benvenuto + Benvenuto + Benvenuto + Benvenuto + Benvenuto Fai il login qui sotto Fai il login con Sessione scaduta diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml index 9a94e7d924..b26b545159 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml @@ -568,13 +568,13 @@ Runwayをインストールして作られた新しいウェブサイトがど 作業を保存して今すぐ更新 - ハッピー スーパー日曜日 - ハッピー マニアック月曜日 - ハッピー最高の火曜日 - ハッピー ワンダフル水曜日 - ハッピー サンダー木曜日 - ハッピー ファンキー金曜日 - ハッピー土曜日 + ようこそ + ようこそ + ようこそ + ようこそ + ようこそ + ようこそ + ようこそ ウェブサイトにログインします。 セッションタイムアウトしました。 © 2001 - %0%
umbraco.org

]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml index 4aa0d4ad89..9e799e122d 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml @@ -441,6 +441,13 @@ TRANSLATE ME: 'Renew now to save your work' + 환영합니다 + 환영합니다 + 환영합니다 + 환영합니다 + 환영합니다 + 환영합니다 + 환영합니다 © 2001 - %0%
umbraco.com

]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml index c2784b3a9c..9e8ea05c3c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml @@ -474,13 +474,13 @@ Forny innlogging for å lagre - Da er det søndag! - Smil, det er mandag! - Hurra, det er tirsdag! - For en herlig onsdag! - Gledelig torsdag! - Endelig fredag! - Gledelig lørdag + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen + Velkommen Logg på nedenfor Logg på med Din sesjon er utløpt diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml index 600a1724c1..1048a17577 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml @@ -978,13 +978,13 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Vernieuw je sessie om je wijzigingen te behouden - Fijne super zondag - Fijne manische maandag - Fijne dinsdag - Fijne geweldige woensdag - Fijne donderende donderdag - Fijne funky vrijdag - Fijne zaterdag + Welkom + Welkom + Welkom + Welkom + Welkom + Welkom + Welkom log hieronder in Inloggen met Sessie is verlopen diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml index 53aa716792..e4e7c53973 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml @@ -683,13 +683,13 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych Umb Wznów sesję teraz, aby zapisać swoją pracę - Szczęśliwej super niedzieli - Szczęśliwego maniakalnego poniedziałku - Szczęśliwego świetnego wtorku - Szczęśliwej niesamowitej środy - Szczęśliwego wyjątkowego czwartku - Szczęśliwego odjechanego piątku - Szczęśliwej cudownej soboty + Witaj + Witaj + Witaj + Witaj + Witaj + Witaj + Witaj Zaloguj się poniżej Zaloguj się z Sesja wygasła diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml index 29ae77a2d8..d806f77489 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml @@ -435,6 +435,13 @@ Pressione "próximo" para iniciar o assistente.]]> Renovar agora para salvar seu trabalho + Bem Vindo(a) + Bem Vindo(a) + Bem Vindo(a) + Bem Vindo(a) + Bem Vindo(a) + Bem Vindo(a) + Bem Vindo(a) © 2001 - %0%
umbraco.com

]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml index b6d8a4a6b8..1b0021ad20 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml @@ -806,13 +806,13 @@ © 2001 - %0%
umbraco.com

]]> - Сегодня же выходной! - Понедельник — день тяжелый... - Вот уже вторник... - Берегите окружающую среду - Рыбный день - Слава Богу, сегодня пятница! - Понедельник начинается в субботу + Добро пожаловать + Добро пожаловать + Добро пожаловать + Добро пожаловать + Добро пожаловать + Добро пожаловать + Добро пожаловать Укажите имя пользователя и пароль Время сессии истекло Забыли пароль? diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml index 966089415a..2e81fa2159 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml @@ -114,7 +114,7 @@ %1% mer.]]> - %1% för många.]]> + %1% för många.]]> %0%]]> @@ -223,7 +223,7 @@ Publicerad (osparade ändringar) Inga undernoder har lagts till Inga ändringar har gjorts - Ej skapad + Ej skapad Ja, ta bort @@ -636,13 +636,13 @@ © 2001 - %0%
umbraco.com

]]> - Happy super Sunday - Happy manic Monday - Happy tremendous Tuesday - Happy wonderful Wednesday - Happy thunderous Thursday - Happy friendly Friday - Happy shiny Saturday + Välkommen + Välkommen + Välkommen + Välkommen + Välkommen + Välkommen + Välkommen Logga in nedan Logga in med Sessionen har nått sin maxgräns diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml index 1e1504f44a..8a2cd8c586 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml @@ -937,13 +937,13 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey Çalışmanızı kaydetmek için şimdi yenileyin - Mutlu Pazarlar - Mutlu manik Pazartesi - Mutlu salı günleri - Harika Çarşamba Günleri - Mutlu, gök gürültülü Perşembe - Mutlu Cuma Günü - Mutlu Yıllar + Hoş geldiniz + Hoş geldiniz + Hoş geldiniz + Hoş geldiniz + Hoş geldiniz + Hoş geldiniz + Hoş geldiniz Aşağıda oturum açın ile oturum açın Oturum zaman aşımına uğradı diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml index 599bd77426..ed59ec435e 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ua.xml @@ -806,13 +806,13 @@ © 2001 - %0%
umbraco.com

]]> - Сьогодні ж вихідний! - Гарного і продуктивного понеділка - Ось уже вівторок... - Бережіть довкілля - Скоро п'ятниця - Слава Богу, сьогодні п'ятниця! - Понеділок починається у суботу + Вітаємо + Вітаємо + Вітаємо + Вітаємо + Вітаємо + Вітаємо + Вітаємо Вкажіть ім'я користувача та пароль Час сесії закінчився Забули пароль? diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml index 83ea263a97..e7d9fcac97 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml @@ -588,13 +588,13 @@ 已更新，继续工作。 - 星期一快乐 - 星期二快乐 - 星期三快乐 - 星期四快乐 - 星期五快乐 - 星期六快乐 - 星期天快乐 + 欢迎 + 欢迎 + 欢迎 + 欢迎 + 欢迎 + 欢迎 + 欢迎 在下方登录 登录 会话超时 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml index d334178766..601e59edc1 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml @@ -579,13 +579,13 @@ 已更新，繼續工作。 - 超級星期天快樂 - 瘋狂星期一快樂 - 熱鬧星期二快樂 - 美妙星期三快樂 - 悅耳星期四快樂 - 時髦星期五快樂 - 喵喵星期六快樂 + 歡迎 + 歡迎 + 歡迎 + 歡迎 + 歡迎 + 歡迎 + 歡迎 下方登入 登入使用 連線時間過了 diff --git a/src/Umbraco.Core/Services/OperationStatus/WebhookOperationStatus.cs b/src/Umbraco.Core/Services/OperationStatus/WebhookOperationStatus.cs index c0514aea69..adf4badabf 100644 --- a/src/Umbraco.Core/Services/OperationStatus/WebhookOperationStatus.cs +++ b/src/Umbraco.Core/Services/OperationStatus/WebhookOperationStatus.cs @@ -5,4 +5,5 @@ public enum WebhookOperationStatus Success, CancelledByNotification, NotFound, + NoEvents, } diff --git a/src/Umbraco.Core/Services/WebhookService.cs b/src/Umbraco.Core/Services/WebhookService.cs index 1f707606b5..08383b3c9d 100644 --- a/src/Umbraco.Core/Services/WebhookService.cs +++ b/src/Umbraco.Core/Services/WebhookService.cs @@ -20,9 +20,25 @@ public class WebhookService : IWebhookService _eventMessagesFactory = eventMessagesFactory; } + private WebhookOperationStatus ValidateWebhook(Webhook webhook) + { + if (webhook.Events.Length <= 0) + { + return WebhookOperationStatus.NoEvents; + } + + return WebhookOperationStatus.Success; + } + /// public async Task> CreateAsync(Webhook webhook) { + WebhookOperationStatus validationResult = ValidateWebhook(webhook); + if (validationResult is not WebhookOperationStatus.Success) + { + return Attempt.FailWithStatus(validationResult, webhook); + } + using ICoreScope scope = _provider.CreateCoreScope(); EventMessages eventMessages = _eventMessagesFactory.Get(); @@ -45,6 +61,12 @@ public class WebhookService : IWebhookService /// public async Task> UpdateAsync(Webhook webhook) { + WebhookOperationStatus validationResult = ValidateWebhook(webhook); + if (validationResult is not WebhookOperationStatus.Success) + { + return Attempt.FailWithStatus(validationResult, webhook); + } + using ICoreScope scope = _provider.CreateCoreScope(); Webhook? currentWebhook = await _webhookRepository.GetAsync(webhook.Key); diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index cc517ba178..c3ab60f059 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -269,6 +269,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers "imageFileTypes", "loginBackgroundImage", "loginLogoImage", + "loginLogoImageAlternative", "canSendRequiredEmail", "usernameIsEmail", "hideBackofficeLogo", @@ -619,6 +620,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers {"allowPasswordReset", _securitySettings.AllowPasswordReset}, {"loginBackgroundImage", _contentSettings.LoginBackgroundImage}, {"loginLogoImage", _contentSettings.LoginLogoImage }, + {"loginLogoImageAlternative", _contentSettings.LoginLogoImageAlternative }, {"hideBackofficeLogo", _contentSettings.HideBackOfficeLogo }, {"disableDeleteWhenReferenced", _contentSettings.DisableDeleteWhenReferenced }, {"disableUnpublishWhenReferenced", _contentSettings.DisableUnpublishWhenReferenced }, diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs index 38231740ba..f37031d841 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs @@ -69,6 +69,7 @@ public class EntityController : UmbracoAuthorizedJsonController private readonly AppCaches _appCaches; private readonly IDynamicRootService _dynamicRootService; + private readonly IVariationContextAccessor _variationContextAccessor; private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor; private readonly IContentService _contentService; private readonly IContentTypeService _contentTypeService; @@ -111,7 +112,8 @@ public class EntityController : UmbracoAuthorizedJsonController IUserService userService, ILocalizationService localizationService, AppCaches appCaches, - IDynamicRootService dynamicRootService) + IDynamicRootService dynamicRootService, + IVariationContextAccessor variationContextAccessor) { _treeService = treeService ?? throw new ArgumentNullException(nameof(treeService)); _treeSearcher = treeSearcher ?? throw new ArgumentNullException(nameof(treeSearcher)); @@ -139,6 +141,7 @@ public class EntityController : UmbracoAuthorizedJsonController _localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService)); _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches)); _dynamicRootService = dynamicRootService; + _variationContextAccessor = variationContextAccessor; } [Obsolete("Use non-obsolete ctor. This will be removed in Umbraco 14.")] @@ -183,7 +186,8 @@ public class EntityController : UmbracoAuthorizedJsonController userService, localizationService, appCaches, - StaticServiceProvider.Instance.GetRequiredService()) + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService()) { } @@ -587,6 +591,8 @@ public class EntityController : UmbracoAuthorizedJsonController public DynamicRoot Query { get; set; } = null!; public int CurrentId { get; set; } + public string? CurrentCulture { get; set; } + public string? CurrentSegment { get; set; } public int ParentId { get; set; } } @@ -617,6 +623,8 @@ public class EntityController : UmbracoAuthorizedJsonController AnyOfDocTypeKeys = x.AnyOfDocTypeKeys }) }; + + _variationContextAccessor.VariationContext = new VariationContext(model.CurrentCulture, model.CurrentSegment); var startNodes = (await _dynamicRootService.GetDynamicRootsAsync(startNodeSelector)).ToArray(); Guid? first = startNodes.Any() ? startNodes.First() : null; diff --git a/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs b/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs index 61f583d8eb..336237dc07 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs @@ -102,6 +102,11 @@ public class WebhookController : UmbracoAuthorizedJsonController new("Cancelled by notification", "The operation was cancelled by a notification", NotificationStyle.Error), })), WebhookOperationStatus.NotFound => NotFound("Could not find the webhook"), + WebhookOperationStatus.NoEvents => ValidationProblem(new SimpleNotificationModel(new BackOfficeNotification[] + { + new("No events", "The webhook does not have any events", NotificationStyle.Error), + })), _ => StatusCode(StatusCodes.Status500InternalServerError), + }; } diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs index 8117007986..32261eefef 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs @@ -7,7 +7,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security; /// public class BackOfficeExternalLoginProviderOptions { - private string _buttonStyle = "btn-openid"; + private string _buttonStyle = string.Empty; public BackOfficeExternalLoginProviderOptions( string buttonStyle, @@ -30,8 +30,11 @@ public class BackOfficeExternalLoginProviderOptions } /// - /// Gets or sets the icon to use for the login button. + /// Gets or sets the style of the login button. /// + /// + /// The default look is an outlined button, which has been optimized for the login screen. + /// [Obsolete("This is no longer used and will be removed in V15. Please set the ButtonLook and ButtonColor properties instead.")] public string ButtonStyle { @@ -71,12 +74,18 @@ public class BackOfficeExternalLoginProviderOptions /// Gets or sets the look to use for the login button. /// See the UUI documentation for more details: https://uui.umbraco.com/?path=/story/uui-button--looks-and-colors. /// + /// + /// The default value is , which has been optimized for the login screen. + /// public UuiButtonLook ButtonLook { get; set; } = UuiButtonLook.Outline; /// /// Gets or sets the color to use for the login button. /// See the UUI documentation for more details: https://uui.umbraco.com/?path=/story/uui-button--looks-and-colors. /// + /// + /// The default value is , which has been optimized for the login screen. + /// public UuiButtonColor ButtonColor { get; set; } = UuiButtonColor.Default; /// diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 242cada36e..ef62c3310c 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -39,7 +39,7 @@ "ng-file-upload": "12.2.13", "nouislider": "15.7.1", "spectrum-colorpicker2": "2.0.10", - "tinymce": "6.7.1", + "tinymce": "6.7.3", "typeahead.js": "0.11.1", "underscore": "1.13.6", "wicg-inert": "3.1.2" @@ -16606,9 +16606,9 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "node_modules/tinymce": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.1.tgz", - "integrity": "sha512-SIGJgWk2d/X59VbO+i81QfNx2EP1P5t+sza2/1So3OLGtmMBhEJMag7sN/Mo8sq4s0niwb65Z51yLju32jP11g==" + "version": "6.7.3", + "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.3.tgz", + "integrity": "sha512-J7WmYIi/gt1RvZ6Ap2oQiUjzAoiS9pfV+d4GnKuZuPu8agmlAEAInNmMvMjfCNBzHv4JnZXY7qlHUAI0IuYQVA==" }, "node_modules/to-absolute-glob": { "version": "2.0.2", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 280ae0c989..315425bc77 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -51,7 +51,7 @@ "ng-file-upload": "12.2.13", "nouislider": "15.7.1", "spectrum-colorpicker2": "2.0.10", - "tinymce": "6.7.1", + "tinymce": "6.7.3", "typeahead.js": "0.11.1", "underscore": "1.13.6", "wicg-inert": "3.1.2" diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png index 2ddef4b53b..f134fd3006 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png and b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg new file mode 100644 index 0000000000..54cab15d6a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png deleted file mode 100644 index c57755d62c..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png deleted file mode 100644 index 7ed68fb3fc..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png deleted file mode 100644 index d3c6dc56c2..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_black.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png deleted file mode 100644 index 72b2fe470a..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg new file mode 100644 index 0000000000..309899db48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg new file mode 100644 index 0000000000..578bf592f6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg index ce15dd3092..3fc811eaba 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg @@ -1,41 +1,39 @@ + + viewBox="0 0 1025.1 908.1" style="enable-background:new 0 0 1025.1 908.1;" xml:space="preserve"> - - - - - - - - - - + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg new file mode 100644 index 0000000000..7193f3ed0b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg index c0bdbdd40c..01f7260cd3 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg +++ b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg @@ -1,41 +1,51 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg deleted file mode 100644 index 08c2264337..0000000000 --- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg b/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg index 06204510d0..3adc277159 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg and b/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/login.svg b/src/Umbraco.Web.UI.Client/src/assets/img/login.svg deleted file mode 100644 index 37499a996c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/assets/img/login.svg +++ /dev/null @@ -1,996 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/logo.png deleted file mode 100644 index ec59683c50..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/logo.png and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js index 71171c2a73..49a7346c76 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js @@ -12,9 +12,7 @@ scope.authenticated = null; scope.user = null; scope.avatar = [ - { value: "assets/img/application/logo.png" }, - { value: "assets/img/application/logo@2x.png" }, - { value: "assets/img/application/logo@3x.png" } + { value: "assets/img/application/logo.svg" } ]; scope.hideBackofficeLogo = Umbraco.Sys.ServerVariables.umbracoSettings.hideBackofficeLogo; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js index e2c6d87e19..836011c4f6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js @@ -20,6 +20,7 @@ vm.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage; vm.logoImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImage; + vm.logoImageAlternative = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImageAlternative; vm.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset; vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js index 9ad475ad85..5e97a281f9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js @@ -30,9 +30,7 @@ Use this directive to render an avatar. var vm = this; vm.avatar = [ - { value: "assets/logo.png" }, - { value: "assets/logo@2x.png" }, - { value: "assets/logo@3x.png" } + { value: "assets/img/application/logo.svg" } ]; } @@ -55,7 +53,7 @@ Use this directive to render an avatar. function AvatarDirective(localizationService) { function link(scope, element, attrs, ctrl) { - + var eventBindings = []; scope.initials = ""; scope.avatarAlt = ""; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js index f0dad31ee2..e0ac1a10a5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js @@ -1,4 +1,4 @@ -/** +/** @ngdoc directive @name umbraco.directives.directive:umbCodeSnippet @restrict E @@ -47,7 +47,8 @@ controllerAs: 'vm', transclude: true, bindings: { - language: '<' + language: '<', + wrap: 'div { } section .logo { - background-image: url(../img/logo.png); - background-repeat: no-repeat; - width: 91px; - height: 91px; margin: 0 auto; } diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js index 582f462814..08d4322432 100644 --- a/src/Umbraco.Web.UI.Client/src/main.controller.js +++ b/src/Umbraco.Web.UI.Client/src/main.controller.js @@ -83,7 +83,7 @@ function MainController($scope, $location, appState, treeService, notificationsS evts.push(eventsService.on("app.notAuthenticated", function (evt, data) { $scope.authenticated = null; $scope.user = null; - const isTimedOut = data && data.isTimedOut ? true : false; + const isTimedOut = !!(data && data.isTimedOut); $scope.showLoginScreen(isTimedOut); diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js index 7e65346d1b..c86c4ababc 100644 --- a/src/Umbraco.Web.UI.Client/src/routes.js +++ b/src/Umbraco.Web.UI.Client/src/routes.js @@ -1,5 +1,5 @@ window.app.config(function ($routeProvider) { - + /** * This determines if the route can continue depending on authentication and initialization requirements * @param {boolean} authRequired If true, it checks if the user is authenticated and will resolve successfully @@ -82,9 +82,6 @@ window.app.config(function ($routeProvider) { return { isLoggedOut: function ($q, $location, userService) { return userService.logout().then(function () { - // we have to redirect here instead of the routes redirectTo - // https://github.com/angular/angular.js/commit/7f4b356c2bebb87f0c26b57a20415b004b20bcd1 - $location.path("/login/false"); //success so continue return $q.when(true); }, function() { @@ -117,9 +114,9 @@ window.app.config(function ($routeProvider) { template: "
", //This controller will execute for this route, then we can execute some code in order to set the template Url controller: function ($scope, $route, $routeParams, $location, sectionService) { - + //We are going to check the currently loaded sections for the user and if the section we are navigating - //to has a custom route path we'll use that + //to has a custom route path we'll use that sectionService.getSectionsForUser().then(function(sections) { //find the one we're requesting var found = _.find(sections, function(s) { @@ -199,7 +196,7 @@ window.app.config(function ($routeProvider) { }) .otherwise({ redirectTo: '/login' }); }).config(function ($locationProvider) { - + $locationProvider.html5Mode(false); //turn html5 mode off $locationProvider.hashPrefix(''); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html index a68179e133..3e0cb02e4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html @@ -36,7 +36,17 @@
- + +
{{tab.label}}
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html index fae3543429..29294a08c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html @@ -41,7 +41,7 @@ ng-focus="keepLogoModal()" ng-blur="hideLogoModal()" ng-if="logoModal.show"> - Umbraco — The Friendly CMS @@ -122,7 +122,6 @@ color="secondary" name="{{user.name}}" img-src="{{avatar[0].value}}" - img-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x" > diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html index 242b4eab9c..b86abf033e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html @@ -1,27 +1,29 @@