UI Fixes Sharepoint 2013

This commit is contained in:
robvde 2015-04-06 03:03:30 +08:00
parent f49224028c
commit f075f54084
11 changed files with 265 additions and 8 deletions

View file

@ -196,7 +196,7 @@
<value>OCS</value>
</data>
<data name="locSharePoint.Text" xml:space="preserve">
<value>SharePoint</value>
<value>SharePoint Foundation</value>
</data>
<data name="locTitle.Text" xml:space="preserve">
<value>Home</value>
@ -237,4 +237,7 @@
<data name="lnkRdsUsers.Text" xml:space="preserve">
<value>RDS Users</value>
</data>
<data name="locSharePointEnterprise.Text" xml:space="preserve">
<value>SharePoint Enterprise</value>
</data>
</root>

View file

@ -218,6 +218,25 @@
</tr>
</asp:Panel>
<asp:Panel runat="server" ID="sharePointEnterpriseStatsPanel">
<tr class="OrgStatsRow">
<td class="OrgStatsGroup" width="100%" colspan="2">
<asp:Localize ID="locSharePointEnterprise" runat="server" meta:resourcekey="locSharePointEnterprise"
Text="Organization Statistics"></asp:Localize>
</td>
</tr>
<tr class="OrgStatsRow">
<td class="OrgStatsQuota" nowrap>
<asp:HyperLink ID="lnkEnterpriseSiteCollections" runat="server" meta:resourcekey="lnkSiteCollections"></asp:HyperLink>
</td>
<td>
<wsp:QuotaViewer ID="enterpriseSiteCollectionsStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
</td>
</tr>
</asp:Panel>
<asp:Panel runat="server" ID="ocsStatsPanel">
<tr>
<td class="OrgStatsGroup" width="100%" colspan="2">

View file

@ -249,6 +249,21 @@ namespace WebsitePanel.Portal.ExchangeServer
else
sharePointStatsPanel.Visible = false;
//Show SharePoint statistics
if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
{
sharePointEnterpriseStatsPanel.Visible = true;
lnkSiteCollections.NavigateUrl = EditUrl("ItemID", PanelRequest.ItemID.ToString(), "sharepoint_enterprise_sitecollections",
"SpaceID=" + PanelSecurity.PackageId);
enterpriseSiteCollectionsStats.QuotaUsedValue = orgStats.CreatedSharePointEnterpriseSiteCollections;
enterpriseSiteCollectionsStats.QuotaValue = orgStats.AllocatedSharePointEnterpriseSiteCollections;
if (orgStats.AllocatedSharePointEnterpriseSiteCollections != -1) enterpriseSiteCollectionsStats.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
}
else
sharePointEnterpriseStatsPanel.Visible = false;
if (cntx.Groups.ContainsKey(ResourceGroups.OCS))
{
ocsStatsPanel.Visible = true;

View file

@ -525,6 +525,42 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// </remarks>
protected global::WebsitePanel.Portal.QuotaViewer siteCollectionsStats;
/// <summary>
/// sharePointEnterpriseStatsPanel 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 sharePointEnterpriseStatsPanel;
/// <summary>
/// locSharePointEnterprise 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.Localize locSharePointEnterprise;
/// <summary>
/// lnkEnterpriseSiteCollections 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 lnkEnterpriseSiteCollections;
/// <summary>
/// enterpriseSiteCollectionsStats control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.QuotaViewer enterpriseSiteCollectionsStats;
/// <summary>
/// ocsStatsPanel control.
/// </summary>

View file

@ -56,9 +56,9 @@ namespace WebsitePanel.Portal
OrganizationStatistics stats = ES.Services.Organizations.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
siteCollectionsQuota.QuotaUsedValue = stats.CreatedSharePointSiteCollections;
siteCollectionsQuota.QuotaValue = stats.AllocatedSharePointSiteCollections;
if (stats.AllocatedSharePointSiteCollections != -1) siteCollectionsQuota.QuotaAvailable = tenantStats.AllocatedSharePointSiteCollections - tenantStats.CreatedSharePointSiteCollections;
siteCollectionsQuota.QuotaUsedValue = stats.CreatedSharePointEnterpriseSiteCollections;
siteCollectionsQuota.QuotaValue = stats.AllocatedSharePointEnterpriseSiteCollections;
if (stats.AllocatedSharePointSiteCollections != -1) siteCollectionsQuota.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
}
protected void btnCreateSiteCollection_Click(object sender, EventArgs e)
@ -90,7 +90,7 @@ namespace WebsitePanel.Portal
try
{
int result = ES.Services.HostedSharePointServers.DeleteSiteCollection(siteCollectionId);
int result = ES.Services.HostedSharePointServersEnt.Enterprise_DeleteSiteCollection(siteCollectionId);
if (result < 0)
{
messageBox.ShowResultMessage(result);