From ffaec0be2b08abfca51347b14c86eed4bc9e009f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 27 Sep 2017 10:45:08 +0200 Subject: [PATCH] Actually showing the uploaded logo --- Site/Master-v5.master.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Site/Master-v5.master.cs b/Site/Master-v5.master.cs index 4a73fb92..b2bb627f 100644 --- a/Site/Master-v5.master.cs +++ b/Site/Master-v5.master.cs @@ -58,7 +58,7 @@ namespace Swarmops.Frontend // Titles and other page elements - Page.Title = "Swarmops - " + CurrentPageTitle; + Page.Title = @"Swarmops - " + CurrentOrganization.NameShort + @" - " + CurrentPageTitle; this.ExternalScriptEasyUI.Controls = EasyUIControlsUsed.ToString(); this.IncludedScripts.Controls = IncludedControlsUsed.ToString(); @@ -75,11 +75,17 @@ namespace Swarmops.Frontend } else { - // TODO: Check for corp image + Document logoLandscapeDoc = CurrentOrganization.LogoLandscape; - this.ImageLogo.Visible = false; - this.LabelOrganizationName.Visible = true; - this.LabelOrganizationName.Text = CurrentOrganization.Name; + if (logoLandscapeDoc == null) + { + this.ImageLogo.ImageUrl = "~/Images/Other/blank-logo-640x360.png"; + } + else + { + this.ImageLogo.ImageUrl = "~/Support/StreamUpload.aspx?DocId=" + + logoLandscapeDoc.Identity.ToString(CultureInfo.InvariantCulture); + } } // Check for SSL and force it