From 0f5875411979baa0372a657c7148c459b4a08481 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Wed, 20 Aug 2014 11:28:25 +0300 Subject: [PATCH] breadcrumb & sign in controls updated. --- .../App_Themes/Default/Styles/SkinLayout.css | 4 ++-- .../SkinControls/SignedInUser.ascx | 4 ++-- .../SkinControls/SignedInUser.ascx.designer.cs | 18 +++++++++--------- .../SkinControls/UserSpaceBreadcrumb.ascx.cs | 11 +++++++++-- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css index 849c2103..a47dfee2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css @@ -16,9 +16,9 @@ body {font-family:'Segoe UI','Open Sans',Arial; color:#333; margin:0px; padding: #TopMenu {position:relative; width:100%; min-width:880px; height:40px; background:#2e8bcc; z-index:99;} #TopMenu .Account { float:right; color: #ffffff; height:100%;} #TopMenu .Account div { padding-top:9.5px;} -#TopMenu .Account div a{ color: #ffffff; font-size: 12px; text-transform: uppercase; margin-right:5px; text-decoration: none; opacity: 0.9;} +#TopMenu .Account div a{ color: #ffffff; font-size: 12px; text-transform: uppercase; text-decoration: none; opacity: 0.9;} #TopMenu .Account div a:hover {filter:alpha(opacity=100); opacity:1;} -#TopMenu .Account div input{ display:inline; vertical-align:middle; margin: 0; opacity: 0.9;} +#TopMenu .Account div input{ display:inline; vertical-align:middle; margin-right:4px; opacity: 0.9;} #TopMenu .Account div input:hover {filter:alpha(opacity=100); opacity:1;} #Breadcrumb {margin:10px;} #Breadcrumb .Path {padding: 10px 5px 12px 25px; margin-bottom:20px; background-color:#f5f5f5;} diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx index 6e9a3f50..2099d56e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx @@ -3,7 +3,7 @@ Sign In - - | My Account + | + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.designer.cs index ccb5b592..cad1d36b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.designer.cs @@ -39,15 +39,6 @@ namespace WebsitePanel.Portal.SkinControls { /// protected global::System.Web.UI.WebControls.Panel LoggedPanel; - /// - /// imgSignOut control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ImageButton imgSignOut; - /// /// lnkEditUserDetails control. /// @@ -56,5 +47,14 @@ namespace WebsitePanel.Portal.SkinControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink lnkEditUserDetails; + + /// + /// imgSignOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton imgSignOut; } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs index 0e391268..fd95d81b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs @@ -47,7 +47,7 @@ namespace WebsitePanel.Portal.SkinControls public partial class UserSpaceBreadcrumb : System.Web.UI.UserControl { public const string ORGANIZATION_CONTROL_KEY = "organization_home"; - public const string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer"; + public const string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer"; public const string EXCHANGE_SERVER_MODULE_DEFINTION_ID = "exchangeserver"; public const string PAGE_NANE_KEY = "Text.PageName"; public const string DM_FOLDER_VIRTUAL_PATH = "~/DesktopModules/"; @@ -164,7 +164,14 @@ namespace WebsitePanel.Portal.SkinControls { string imagePath = String.Concat("~/", DefaultPage.THEMES_FOLDER, "/", Page.Theme, "/", "Images", "/"); - lnkUser.ImageUrl = imagePath + "home_16_blk.png"; + Image imgUserHome = new Image(); + imgUserHome.ImageUrl = imagePath + "home_16_blk.png"; + + Label lblUserText = new Label(); + lblUserText.Text = " " + user.Username; + + lnkUser.Controls.Add(imgUserHome); + lnkUser.Controls.Add(lblUserText); } else {