zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2014-08-20 10:47:05 -04:00
commit 82df2c6d5c
4 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
View file

@ -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;}

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx
View file

@ -3,7 +3,7 @@
<asp:HyperLink ID="lnkSignIn" runat="server" meta:resourcekey="lnkSignIn">Sign In</asp:HyperLink>
</asp:Panel>
<asp:Panel ID="LoggedPanel" runat="server">
<asp:ImageButton ID="imgSignOut" runat="server" CausesValidation="false" OnClick="cmdSignOut_Click" />
|
<asp:HyperLink ID="lnkEditUserDetails" runat="server" meta:resourcekey="lnkEditUserDetails">My Account</asp:HyperLink>
|
<asp:ImageButton ID="imgSignOut" runat="server" CausesValidation="false" OnClick="cmdSignOut_Click" />
</asp:Panel>

18
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.designer.cs generated
View file

@ -39,15 +39,6 @@ namespace WebsitePanel.Portal.SkinControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Panel LoggedPanel;
/// <summary>
/// imgSignOut control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ImageButton imgSignOut;
/// <summary>
/// lnkEditUserDetails control.
/// </summary>
@ -56,5 +47,14 @@ namespace WebsitePanel.Portal.SkinControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink lnkEditUserDetails;
/// <summary>
/// imgSignOut control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ImageButton imgSignOut;
}
}

11
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
View file

@ -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
{