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

Fixed: When having multiple organization the quotas and available resources

Browse source 
quotas were only displayed for the tenant. Quota usage now displayed per
organization

Added public folders to organization home screen

Added Lync to organization home screen

Added the ability to hide the theme and locale. This can be hidden by adding
the element <HideThemeAndLocale>true</HideThemeAndLocale> to the file
SiteSettings.config
This commit is contained in:
robvde 2012-09-03 15:00:52 +04:00
parent 478d269e2a
commit 6203fd48c5
28 changed files with 1278 additions and 1166 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/QuotaViewer.ascx.resx
View file

@ -112,11 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Text.Available" xml:space="preserve">
<value>Available</value>
</data>
<data name="Text.Disabled" xml:space="preserve">
<value>Disabled</value>
</data>

6
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/Gauge.ascx.cs
View file

@ -68,6 +68,12 @@ namespace WebsitePanel.Portal
set { ViewState["Total"] = value; }
}
public int Available
{
get { return (ViewState["Available"] != null) ? (int)ViewState["Available"] : -1; }
set { ViewState["Available"] = value; }
}
public int Width
{
get { return this.width; }

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/QuotaViewer.ascx
View file

@ -2,5 +2,6 @@
<%@ Register Src="Gauge.ascx" TagName="Gauge" TagPrefix="uc1" %>
<uc1:Gauge ID="gauge" runat="server"
Progress='<%# Eval("QuotaUsedValue") %>'
Total='<%# Eval("QuotaValue") %>' />
Total='<%# Eval("QuotaValue") %>'
Available='<%# Eval("QuotaAvailable") %>'/>
<asp:Label ID="litValue" runat="server"></asp:Label>

21
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/QuotaViewer.ascx.cs
View file

@ -77,6 +77,19 @@ namespace WebsitePanel.Portal
}
}
public int QuotaAvailable
{
set
{
// store value
gauge.Available = value;
// update control
UpdateControl();
}
}
private void UpdateControl()
{
int total = gauge.Total;
@ -88,8 +101,12 @@ namespace WebsitePanel.Portal
}
else if (QuotaTypeId == 2)
{
litValue.Text = String.Format("{0} {1} {2}",
gauge.Progress, GetLocalizedString("Text.Of"), ((total == -1) ? GetLocalizedString("Text.Unlimited") : total.ToString()));
string availableText = string.Empty;
if (gauge.Available != -1) availableText = String.Format("({0} {1})", gauge.Available.ToString(), GetLocalizedString("Text.Available"));
litValue.Text = String.Format("{0} {1} {2} {3}",
gauge.Progress, GetLocalizedString("Text.Of"), ((total == -1) ? GetLocalizedString("Text.Unlimited") : total.ToString()), availableText);
gauge.Visible = (total != -1);
//litValue.Visible = (value == -1);
}

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/QuotaViewer.ascx.designer.cs generated
View file

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------