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

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse1.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,6 +33,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse2.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,6 +33,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse3.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,6 +33,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Edit.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,6 +33,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

7
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Exchange.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,7 +33,11 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">
<wsp:UserSpaceBreadcrumb ID="breadcrumb" runat="server"/>
</div>

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront.ascx
View file

@ -19,15 +19,15 @@
<wsp:Logo ID="logo" runat="server" />
</td>
<td>&nbsp;</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
</table>
</div>
<div id="TopMenu">
<wsp:TopMenu ID="menu" runat="server" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="ContentOneColumn">

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront2.ascx
View file

@ -20,9 +20,6 @@
<wsp:Logo ID="logo" runat="server" />
</td>
<td>&nbsp;</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
</table>
</div>
@ -31,6 +28,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/VPS.ascx
View file

@ -20,9 +20,6 @@
<td class="Logo" rowspan="2">
<wsp:Logo ID="logo" runat="server" />
</td>
<td class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</td>
</tr>
<tr>
<td class="Search">
@ -36,6 +33,9 @@
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
<div class="Account">
<wsp:SignedInUser ID="signedInUser" runat="server" />
</div>
</div>
<div id="Top">

BIN
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_16_blk.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 272 B

BIN
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 212 B

BIN
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/signout_24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 221 B

3
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
View file

@ -5,6 +5,7 @@
.TopMenu ul.AspNet-Menu li ul li.AspNet-Menu-WithChildren span:after {content:'→'; float:right; margin-right:10px;}
.TopMenu ul.AspNet-Menu li {float:left; position:relative;}
.TopMenu ul.AspNet-Menu li a, .TopMenu ul.AspNet-Menu li span {display:block; background-image:url('/g/icons.png'); background-repeat:no-repeat; line-height:40px; text-transform:uppercase; font-size:12px; color:#fff; overflow:hidden; padding:0 22px 0 34px; filter:alpha(opacity=90); opacity:0.9; cursor:pointer;}
.TopMenu ul.AspNet-Menu li:first-child a {padding:0 0 0 0;}
.TopMenu ul.AspNet-Menu li a:hover, .TopMenu ul.AspNet-Menu li.AspNet-Menu-Hover, .TopMenu ul.AspNet-Menu li span:hover {filter:alpha(opacity=100); opacity:1;}
.TopMenu ul.AspNet-Menu li span {}
.TopMenu .AspNet-Menu-Horizontal ul.AspNet-Menu ul li {text-align:left; clear:both; text-indent:10px; color:#777; margin:0 0 0 5px;}
@ -20,7 +21,7 @@
.TopMenu ul.AspNet-Menu ul ul {top: -1em z-index: 502;}
.TopMenu ul.AspNet-Menu li ul li.AspNet-Menu-WithChildren span img {border-style:None; height:16px; width:16px; border-width:0px; padding-right: 3px; float:left; position:relative;}
.TopMenu li.AspNet-Menu-Leaf a, .TopMenu li.AspNet-Menu-Leaf span {}
.TopMenu li.AspNet-Menu-Leaf a img {border-style:None; height:16px; width:16px; border-width:0px; padding-right: 3px; position:relative;}
.TopMenu li.AspNet-Menu-Leaf a img {display:inline-block; vertical-align:middle; margin:0 5px 0 5px;}
.TopMenu ul.AspNet-Menu li:hover a, .TopMenu ul.AspNet-Menu li:hover span {}
.TopMenu ul.AspNet-Menu li.AspNet-Menu-Hover a, .TopMenu ul.AspNet-Menu li.AspNet-Menu-Hover span {}
.TopMenu ul.AspNet-Menu li ul li {margin: 0px; width: 100%;}

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

@ -14,9 +14,14 @@ body {font-family:'Segoe UI','Open Sans',Arial; color:#333; margin:0px; padding:
.SearchQuery {}
#Header .Account {text-align:right; padding:3px 6px 0 0;}
#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:8px;}
#TopMenu .Account div a{ color: #ffffff;}
#TopMenu .Account div input{ display:inline; vertical-align:middle;}
#Breadcrumb {margin:10px;}
#Breadcrumb .Path {padding: 10px 5px 12px 25px; margin-bottom:20px; background-color:#f5f5f5;}
#Breadcrumb .Path img {display:none;}
#Breadcrumb .Path a img {display:inline; vertical-align:middle;}
#Breadcrumb .Path a:not(:last-child):after, #Breadcrumb .Path span a:after {content:'/\00a0'; padding:0 5px 0 10px; color:#999; display:inline-block;}
#Breadcrumb .Path .OrgSpan a:last-child:after {content: none;}
#Breadcrumb .Path a, #Breadcrumb .Path a:Active, #Breadcrumb .Path a:Visited, #Breadcrumb .Path a:Hover {color:#428bca; font-size:13px; line-height:1.428571429;}

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
View file

@ -12,7 +12,7 @@
<div class="Content">
<div class="Center">
<div class="Title">
<asp:Image ID="Image1" SkinID="ExchangeListAdd48" runat="server" />
<asp:Image ID="Image1" SkinID="OrganizationUser48" runat="server" />
<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Create Group"></asp:Localize>
</div>
<div class="FormBody">

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
View file

@ -14,7 +14,7 @@
<div class="Content">
<div class="Center">
<div class="Title">
<asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
<asp:Image ID="Image1" SkinID="OrganizationUser48" runat="server" />
<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Security Group"></asp:Localize>
<asp:Literal ID="litDisplayName" runat="server" Text="John Smith" />

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
View file

@ -12,7 +12,7 @@
<div class="Content">
<div class="Center">
<div class="Title">
<asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
<asp:Image ID="Image1" SkinID="OrganizationUser48" runat="server" />
<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Groups"></asp:Localize>
</div>

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)

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

@ -1,7 +1,6 @@
//------------------------------------------------------------------------------
// <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.
@ -10,12 +9,52 @@
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>

15
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());
}
@ -153,8 +159,17 @@ namespace WebsitePanel.Portal.SkinControls
HyperLink lnkUser = (HyperLink)e.Item.FindControl("lnkUser");
if (lnkUser != null)
{
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>