This commit is contained in:
Falkvinge
2017-05-14 15:00:10 +02:00
parent 8a318da04d
commit aa111e9f71
4 changed files with 14 additions and 6 deletions
+1 -1
View File
@@ -227,7 +227,7 @@
<div class="box" style="background-image: url(/Images/Other/coins-background-istockphoto.jpg); background-size: 700px">
<div class="content">
<div class="odometer-wrapper">
<div class="elementFloatFar odometer odometer-currency" id="odoProfitLossToDate"><%= (CurrentOrganization.GetProfitLossCents() / 100.0 + 0.001).ToString(CultureInfo.InvariantCulture) %></div><div class="odometer-label"><asp:Label runat="server" ID="MasterLabelDashboardProfitLoss">Profit To Date XYZ</asp:Label></div>
<div class="elementFloatFar odometer odometer-currency" id="odoProfitLossToDate"><%= (CurrentOrganization.GetProfitLossCents() / 100.0 + 0.001).ToString(CultureInfo.InvariantCulture) %></div><div class="odometer-label"><asp:Label runat="server" ID="MasterLabelDashboardProfitLoss">Profit To Date XYZ</asp:Label> <span class="currentYear"><%=DateTime.UtcNow.Year %></span></div>
</div>
</div>
</div>
+10 -2
View File
@@ -183,6 +183,15 @@ namespace Swarmops.Frontend {
/// </remarks>
protected global::System.Web.UI.WebControls.Label LabelPageTitle;
/// <summary>
/// MasterLabelDashboardProfitLoss 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.Label MasterLabelDashboardProfitLoss;
/// <summary>
/// PlaceHolderMain control.
/// </summary>
@@ -596,7 +605,7 @@ namespace Swarmops.Frontend {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Swarmops.Frontend.Controls.Base.ModalDialog ModalMasterEnableBitId;
/// <summary>
/// MasterLabelBitIdRegisterHeader control.
/// </summary>
@@ -605,6 +614,5 @@ namespace Swarmops.Frontend {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label MasterLabelBitIdRegisterHeader;
protected global::System.Web.UI.WebControls.Label MasterLabelDashboardProfitLoss;
}
}
@@ -74,7 +74,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
line2 += string.Format(CultureInfo.CurrentCulture, ",\"liabilities\":\"{0:N0}\"",
(_totals.AssetsCents-_totals.LiabilitiesCents) / 100.0);
return "[{" + line1 + "},{" + line2 + "}]";
return "{" + line1 + "},{" + line2 + "}";
}
else
{
@@ -83,7 +83,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
line2 += string.Format(CultureInfo.CurrentCulture, ",\"assets\":\"{0:N0}\"",
(_totals.LiabilitiesCents - _totals.AssetsCents) / 100.0);
return "[{" + line1 + "},{" + line2 + "}]";
return "{" + line1 + "},{" + line2 + "}";
}
}
+1 -1
View File
@@ -95,7 +95,7 @@ namespace Swarmops.Pages.Security
{
DashboardMessage.Set (String.Format(Resources.Pages.Security.Login_AsOpenLedgers, organizationOpenLedgers.Name));
FormsAuthentication.SetAuthCookie(Authority.FromLogin (Person.FromIdentity (Person.OpenLedgersIdentity), organizationOpenLedgers).ToEncryptedXml(), true);
Response.Redirect (@"/Ledgers/BalanceSheet");
Response.Redirect (@"/Ledgers/Balance");
}
// Check for SSL and force it