form styling

diff --git a/invoices.css b/invoices.css
index 4a0edaa54d44080ee361e740aa20ae7f02429e54..de229a33f4c668cb3023fd25e5ac497d2912ec02 100755 (executable)
--- a/invoices.css
+++ b/invoices.css
@@ -167,29 +167,31 @@ form input[type=number] {
   content: '';
 }
 
-.invoice form label[for=vatsb],
-.invoice form label[for=vatyw],
-.invoice form label[for=vatrate] {
+.invoice form label[for=number]::after,
+.invoice form label[for=date]::after{
+  white-space: pre;
+  content: '\0A';
+}
+
+.invoice form label[for=number],
+.invoice form input[name=number] {
   display: block;
   text-align: left;
 }
-.invoice form label[for=vatnett],
-.invoice form label[for=vatgross] {
-  display: inline-block;
-  float: left; margin-right: 1em;
-  line-height: 1em;
-}
-.invoice form input[type=radio] { display: none; }
-.invoice form input[type=radio] + label::before {
-  content: '(  ) ';
-}
-.invoice form input:checked + label[for^=vat]::before {
-  content: '(x) ';
+
+.invoice form label[for=date],
+.invoice form input#date {
+  position: relative;
+  top: -5.75em;
+  text-align: center;
+  margin-right: 0;
+  width: 7em;
 }
 
 .invoice form table {
-  width: 30em;
-  margin-top: 1em;
+  min-width: 30em;
+  width: 100%;
+  margin-top: -3em;
   border-spacing: 0;
 }
 .invoice form table tr > th {
@@ -220,3 +222,28 @@ form input[type=number] {
   width: 100%; height: 100%;
   height: 4.625em;
 }
+
+.invoice form label[for=vatsb],
+.invoice form label[for=vatyw] {
+  display: block;
+  text-align: left;
+  margin-top: 2em;
+}
+.invoice form label[for=vatrate] {
+  display: block;
+  text-align: left;
+  margin-bottom: 1.5em;
+}
+.invoice form label[for=vatnett],
+.invoice form label[for=vatgross] {
+  display: inline-block;
+  float: left; margin-right: 1em;
+  line-height: 1em;
+}
+.invoice form input[type=radio] { display: none; }
+.invoice form input[type=radio] + label::before {
+  content: '(  ) ';
+}
+.invoice form input:checked + label[for^=vat]::before {
+  content: '(x) ';
+}

diff --git a/invoices.sh b/invoices.sh
index 49e54c07517fa8206521d20c302f426a74dd51d9..b0d15396f9a3ed3be5ee1bc694062d22aa47c6ce 100755 (executable)
--- a/invoices.sh
+++ b/invoices.sh
@@ -155,17 +155,7 @@ edit_invoice(){
          <!--
          [label for=hourly Hourly Rate:]
          [input #hourly type=number name=hourly value="${hourly}"]
-
-         [radio "vat" "smallbusiness" #vatsb $([ "${vat#vat=}" = smallbusiness ] && printf checked) ]
-         [label for=vatsb Small business exemption from VAT]
          -->
-         [radio "vat" "youthwork" #vatyw $([ "${vat#vat=}" = youthwork ] && printf checked) ]
-         [label for=vatyw Umsatzsteuerbefreiung für Jugendhilfe, §4 Abs. 25 UStG.]
-         [radio "vat" "nett" #vatnett $([ "${vat#vat=}" = nett ] && printf checked)]
-         [label for=vatnett Netto]
-         [radio "vat" "gross" #vatgross $([ "${vat#vat=}" = gross ] && printf checked)]
-         [label for=vatgross Brutto]
-         [label for=vatrate USt.: [input type=number name="vatrate" value="${vatrate}"]% ]
        
          [table
            [tr [th Stück] [th Leistung] [th Stückpreis] [th Summe] ]
@@ -195,6 +185,18 @@ $({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
             esac)
             ]]
          ]
+
+         <!--
+         [radio "vat" "smallbusiness" #vatsb $([ "${vat#vat=}" = smallbusiness ] && printf checked) ]
+         [label for=vatsb Small business exemption from VAT]
+         -->
+         [radio "vat" "youthwork" #vatyw $([ "${vat#vat=}" = youthwork ] && printf checked) ]
+         [label for=vatyw Umsatzsteuerbefreiung für Jugendhilfe, §4 Abs. 25 UStG.]
+         [radio "vat" "nett" #vatnett $([ "${vat#vat=}" = nett ] && printf checked)]
+         [label for=vatnett Netto]
+         [radio "vat" "gross" #vatgross $([ "${vat#vat=}" = gross ] && printf checked)]
+         [label for=vatgross Brutto]
+         [label for=vatrate USt.: [input type=number name="vatrate" value="${vatrate}"]% ]
           [select name=status
              [option value=open      $( [ $status = open      ] && printf selected=selected ) Offen]
              [option value=sent      $( [ $status = sent      ] && printf selected=selected ) Verschickt]
@@ -202,6 +204,7 @@ $({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
              [option value=paid      $( [ $status = paid      ] && printf selected=selected ) Bezahlt]
              [option value=cancelled $( [ $status = cancelled ] && printf selected=selected ) Storniert]
           ]
+
          [submit "genpdf" "$tid" PDF Exportieren]
          [submit "update" "$tid" Aktualisieren]
        ]