Fixed a layout problem in tx view

This commit is contained in:
Falkvinge
2017-02-25 19:49:03 +01:00
parent a245a68f92
commit 41dbbcea04
3 changed files with 13 additions and 2 deletions
@@ -1,5 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.Controls.Financial.CurrencyTextBox" Codebehind="CurrencyTextBox.ascx.cs" %>
<%@ Import Namespace="Swarmops.Common.Enums" %>
<!-- TODO: Add nice autocomplete stuff -->
<div class="stacked-input-control"><asp:TextBox ID="Input" runat="server" CssClass="alignRight" /><asp:HiddenField ID="NativeCurrency" runat="server"/><asp:HiddenField ID="NativeAmount" runat="server"/></div>
<% if (this.Layout == LayoutDirection.Vertical) { %><div class="stacked-input-control"><% } %>
<asp:TextBox ID="Input" runat="server" CssClass="alignRight" /><asp:HiddenField ID="NativeCurrency" runat="server"/><asp:HiddenField ID="NativeAmount" runat="server" />
<% if (this.Layout == LayoutDirection.Vertical) { %></div><% } %>
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
using Swarmops.Common.Enums;
using System.Web.UI;
namespace Swarmops.Frontend.Controls.Financial
@@ -13,6 +14,11 @@ namespace Swarmops.Frontend.Controls.Financial
protected void Page_Load (object sender, EventArgs e)
{
this.Input.Attributes["role"] = "note"; // disable Lastpass trying to autofill
if (this.Layout == LayoutDirection.Unknown)
{
this.Layout = LayoutDirection.Vertical;
}
}
public Int64 Cents
@@ -66,6 +72,8 @@ namespace Swarmops.Frontend.Controls.Financial
// TODO: Add other-currency parsing
public LayoutDirection Layout { get; set; }
public new void Focus()
{
this.Input.Focus();
+1 -1
View File
@@ -344,7 +344,7 @@
<div id="divEditTransaction">
<h2><asp:Label ID="LabelAddTransactionRowsHeader" runat="server" /></h2>
<span class="content"><h2 style="border-bottom: none"><asp:Label ID="LabelAddRowAccount" runat="server" /><Swarmops5:ComboBudgets ID="BudgetAddRow" ListType="All" runat="server" Layout="Horizontal" />, <asp:Label ID="LabelAddRowAmount" runat="server" /> <Swarmops5:CurrencyTextBox ID="TextInsertAmount" runat="server" /> <span class="elementFloatFar"><input id="ButtonAddTransactionRow" type="button" value='#AddRow#'/></span></h2></span>
<span class="content"><h2 style="border-bottom: none"><asp:Label ID="LabelAddRowAccount" runat="server" /><Swarmops5:ComboBudgets ID="BudgetAddRow" ListType="All" runat="server" Layout="Horizontal" />, <asp:Label ID="LabelAddRowAmount" runat="server" /> <Swarmops5:CurrencyTextBox ID="TextInsertAmount" Layout="Horizontal" runat="server" /> <span class="elementFloatFar"><input id="ButtonAddTransactionRow" type="button" value='#AddRow#'/></span></h2></span>
</div>
<div id="divTransactionTracking">