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-04-01 18:18:03 -04:00
commit 2163d08303
7 changed files with 62 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx
View file

@ -4,4 +4,6 @@
<asp:DropDownList ID="ddlSpaceOrgs" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;"
OnSelectedIndexChanged="ddlSpaceOrgs_SelectedIndexChanged" EnableViewState="true" AutoPostBack="true">
</asp:DropDownList>
|
<asp:HyperLink ID="lnkOrgnsList" runat="server">Edit</asp:HyperLink>
</span>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs
View file

@ -70,6 +70,9 @@ namespace WebsitePanel.Portal.SkinControls
ddlSpaceOrgs.DataBind();
ddlSpaceOrgs.Items.FindByValue(PanelRequest.ItemID.ToString()).Selected = true;
lnkOrgnsList.NavigateUrl = PortalUtils.NavigatePageURL(
PortalUtils.GetCurrentPageId(), "SpaceID", PanelSecurity.PackageId.ToString());
}
}
@ -80,7 +83,7 @@ namespace WebsitePanel.Portal.SkinControls
private string GetOrganizationEditUrl(string itemId)
{
return ExchangeHelper.BuildUrl("SpaceID", PanelSecurity.PackageId.ToString(), "organization_home",
return PortalUtils.EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "organization_home",
"ItemID=" + itemId);
}
}

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

@ -57,5 +57,14 @@ namespace WebsitePanel.Portal.SkinControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlSpaceOrgs;
/// <summary>
/// lnkOrgnsList 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 lnkOrgnsList;
}
}

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

@ -114,7 +114,6 @@ namespace WebsitePanel.Portal.SkinControls
// organization
bool orgVisible = (PanelRequest.ItemID > 0);
//spanOrgsSelector.Visible = spanOrgn.Visible = orgVisible;
spanOrgn.Visible = orgVisible;
if (orgVisible)
@ -122,7 +121,7 @@ namespace WebsitePanel.Portal.SkinControls
// load organization details
Organization org = ES.Services.Organizations.GetOrganization(PanelRequest.ItemID);
lnkOrgn.NavigateUrl = ExchangeHelper.BuildUrl(
lnkOrgn.NavigateUrl = PortalUtils.EditUrl(
"ItemID", PanelRequest.ItemID.ToString(), ORGANIZATION_CONTROL_KEY,
"SpaceID=" + PanelSecurity.PackageId.ToString());
lnkOrgn.Text = org.Name;
@ -136,7 +135,7 @@ namespace WebsitePanel.Portal.SkinControls
if (!String.IsNullOrEmpty(control.Src))
{
lbOrgCurPage.Text = ExchangeHelper.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
lbOrgCurPage.Text = PortalUtils.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
}
}
}