Minor cosmetics, Account Plan

This commit is contained in:
Rick Falkvinge
2014-02-18 13:41:37 +00:00
parent 746d441618
commit c74e2e3d2c
3 changed files with 23 additions and 1 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

@@ -78,6 +78,28 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
continue;
}
string ownerString = " ";
if (account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost)
{
if (account.OwnerPersonId != 0)
{
// TODO: add zoom, write capability
ownerString =
"<span style=\\\"padding-left:20px;background-repeat:no-repeat;background-image:url('" +
account.Owner.GetSecureAvatarLink(16) + "')\\\">" +
JsonSanitize(Server.HtmlEncode(account.Owner.Canonical)) + "</span>";
}
else
{
// TODO: add write capability
ownerString =
"<span style=\\\"padding-left:20px;background-repeat:no-repeat;background-image:url('/Images/Icons/iconshock-warning-16x12px.png')\\\">" +
JsonSanitize(Server.HtmlEncode(Resources.Global.Global_NoOwner)) + "</span>";
}
}
string grandChildren = GetAccountsRecurse(accountType, account.Identity);
if (!string.IsNullOrEmpty(grandChildren))
{
@@ -88,7 +110,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
childStrings.Add('{' + String.Format("\"id\":\"{0}\",\"accountName\":\"{1}\",\"owner\":\"{2}\",\"balance\":\"{3}\",\"budget\":\"{4}\"",
account.Identity,
Server.HtmlEncode(JsonSanitize(account.Name)),
account.OwnerPersonId != 0? "<span style=\\\"padding-left:20px;background-repeat:no-repeat;background-image:url('" + account.Owner.GetSecureAvatarLink(16) + "')\\\">" + JsonSanitize(Server.HtmlEncode(account.Owner.Canonical)) + "</span>" : JsonSanitize(Resources.Global.Global_NoOwner),
ownerString,
_hashedAccounts[account.Identity].Count > 1 ? JsonDualString(account.Identity, _treeBalanceLookup[account.Identity], _singleBalanceLookup[account.Identity]) : (_singleBalanceLookup [account.Identity] / 100.0).ToString("N0"),
account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost?
_hashedAccounts[account.Identity].Count > 1 ? (JsonDualString(account.Identity, _treeBudgetLookup[account.Identity], _singleBudgetLookup[account.Identity])) :