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

Portal changes - SignedInUser control, Account home(image), breadcrumb(image). Changed image for org groups' header.

Browse source
This commit is contained in:
vfedosevich 2014-08-18 16:59:51 +03:00
parent 9cb4804ab8
commit b557998b9a
23 changed files with 127 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,7 @@
<asp:HyperLink ID="lnkSignIn" runat="server" meta:resourcekey="lnkSignIn">Sign In</asp:HyperLink>
</asp:Panel>
<asp:Panel ID="LoggedPanel" runat="server">
<asp:Localize runat="server" meta:resourcekey="locWelcome"/> <strong><asp:Literal ID="litUsername" runat="server"></asp:Literal></strong>&nbsp;&nbsp;&nbsp;
<asp:HyperLink ID="lnkEditUserDetails" runat="server" meta:resourcekey="lnkEditUserDetails">My Account</asp:HyperLink>
| <asp:LinkButton ID="cmdSignOut" runat="server" Text="Sign Out" meta:resourcekey="cmdSignOut"
CausesValidation="false" OnClick="cmdSignOut_Click"></asp:LinkButton>
<strong><asp:HyperLink ID="lnkEditUserDetails" runat="server" meta:resourcekey="lnkEditUserDetails">My Account</asp:HyperLink></strong>
|
<asp:ImageButton ID="imgSignOut" runat="server" CausesValidation="false" OnClick="cmdSignOut_Click" />
</asp:Panel>

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.cs
View file

@ -38,6 +38,7 @@ using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using WebsitePanel.EnterpriseServer;
using WebsitePanel.WebPortal;
namespace WebsitePanel.Portal.SkinControls
{
@ -56,7 +57,7 @@ namespace WebsitePanel.Portal.SkinControls
UserInfo user = PanelSecurity.LoggedUser;
if (user != null)
{
litUsername.Text = PanelSecurity.LoggedUser.Username;
lnkEditUserDetails.Text = PanelSecurity.LoggedUser.Username;
lnkEditUserDetails.NavigateUrl = PortalUtils.GetLoggedUserAccountPageUrl();
}
@ -64,6 +65,10 @@ namespace WebsitePanel.Portal.SkinControls
LoggedPanel.Visible = Request.IsAuthenticated;
lnkSignIn.NavigateUrl = PortalUtils.LoginRedirectUrl;
string imagePath = String.Concat("~/", DefaultPage.THEMES_FOLDER, "/", Page.Theme, "/", "Images", "/");
imgSignOut.ImageUrl = imagePath + "signout_24.png";
}
protected void cmdSignOut_Click(object sender, EventArgs e)

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

@ -1,21 +1,60 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebsitePanel.Portal.SkinControls {
public partial class SignedInUser {
protected System.Web.UI.WebControls.Panel AnonymousPanel;
protected System.Web.UI.WebControls.HyperLink lnkSignIn;
protected System.Web.UI.WebControls.Panel LoggedPanel;
protected System.Web.UI.WebControls.Literal litUsername;
protected System.Web.UI.WebControls.HyperLink lnkEditUserDetails;
protected System.Web.UI.WebControls.LinkButton cmdSignOut;
/// <summary>
/// AnonymousPanel 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.Panel AnonymousPanel;
/// <summary>
/// lnkSignIn 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.HyperLink lnkSignIn;
/// <summary>
/// LoggedPanel 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.Panel LoggedPanel;
/// <summary>
/// lnkEditUserDetails 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.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;
}
}

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/TopMenu.ascx.cs
View file

@ -36,6 +36,7 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using WebsitePanel.WebPortal;
namespace WebsitePanel.Portal.SkinControls
{
@ -69,6 +70,15 @@ namespace WebsitePanel.Portal.SkinControls
return;
}
if (Align.Equals("left") && node.Title.ToLower().Equals("account home"))
{
e.Item.Text = string.Empty;
string imagePath = String.Concat("~/", DefaultPage.THEMES_FOLDER, "/", Page.Theme, "/", "Images", "/");
e.Item.ImageUrl = imagePath + "home_24.png";
}
string target = node["target"];
if(!String.IsNullOrEmpty(target))

1
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx
View file

@ -35,6 +35,7 @@
<asp:UpdatePanel runat="server" ID="updatePanelUsers" UpdateMode="Conditional" ChildrenAsTriggers="true">
<ContentTemplate>
<asp:Panel ID="pnlViewSpace" runat="server">
<asp:Label ID="lblUserAccountName" runat="server" Text="Account-" CssClass="Huge" style="margin-right:2px;"/>
<asp:LinkButton ID="cmdSpaceName" runat="server" Text="Change Name" OnClick="cmdChangeName_Click" CssClass="Huge" CausesValidation="false" />
<asp:Label ID="lblSpaceDescription" runat="server" Visible="false"></asp:Label>
</asp:Panel>

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

@ -93,6 +93,12 @@ namespace WebsitePanel.Portal.SkinControls
cmdSpaceName.Text = PortalAntiXSS.EncodeOld(package.PackageName);
lblSpaceDescription.Text = PortalAntiXSS.EncodeOld(package.PackageComments);
UserInfo user = UsersHelper.GetUser(PanelSecurity.SelectedUserId);
if (user != null)
{
lblUserAccountName.Text = PortalAntiXSS.EncodeOld(string.Format("{0} -",user.Username));
}
lnkCurrentPage.NavigateUrl = PortalUtils.NavigatePageURL(
PortalUtils.GetCurrentPageId(), "SpaceID", PanelSecurity.PackageId.ToString());
}
@ -154,7 +160,16 @@ namespace WebsitePanel.Portal.SkinControls
HyperLink lnkUser = (HyperLink)e.Item.FindControl("lnkUser");
if (lnkUser != null)
{
lnkUser.Text = user.Username;
if (user.UserId == PanelSecurity.SelectedUserId && PanelSecurity.SelectedUserId != PanelSecurity.LoggedUserId)
{
string imagePath = String.Concat("~/", DefaultPage.THEMES_FOLDER, "/", Page.Theme, "/", "Images", "/");
lnkUser.ImageUrl = imagePath + "home_16_blk.png";
}
else
{
lnkUser.Text = user.Username;
}
lnkUser.NavigateUrl = PortalUtils.GetUserHomePageUrl(user.UserId);
}
}

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs generated
View file

@ -174,6 +174,15 @@ namespace WebsitePanel.Portal.SkinControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlViewSpace;
/// <summary>
/// lblUserAccountName 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.Label lblUserAccountName;
/// <summary>
/// cmdSpaceName control.
/// </summary>