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

Add config to hide backoffice logo (#11999)

Browse Source 
* Added config to hide backoffice logo

* rename to hideBackofficeLogo

* hide on mobile

* add hideBackofficeLogo

* implement hideBackofficeLogo + toggle on click

* Updated c# syntax

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
This commit is contained in:
Bjarke Berg
2022-02-15 10:48:52 +01:00
committed by GitHub
parent 0b0182f550
commit 62fa1695df
6 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
View File

@@ -46,6 +46,9 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
[ConfigurationProperty("loginLogoImage")]
internal InnerTextConfigurationElement<string> LoginLogoImage => GetOptionalTextElement("loginLogoImage", "assets/img/application/umbraco_logo_white.svg");
[ConfigurationProperty("hideBackofficeLogo")]
internal InnerTextConfigurationElement<bool> HideBackOfficeLogo => GetOptionalTextElement("hideBackofficeLogo", false);
string IContentSection.NotificationEmailAddress => Notifications.NotificationEmailAddress;
bool IContentSection.DisableHtmlEmail => Notifications.DisableHtmlEmail;
@@ -71,5 +74,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
string IContentSection.LoginBackgroundImage => LoginBackgroundImage;
string IContentSection.LoginLogoImage => LoginLogoImage;
bool IContentSection.HideBackOfficeLogo => HideBackOfficeLogo;
}
}

5
src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
View File

@@ -12,11 +12,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
IEnumerable<string> ImageFileTypes { get; }
IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
bool ResolveUrlsFromTextString { get; }
IEnumerable<IContentErrorPage> Error404Collection { get; }
string PreviewBadge { get; }
MacroErrorBehaviour MacroErrorBehaviour { get; }
@@ -36,5 +36,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
string LoginBackgroundImage { get; }
string LoginLogoImage { get; }
bool HideBackOfficeLogo { get; }
}
}

20
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
View File

@@ -16,6 +16,7 @@
{ value: "assets/img/application/logo@2x.png" },
{ value: "assets/img/application/logo@3x.png" }
];
scope.hideBackofficeLogo = Umbraco.Sys.ServerVariables.umbracoSettings.hideBackofficeLogo;
// when a user logs out or timesout
evts.push(eventsService.on("app.notAuthenticated", function () {
@@ -104,15 +105,26 @@
$timeout.cancel(scope.logoModal.timer);
};
scope.hideLogoModal = function() {
$timeout.cancel(scope.logoModal.timer);
scope.logoModal.timer = $timeout(function () {
scope.logoModal.show = false;
}, 100);
if(scope.logoModal.show === true) {
$timeout.cancel(scope.logoModal.timer);
scope.logoModal.timer = $timeout(function () {
scope.logoModal.show = false;
}, 100);
}
};
scope.stopClickEvent = function($event) {
$event.stopPropagation();
};
scope.toggleLogoModal = function() {
if(scope.logoModal.show) {
$timeout.cancel(scope.logoModal.timer);
scope.logoModal.show = false;
} else {
scope.showLogoModal();
}
};
}
var directive = {

7
src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
View File

@@ -9,11 +9,18 @@
.umb-app-header__logo {
margin-right: 30px;
flex-shrink: 0;
button {
img {
height: 30px;
}
}
}
@media (max-width: 1279px) {
.umb-app-header__logo {
display: none;
}
}
.umb-app-header__logo-modal {

8
src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
View File

@@ -1,7 +1,11 @@
<div>
<div class="umb-app-header">
<div class="umb-app-header__logo">
<button type="button" class="btn-reset" ng-click="showLogoModal()">
<div class="umb-app-header__logo" ng-if="hideBackofficeLogo !== true">
<button
type="button"
class="btn-reset"
ng-click="toggleLogoModal()"
>
<img
src="assets/img/application/umbraco_logomark_white.svg"
alt="Umbraco"

3
src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
View File

@@ -57,7 +57,7 @@ namespace Umbraco.Web.Editors
var keepOnlyKeys = new Dictionary<string, string[]>
{
{"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "iconApiBaseUrl"}},
{"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "loginLogoImage", "canSendRequiredEmail", "usernameIsEmail", "minimumPasswordLength", "minimumPasswordNonAlphaNum"}},
{"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "loginLogoImage", "canSendRequiredEmail", "usernameIsEmail", "minimumPasswordLength", "minimumPasswordNonAlphaNum", "hideBackofficeLogo"}},
{"application", new[] {"applicationPath", "cacheBuster"}},
{"isDebuggingEnabled", new string[] { }},
{"features", new [] {"disabledFeatures"}}
@@ -356,6 +356,7 @@ namespace Umbraco.Web.Editors
{"allowPasswordReset", Current.Configs.Settings().Security.AllowPasswordReset},
{"loginBackgroundImage", Current.Configs.Settings().Content.LoginBackgroundImage},
{"loginLogoImage", Current.Configs.Settings().Content.LoginLogoImage },
{"hideBackofficeLogo", Current.Configs.Settings().Content.HideBackOfficeLogo },
{"showUserInvite", EmailSender.CanSendRequiredEmail},
{"canSendRequiredEmail", EmailSender.CanSendRequiredEmail},
{"showAllowSegmentationForDocumentTypes", false},