From ba16c19e839e7346117327e721fa19c5364f5ad5 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 21 Dec 2020 17:59:31 +0800
Subject: [PATCH] Add LogoUrl to Brand component.

Resolve #6704
---
 .../Themes/Basic/Branding.razor                        | 10 ++++++++--
 .../Themes/Basic/Components/Brand/Default.cshtml       |  8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
index ac629423ce..5e0537b2b2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
@@ -1,3 +1,9 @@
-@using Volo.Abp.Ui.Branding
+@using Volo.Abp.Ui.Branding
 @inject IBrandingProvider BrandingProvider
-<a class="navbar-brand" href="">@BrandingProvider.AppName</a>
+<a class="navbar-brand" href="">
+    @if (!BrandingProvider.LogoUrl.IsNullOrWhiteSpace())
+    {
+        <img src="@BrandingProvider.LogoUrl" alt="@BrandingProvider.AppName" >
+    }
+    @BrandingProvider.AppName
+</a>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/Default.cshtml
index b57f6da4bb..04a4f81c71 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/Default.cshtml
@@ -1,3 +1,9 @@
 @using Volo.Abp.Ui.Branding
 @inject IBrandingProvider BrandingProvider
-<a class="navbar-brand" href="~/">@BrandingProvider.AppName</a>
+<a class="navbar-brand" href="~/">
+    @if (!BrandingProvider.LogoUrl.IsNullOrWhiteSpace())
+    {
+        <img src="@BrandingProvider.LogoUrl" alt="@BrandingProvider.AppName" >
+    }
+    @BrandingProvider.AppName
+</a>