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

Account Home fix

Browse source
This commit is contained in:
dev_amdtel 2014-08-09 04:44:25 +04:00
parent 1712570dd1
commit e301486e94
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/create_organization_48.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 601 B

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
View file

@ -249,4 +249,7 @@
<data name="Text.Users" xml:space="preserve"> <data name="Text.Users" xml:space="preserve">
<value>Users</value> <value>Users</value>
</data> </data>
<data name="Text.CreateOrganization" xml:space="preserve">
<value>Create Organization</value>
</data>
</root> </root>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
View file

@ -74,6 +74,8 @@ namespace WebsitePanel.Portal.UserControls
public void BindMenu(MenuItemCollection items) public void BindMenu(MenuItemCollection items)
{ {
if ((PackageId <= 0) || (ItemID <= 0))
return;
//Organization menu group; //Organization menu group;
if (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations)) if (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations))

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
View file

@ -106,13 +106,21 @@ namespace WebsitePanel.Portal
ShowImg = true; ShowImg = true;
if (PackageId > 0) if ((PackageId > 0) && (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations)))
{ {
MenuItemCollection items = new MenuItemCollection(); MenuItemCollection items = new MenuItemCollection();
if (ItemID > 0)
{
items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png")); items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
BindMenu(items); BindMenu(items);
}
else
{
items.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png"));
}
UserOrgPanel.Visible = true; UserOrgPanel.Visible = true;
OrgIcons.DataSource = items; OrgIcons.DataSource = items;

1
WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
View file

@ -109,6 +109,7 @@
<Content Include="App_Themes\Default\Icons\blackberry_users_48.png" /> <Content Include="App_Themes\Default\Icons\blackberry_users_48.png" />
<Content Include="App_Themes\Default\Icons\block.png" /> <Content Include="App_Themes\Default\Icons\block.png" />
<Content Include="App_Themes\Default\Icons\configureVLan.png" /> <Content Include="App_Themes\Default\Icons\configureVLan.png" />
<Content Include="App_Themes\Default\Icons\create_organization_48.png" />
<Content Include="App_Themes\Default\Icons\crm_orgs_48.png" /> <Content Include="App_Themes\Default\Icons\crm_orgs_48.png" />
<Content Include="App_Themes\Default\Icons\crm_users_48.png" /> <Content Include="App_Themes\Default\Icons\crm_users_48.png" />
<Content Include="App_Themes\Default\Icons\domains_48.png" /> <Content Include="App_Themes\Default\Icons\domains_48.png" />