diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index 61846104..5a2983e6 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -5274,6 +5274,18 @@ Virtual Machine (Private Cloud) + + Username + + + E-mail + + + Company Name + + + Full Name + Could not disable access to Web Publishing feature for the account specified diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx index c78b294f..315de47e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx @@ -70,7 +70,7 @@ Type - <%# Eval("ColumnType") %> + <%# GetTypeDisplayName((string)Eval("ColumnType")) %> @@ -80,9 +80,11 @@ - - - + + + <%# GetTypeDisplayName((string)Eval("FullType")) %> + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs index bb2f1bd9..6e17d9f1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs @@ -6,6 +6,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.Script.Serialization; using WebsitePanel.WebPortal; +using System.Xml; namespace WebsitePanel.Portal { @@ -48,6 +49,13 @@ namespace WebsitePanel.Portal } } + protected string GetTypeDisplayName(string type) + { + return GetSharedLocalizedString("ServiceItemType." + type) + ?? GetSharedLocalizedString("UserItemType." + type) + ?? type; + } + public string GetItemPageUrl(string fullType, string itemType, int itemId, int spaceId, int accountId) { string res = "";