slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imp: web: add form: layout improvements, use available space

Browse Source
This commit is contained in:
Simon Michael 2022-08-27 12:12:45 +01:00
parent 473082f782
commit c97e05e0dd
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-web/Hledger/Web/Handler/AddR.hs
View File

@ -51,7 +51,7 @@ postAddR = do
sendResponse =<< defaultLayout [whamlet| sendResponse =<< defaultLayout [whamlet|
<h2>Add transaction <h2>Add transaction
<div .row style="margin-top:1em"> <div .row style="margin-top:1em">
<form#addform.form.col-xs-12.col-md-8 method=post enctype=#{enctype}> <form#addform.form.col-xs-12.col-sm-11 method=post enctype=#{enctype}>
^{view} ^{view}
|] |]

42
hledger-web/templates/add-form.hamlet
View File

@ -21,40 +21,36 @@
}); });
^{extra} ^{extra}
<div .form-group> <div .row>
<div .row> <div .col-md-3.col-sm-5.col-xs-6 :isJust (fvErrors dateView):.has-error>
<div .col-md-3 .col-xs-6 .col-sm-6 :isJust (fvErrors dateView):.has-error> <div #dateWrap .form-group.input-group.date>
<div #dateWrap .form-group.input-group.date> ^{fvInput dateView}
^{fvInput dateView} <div .input-group-addon>
<div .input-group-addon> <span .glyphicon .glyphicon-th>
<span .glyphicon .glyphicon-th> $maybe err <- fvErrors dateView
$maybe err <- fvErrors dateView <span .help-block .error-block>#{err}
<span .help-block .error-block>#{err} <div .col-md-9.col-sm-7.col-xs-6 :isJust (fvErrors descView):.has-error>
<div .col-md-9 .col-xs-6 .col-sm-6 :isJust (fvErrors descView):.has-error> <div .form-group>
<div .form-group> ^{fvInput descView}
^{fvInput descView} $maybe err <- fvErrors descView
$maybe err <- fvErrors descView <span .help-block .error-block>#{err}
<span .help-block .error-block>#{err}
<div .row>
<div .col-md-3 .col-xs-6 .col-sm-6>
<div .col-md-9 .col-xs-6 .col-sm-6>
<div .account-postings> <div .account-postings>
$forall (n, (acc, amt, accE, amtE)) <- displayRows $forall (n, (acc, amt, accE, amtE)) <- displayRows
<div .form-group .row .account-group> <div .form-group .row .account-group style="padding-left:1em;">
<div .col-md-8 .col-xs-8 .col-sm-8 :isJust accE:.has-error> <div .col-sm-9.col-xs-9 :isJust accE:.has-error>
<input .account-input.form-control.input-lg.typeahead type=text <input .account-input.form-control.input-lg.typeahead type=text
name=account placeholder="Account #{n}" value="#{acc}"> name=account placeholder="Account #{n}" value="#{acc}">
$maybe err <- accE $maybe err <- accE
<span .help-block .error-block>_{err} <span .help-block .error-block>_{err}
<div .col-md-4 .col-xs-4 .col-sm-4 :isJust amtE:.has-error> <div .col-sm-3.col-xs-3 :isJust amtE:.has-error>
<input .amount-input.form-control.input-lg type=text <input .amount-input.form-control.input-lg type=text
name=amount placeholder="Amount #{n}" value="#{amt}"> name=amount placeholder="Amount #{n}" value="#{amt}">
$maybe err <- amtE $maybe err <- amtE
<span .help-block .error-block>_{err} <span .help-block .error-block>_{err}
<div .row> <div .row>
<div .col-md-9 .col-xs-9 .col-sm-9> <div .col-sm-9.col-xs-9>
$if length files > 1 $if length files > 1
Add to: Add to:
&nbsp; &nbsp;
@ -62,5 +58,5 @@
^{fvInput fileView} ^{fvInput fileView}
$maybe err <- fvErrors fileView $maybe err <- fvErrors fileView
<span .help-block .error-block>#{err} <span .help-block .error-block>#{err}
<div .col-md-3 .col-xs-3 .col-sm-3 style="text-align:right;"> <div .col-sm-3.col-xs-3 style="text-align:right;">
<button type=submit .btn .btn-default .btn-lg name=submit style="font-weight:bold;">Add <button type=submit .btn .btn-default .btn-lg name=submit style="font-weight:bold;">Save

2
hledger-web/templates/manage.hamlet
View File

@ -2,7 +2,7 @@
Your journal's files Your journal's files
<div.row> <div.row>
<div .col-xs-12.col-sm-8.col-md-6> <div .col-md-6.col-sm-8.col-xs-12>
<table .table.table-condensed> <table .table.table-condensed>
<thead> <thead>
<th> <th>