diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/VPS.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/VPS.ascx
index 7366e5f7..252b11c9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/VPS.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/VPS.ascx
@@ -20,9 +20,6 @@
|
@@ -36,6 +33,9 @@
+
+
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_16_blk.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_16_blk.png
new file mode 100644
index 00000000..f03b4835
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_16_blk.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_24.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_24.png
new file mode 100644
index 00000000..618ab6f6
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/home_24.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/signout_24.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/signout_24.png
new file mode 100644
index 00000000..5eab5147
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/signout_24.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
index 218a820e..6bb79ad7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
@@ -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%;}
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 9c6dffdd..1cd3e1ab 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
@@ -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;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
index 0f3c138f..b980c067 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx
@@ -12,7 +12,7 @@
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
index 78a32d78..f7277e6b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx
@@ -14,7 +14,7 @@
-
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
index d94cab7c..6fcef6ab 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
@@ -12,7 +12,7 @@
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx
index 1b305fee..12cc5106 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx
@@ -3,8 +3,7 @@
Sign In
-
- My Account
- |
+ My Account
+ |
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.cs
index 1c9a3d6d..c99c8237 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SignedInUser.ascx.cs
@@ -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)
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 6034d612..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
@@ -1,21 +1,60 @@
//------------------------------------------------------------------------------
//
// 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.
//
//------------------------------------------------------------------------------
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;
+
+ ///
+ /// AnonymousPanel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel AnonymousPanel;
+
+ ///
+ /// lnkSignIn control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink lnkSignIn;
+
+ ///
+ /// LoggedPanel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel LoggedPanel;
+
+ ///
+ /// lnkEditUserDetails control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// 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/TopMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/TopMenu.ascx.cs
index 937b3bc3..69934b78 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/TopMenu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/TopMenu.ascx.cs
@@ -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))
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx
index 3f25e61d..7d6b12a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx
@@ -35,6 +35,7 @@
+
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 1849cf0e..0e391268 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
@@ -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);
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs
index e61a07dd..efeb876b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs
@@ -174,6 +174,15 @@ namespace WebsitePanel.Portal.SkinControls {
///
protected global::System.Web.UI.WebControls.Panel pnlViewSpace;
+ ///
+ /// lblUserAccountName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblUserAccountName;
+
///
/// cmdSpaceName control.
///
|