diff --git a/Site5/Pages/v5/Admin/Settings.aspx.cs b/Site5/Pages/v5/Admin/Settings.aspx.cs
index 9329a2c8..1bc1a740 100644
--- a/Site5/Pages/v5/Admin/Settings.aspx.cs
+++ b/Site5/Pages/v5/Admin/Settings.aspx.cs
@@ -22,8 +22,6 @@ namespace Swarmops.Frontend.Pages.v5.Admin
{
// HACK: The organization part must be removed once proper access control is in place
this.PageAccessRequired = new Access(this.CurrentOrganization, AccessAspect.System, AccessType.Write);
- this.IncludedControlsUsed = IncludedControl.JsonParameters | IncludedControl.SwitchButton;
- this.EasyUIControlsUsed = EasyUIControl.Tabs;
this.PageTitle = Resources.Pages.Admin.SystemSettings_PageTitle;
this.InfoBoxLiteral = Resources.Pages.Admin.SystemSettings_Info;
@@ -38,6 +36,9 @@ namespace Swarmops.Frontend.Pages.v5.Admin
Localize();
}
+
+ RegisterControl (EasyUIControl.Tabs);
+ RegisterControl (IncludedControl.JsonParameters | IncludedControl.SwitchButton);
}
private static string FormatSmtpAccessString (string user, string pass, string host, int port)
diff --git a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
index 269f5bd7..d7e99365 100644
--- a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
+++ b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
@@ -23,8 +23,6 @@ namespace Swarmops.Frontend.Pages.Comms
this.TextMessage.Style[HtmlTextWriterStyle.Width] = "674px";
this.TextMessage.Style["resize"] = "none";
-
- EasyUIControlsUsed = EasyUIControl.Tree;
}
private void Localize()
diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
index 890a6136..b1d4998d 100644
--- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
+++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
@@ -38,7 +38,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
PopulateExpenses();
// PopulateSalaries();
- EasyUIControlsUsed = EasyUIControl.DataGrid;
+ RegisterControl(EasyUIControl.DataGrid);
this.RepeaterLightboxItems.DataSource = this._documentList;
this.RepeaterLightboxItems.DataBind();
diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
index e7fbd090..c3017957 100644
--- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
+++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
@@ -102,10 +102,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial
Localize();
}
-
- EasyUIControlsUsed = EasyUIControl.Tree;
- IncludedControlsUsed = IncludedControl.JsonParameters;
- ;
}
diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
index e52e0954..2dbab8e7 100644
--- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
+++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
@@ -109,9 +109,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial
Localize();
}
-
- EasyUIControlsUsed = EasyUIControl.Tree;
- IncludedControlsUsed = IncludedControl.FileUpload | IncludedControl.JsonParameters;
}
diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
index d32d4542..ea008178 100644
--- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
+++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
@@ -26,7 +26,7 @@ namespace Swarmops.Frontend.Pages.Financial
Localize();
}
- EasyUIControlsUsed = EasyUIControl.DataGrid;
+ RegisterControl (EasyUIControl.DataGrid);
}
private void Localize()
diff --git a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
index f1890847..90d9e62d 100644
--- a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
+++ b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
@@ -31,9 +31,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial
Localize();
}
-
- EasyUIControlsUsed = EasyUIControl.Tree;
- IncludedControlsUsed = IncludedControl.JsonParameters;
}
diff --git a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
index 31f16016..a4633d6a 100644
--- a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
+++ b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
@@ -38,7 +38,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
this._documentList = new List
();
PopulateExpenses();
- EasyUIControlsUsed = EasyUIControl.DataGrid;
+ RegisterControl (EasyUIControl.DataGrid);
this.RepeaterLightboxItems.DataSource = this._documentList;
diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs
index d50fce14..778d1504 100644
--- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs
@@ -97,8 +97,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Write);
DbVersionRequired = 2; // Account reparenting
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
- IncludedControlsUsed |= IncludedControl.SwitchButton | IncludedControl.JsonParameters;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
+ RegisterControl (IncludedControl.SwitchButton);
}
diff --git a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
index 9ec5ae5a..15f6f2be 100644
--- a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
@@ -31,7 +31,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
Localize();
}
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
}
diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs
index c7a04039..cbbba8f3 100644
--- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs
@@ -51,7 +51,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
this.DropMonths.SelectedValue = today.Month.ToString (CultureInfo.InvariantCulture);
}
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
Localize();
}
diff --git a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
index e89484eb..d31133ee 100644
--- a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
@@ -30,7 +30,7 @@ public partial class Pages_v5_Ledgers_ProfitLossStatement : PageV5Base
Localize();
}
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
}
private void Localize()
diff --git a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs
index 285547a3..58d8fd2d 100644
--- a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs
@@ -75,7 +75,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
Localize();
}
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
}
diff --git a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx
deleted file mode 100644
index 24122646..00000000
--- a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="SetRootBudgets.aspx.cs" Inherits="Pages_v5_Ledgers_SetRootBudgets" %>
-<%@ Register src="~/Controls/v5/Swarm/PersonDetailPopup.ascx" tagName="PersonDetailPopup" tagPrefix="act5" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs
deleted file mode 100644
index d5e290e3..00000000
--- a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-using System;
-using System.Threading;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Resources;
-using Resources.Pages;
-using Swarmops.Basic.Enums;
-using Swarmops.Logic.Financial;
-using Swarmops.Logic.Security;
-using Swarmops.Logic.Structure;
-using Swarmops.Logic.Swarm;
-
-public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base
-{
- private int _year;
-
- protected void Page_Init (object sender, EventArgs e)
- {
- if (Page.IsPostBack)
- {
- // Create controls, for amounts to be set in Page_Load. This is necessary for events to fire.
- // We don't know the year setting here yet.
-
- FinancialAccounts accounts = GetRootLevelResultAccounts();
-
- this.RepeaterAccountBudgets.DataSource = accounts;
- this.RepeaterAccountBudgets.DataBind();
- }
- }
-
- protected void Page_Load (object sender, EventArgs e)
- {
- PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Write);
-
- this.HiddenInitOrganizationId.Value = CurrentOrganization.Identity.ToString();
-
- PageIcon = "iconshock-moneybag";
- PageTitle = Ledgers.SetRootBudgets_PageTitle;
-
- if (!Page.IsPostBack)
- {
- FinancialAccounts accounts = GetRootLevelResultAccounts();
-
- int currentYear = DateTime.Today.Year;
- this._year = currentYear;
-
- do
- {
- this.DropYears.Items.Add (new ListItem (currentYear.ToString()));
- currentYear--;
- } while (accounts[0].GetTree().GetBudgetSumCents (currentYear) > 0);
-
- this.DropYears.SelectedIndex = 0;
-
- this.RepeaterAccountNames.DataSource = accounts;
- this.RepeaterAccountNames.DataBind();
-
- this.RepeaterAccountBudgets.DataSource = accounts;
- this.RepeaterAccountBudgets.DataBind();
-
- this.RepeaterAccountActuals.DataSource = accounts;
- this.RepeaterAccountActuals.DataBind();
-
- UpdateYearlyResult (accounts);
-
- this.LabelRootBudgetHeader.Text = String.Format (Ledgers.SetRootBudgets_PageHeader,
- CurrentOrganization.Name);
- this.LabelAccountHeader.Text = Global.Financial_BookkeepingAccountShort;
- this.LabelYearlyResultLabel.Text = Global.Financial_YearlyResult;
- this.ButtonSetBudgets.Text = Ledgers.SetRootBudgets_SetNewBudgets;
- this.LabelBudgetOwnerHeader.Text = Ledgers.SetRootBudgets_BudgetOwnerHeader;
-
- this.LabelSidebarActions.Text = Global.Sidebar_Actions;
- this.LabelSidebarInfo.Text = Global.Sidebar_Information;
- this.LabelSidebarTodo.Text = Global.Sidebar_Todo;
- this.LabelDashboardInfo.Text = Ledgers.SetRootBudgets_Info;
-
- LocalizeActualsHeader();
- }
- else
- {
- this._year = Int32.Parse (this.DropYears.SelectedItem.Text);
- }
-
- this.DropYears.Style[HtmlTextWriterStyle.FontWeight] = "bold";
- this.ButtonSetBudgets.Style[HtmlTextWriterStyle.MarginTop] = "4px";
- this.ButtonSetBudgets.Style[HtmlTextWriterStyle.MarginBottom] = "5px";
- this.ButtonSetBudgets.Style[HtmlTextWriterStyle.Padding] = "1px";
-
- // RebindTooltips();
- }
-
- private void LocalizeActualsHeader()
- {
- if (CurrentOrganization.Parameters.FiscalBooksClosedUntilYear >= this._year)
- {
- this.LabelActualsHeader.Text = Global.Financial_Actuals;
- }
- else if (this._year == DateTime.Today.Year)
- {
- this.LabelActualsHeader.Text = Global.Financial_ActualsToDate;
- }
- else
- {
- this.LabelActualsHeader.Text = Global.Financial_ActualsPreliminary;
- }
- }
-
- protected void UpdateYearlyResult (FinancialAccounts rootAccounts)
- {
- Int64 budgetSum = 0;
- Int64 actualSum = 0;
-
- foreach (FinancialAccount account in rootAccounts)
- {
- budgetSum += account.GetTree().GetBudgetSumCents (this._year)/100;
- actualSum -=
- (account.GetTree().GetDeltaCents (new DateTime (this._year, 1, 1), new DateTime (this._year + 1, 1, 1)) +
- 50)/100; // negative: results accounts are sign reversed
- }
-
- this.TextYearlyResult.Text = String.Format ("{0:N0}", budgetSum);
- this.TextYearlyResult.Style[HtmlTextWriterStyle.Width] = "80px";
- this.TextYearlyResult.Style[HtmlTextWriterStyle.TextAlign] = "right";
-
- this.LabelYearlyResultActuals.Text = String.Format ("{0:N0}", actualSum);
- }
-
- protected void RepeaterAccountNames_ItemDataBound (object sender, RepeaterItemEventArgs e)
- {
- RepeaterItem item = e.Item;
-
- if (item.DataItem == null)
- {
- return;
- }
-
- FinancialAccount account = (FinancialAccount) item.DataItem;
-
- Label labelAccountName = (Label) e.Item.FindControl ("LabelAccountName");
- Label labelAccountType = (Label) e.Item.FindControl ("LabelAccountType");
-
- labelAccountName.Text = account.Name;
-
- // TODO: Add Type Too
-
- labelAccountType.Text = account.AccountType.ToString();
- }
-
- protected void RepeaterAccountBudgets_ItemDataBound (object sender, RepeaterItemEventArgs e)
- {
- RepeaterItem item = e.Item;
-
- if (item.DataItem == null)
- {
- return;
- }
-
- FinancialAccount account = (FinancialAccount) item.DataItem;
-
- TextBox textBudget = (TextBox) e.Item.FindControl ("TextBudget");
-
- if (this._year > 0) // called from after viewstate parsed
- {
- textBudget.Text = String.Format ("{0:N0}", account.GetTree().GetBudgetSumCents (this._year)/100);
- textBudget.Style[HtmlTextWriterStyle.TextAlign] = "right";
- textBudget.Style[HtmlTextWriterStyle.Width] = "80px";
- }
-
- Label labelOwnerName = (Label) e.Item.FindControl ("LabelBudgetOwner");
- Person accountOwner = account.Owner;
- if (accountOwner == null)
- {
- labelOwnerName.Text = Global.Global_NoOwner;
- }
- else
- {
- labelOwnerName.Text = accountOwner.Formal;
- }
-
- // RadToolTip toolTip = (RadToolTip)e.Item.FindControl("ToolTip");
-
- // Swarmops.Controls.Swarm.PersonDetailPopup personDetail = (PersonDetailPopup)toolTip.FindControl("PersonDetail");
- // personDetail.PersonChanged += new PersonChangedEventHandler(PersonDetail_PersonChanged);
-
- if (!Page.IsPostBack && CurrentAuthority != null)
- {
-/*
- personDetail.Person = accountOwner;
- personDetail.Cookie = account;*/
- }
-
- HiddenField hiddenAccountId = (HiddenField) e.Item.FindControl ("HiddenAccountId");
- hiddenAccountId.Value = account.Identity.ToString();
-
- // this.TooltipManager.TargetControls.Add(labelBudgetOwner.ClientID, line.AccountIdentity.ToString(), true);
- }
-
- /*
- private void PersonDetail_PersonChanged(object sender, PersonChangedEventArgs e)
- {
- // Here, an owner has changed. We need to re-bind the owners column.
-
- // TODO: This resets the budget amounts to the values in the database, which is not really what we want.
-
- FinancialAccount account = (FinancialAccount) e.Cookie;
- account.Owner = e.NewPerson;
-
- FinancialAccounts accounts = GetRootLevelResultAccounts();
-
- this.RepeaterAccountBudgets.DataSource = accounts;
- this.RepeaterAccountBudgets.DataBind();
-
- // RebindTooltips();
- }*/
-
- protected void DropYears_SelectedIndexChanged (object sender, EventArgs e)
- {
- FinancialAccounts accounts = GetRootLevelResultAccounts();
-
- UpdateYearlyResult (accounts);
-
- this.RepeaterAccountBudgets.DataSource = accounts;
- this.RepeaterAccountBudgets.DataBind();
-
- this.RepeaterAccountActuals.DataSource = accounts;
- this.RepeaterAccountActuals.DataBind();
-
- LocalizeActualsHeader();
-
- // this.RebindTooltips();
- }
-
- private FinancialAccounts GetRootLevelResultAccounts()
- {
- Organization org = CurrentOrganization;
-
- if (org == null && Page.IsPostBack)
- {
- // If we're being called from Page_Init to create controls just to catch events, then this.CurrentOrganization won't be set.
- // We need to create it temporarily from a hidden field:
-
- org = Organization.FromIdentity (Int32.Parse (Request["ctl00$PlaceHolderMain$HiddenInitOrganizationId"]));
- }
-
- FinancialAccount yearlyResult = org.FinancialAccounts.CostsYearlyResult;
- FinancialAccounts allAccounts = FinancialAccounts.ForOrganization (org, FinancialAccountType.Result);
-
- // Select root accounts
-
- FinancialAccounts accounts = new FinancialAccounts();
-
- foreach (FinancialAccount account in allAccounts)
- {
- if (account.ParentFinancialAccountId == 0 && account.Identity != yearlyResult.Identity)
- {
- accounts.Add (account);
- }
- }
-
- return accounts;
- }
-
- /*
- protected void RebindTooltips()
- {
- foreach (RepeaterItem repeaterItem in this.RepeaterAccountBudgets.Items)
- {
- HiddenField hiddenAccountId = (HiddenField)repeaterItem.FindControl("HiddenAccountId");
- FinancialAccount child = FinancialAccount.FromIdentity(Int32.Parse(hiddenAccountId.Value));
- RadToolTip toolTip = (RadToolTip)repeaterItem.FindControl("ToolTip");
-
- PersonDetailPopup personDetail = (PersonDetailPopup)toolTip.FindControl("PersonDetail");
-
- FinancialAccount account = FinancialAccount.FromIdentity(Int32.Parse(hiddenAccountId.Value));
- personDetail.Person = account.Owner;
- personDetail.Cookie = child;
- }
- }*/
-
- protected void RepeaterAccountActuals_ItemDataBound (object sender, RepeaterItemEventArgs e)
- {
- RepeaterItem item = e.Item;
-
- if (item.DataItem == null)
- {
- return;
- }
-
- FinancialAccount account = (FinancialAccount) item.DataItem;
-
- Label labelActuals = (Label) e.Item.FindControl ("LabelAccountActuals");
-
- Int64 actuals =
- (account.GetTree().GetDeltaCents (new DateTime (this._year, 1, 1), new DateTime (this._year + 1, 1, 1)) + 50)/
- 100;
-
- labelActuals.Text = String.Format ("{0:N0}", -actuals); // negative as results accounts are sign reversed
- }
-
-
- protected void ButtonSetBudgets_Click (object sender, EventArgs e)
- {
- foreach (RepeaterItem repeaterItem in this.RepeaterAccountBudgets.Items)
- {
- HiddenField hiddenAccountId = (HiddenField) repeaterItem.FindControl ("HiddenAccountId");
- TextBox textBudget = (TextBox) repeaterItem.FindControl ("TextBudget");
- FinancialAccount account = FinancialAccount.FromIdentity (Int32.Parse (hiddenAccountId.Value));
-
- // TODO: Possible race condition here, fix with HiddenField
-
- Int64 newBudgetAmount = Int64.Parse (textBudget.Text.Replace (",", "").Replace (" ", ""),
- Thread.CurrentThread.CurrentCulture); // TODO: May throw -- catch and send error message
-
- Int64 currentBudgetAmount = account.GetTree().GetBudgetSumCents (this._year)/100;
-
- // Set the new amount to the difference between the single budget of this account and the intended amount
-
- if (newBudgetAmount != currentBudgetAmount)
- {
- account.SetBudgetCents (this._year,
- account.GetBudgetCents (this._year) + (newBudgetAmount - currentBudgetAmount)*100);
- }
- }
-
- // After updating budgets, rebind repeater
-
- FinancialAccounts accounts = GetRootLevelResultAccounts();
-
- UpdateYearlyResult (accounts);
-
- this.RepeaterAccountBudgets.DataSource = accounts;
- this.RepeaterAccountBudgets.DataBind();
- }
-}
\ No newline at end of file
diff --git a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
index 309067bb..b5f8f2e8 100644
--- a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
@@ -27,7 +27,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers.TaxForms
Localize();
}
- EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree;
+ RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree);
}
diff --git a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
index d2545f00..143d2543 100644
--- a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
@@ -42,7 +42,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
Localize();
}
}
- EasyUIControlsUsed = EasyUIControl.DataGrid;
+ RegisterControl (EasyUIControl.DataGrid);
}
private void Localize()
diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
index f0b2462a..f394e44a 100644
--- a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
+++ b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
@@ -38,8 +38,6 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
this.TextName.Focus();
}
-
- IncludedControlsUsed = IncludedControl.JsonParameters;
}
private void Populate()
diff --git a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
index dbce8137..555aec4c 100644
--- a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
+++ b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
@@ -22,7 +22,7 @@ namespace Swarmops.Frontend.Pages.Swarm
Localize();
}
- EasyUIControlsUsed = EasyUIControl.Tree | EasyUIControl.DataGrid;
+ RegisterControl (EasyUIControl.Tree | EasyUIControl.DataGrid);
}
private void Localize()
diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css
index 46681175..2a42a4a6 100644
--- a/Site5/Style/style-v5.css
+++ b/Site5/Style/style-v5.css
@@ -1068,6 +1068,14 @@ nav.alertify-buttons {
}
+/* VARIOUS ADDITIONS - SORT LATER */
+
+span.spanGrayedOut {
+ opacity: .5;
+}
+
+
+
/* COLOR SCHEME
#A2BEFF #476EC7 #1C397E #C8D9FF #E4ECFF -- blue (hue 222)
diff --git a/Swarmops.sln b/Swarmops.sln
index 4182ae93..4041bfa5 100644
--- a/Swarmops.sln
+++ b/Swarmops.sln
@@ -32,7 +32,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Site5", "Site5\", "{367F36E
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
- VWDPort = "1589"
+ VWDPort = "37689"
VWDVirtualPath = "/"
DefaultWebSiteLanguage = "Visual C#"
EndProjectSection