Преглед на файлове

Invoices now fully functional post types

George Baugh преди 5 месеца
родител
ревизия
e067c3fd74

+ 9 - 0
www/styles/print.css

@@ -32,3 +32,12 @@ h3.blogtitles {
 em.blogdetail {
  font-size: 8pt;
 }
+form {
+    display:none;
+}
+a {
+    text-decoration:none;
+}
+.noprint {
+    display:none;
+}

+ 20 - 0
www/styles/structure.css

@@ -132,6 +132,26 @@ iframe.responsive {
     height: 20rem;
 }
 
+.table {
+    display: table;
+}
+
+.table-row {
+    display: table-row;
+}
+
+.table-cell {
+    display: table-cell;
+    width:100%;
+}
+
+.underline {
+    border-bottom: .1rem solid;
+}
+.overline {
+    border-top: .1rem solid;
+}
+
 @media(max-width: 45rem) {
 	iframe.responsive {
     	width: 100%;

+ 52 - 29
www/templates/html/components/forms/invoice.tx

@@ -8,35 +8,57 @@
         : }
 
         <div class="postData responsive-text" id="postData-<: $post.id :>">
-            Invoice ID# <: $post.id :><br />
-            Created: <span class="unixtimestamp"><: $post.created :></span><br />
-            Due: <span class="unixtimestamp"><: $post.created + ($post.due_days * 86400 ) :></span><br />
-            <hr />
-
-            <span style="float:left;">
-            Payee<br />
-            <: $post.payee_entity.data | mark_raw :>
-            </span>
-            <span style="float: right;">
-            Payor<br />
-            <: $post.payor_entity.data | mark_raw :>
-            </span>
-            <hr />
-
-            Payment Method:
-            <: $post.payee_entity.payment_method :><br />
-            Payment Details:
-            <: $post.payee_entity.payment_details :><br />
-
-            <hr />
-            <ul>
-            : for $post.data -> $poast {
-                <li>
-                <: render_it($poast) | mark_raw  :>
-                </li>
-            : }
-            </ul>
-            Total: <: $post.total :>
+            <div class="table">
+                <div class="table-row">
+                    <div class="table-cell">
+                        Invoice ID# <: $post.id :><br />
+                    </div>
+                    <div class="table-cell"></div>
+                </div>
+                <div class="table-row">
+                    <div class="table-cell underline">
+                        Created: <span class="unixtimestamp"><: $post.created :></span><br />
+                    </div>
+                    <div class="table-cell underline">
+                        Due: <span class="unixtimestamp"><: $post.created + ($post.due_days * 86400 ) :></span>
+                    </div>
+                </div>
+                <div class="table-row">
+                    <div class="table-cell underline">
+                        Payee<br />
+                        <: $post.payee_entity.data | mark_raw :>
+                    </div>
+                    <div class="table-cell underline">
+                        Payor<br />
+                        <: $post.payor_entity.data | mark_raw :>
+                    </div>
+                </div>
+                <div class="table-row">
+                    <div class="table-cell underline">
+                        Payment Method:<br />
+                        <: $post.payee_entity.payment_method :>
+                    </div>
+                    <div class="table-cell underline">
+                        Payment Details:<br />
+                        <: $post.payee_entity.payment_details :>
+                    </div>
+                </div>
+                : for $post.data -> $poast {
+                    <div class="table-row">
+                    <div class="table-cell">
+                    <: render_it($poast) | mark_raw  :>
+                    </div>
+                    <div class="table-cell">
+                    </div>
+                    </div>
+                : }
+                <div class="table-row">
+                    <div class="table-cell overline">
+                        Total: <: $post.total :>
+                    </div>
+                    <div class="table-cell overline"></div>
+                </div>
+            </div>
         </div>
     : }
 
@@ -45,6 +67,7 @@
         : include "edit_head.tx";
         <form class="Submissions" action="/post/save" method="POST" enctype="multipart/form-data">
             Title *<br /><input required class="cooltext" type="text" name="title" placeholder="Iowa Man Destroys Moon" value="<: $post.title :>" />
+            : include "preview.tx";
             : include "visibility.tx";
             : include "acls.tx";
             : include "tags.tx";

+ 3 - 3
www/templates/html/components/invoice_tofrom.tx

@@ -1,14 +1,14 @@
 Payee<br />
 <select id="<: $post.id :>-payee" class="cooltext" name="payee">
     : for $primary_post.entities -> $payee {
-        <option value="<: $payee.id :>"><: $payee.title :></option>
+        <option value="<: $payee.id :>" <: if ($payee.id == $post.payee) { :>selected<: } :> ><: $payee.title :></option>
     : }
 </select>
 Payor<br />
 <select id="<: $post.id :>-payor" class="cooltext" name="payor">
     : for $primary_post.entities -> $payor {
-        <option value="<: $payor.id :>"><: $payor.title :></option>
+        <option value="<: $payor.id :>" <: if ($payor.id == $post.payor) { :>selected<: } :> ><: $payor.title :></option>
     : }
 </select>
 Due in How many Days?<br />
-<input type="text" id="<: $post.id :>-due_days" class="cooltext" name="due_days" placeholder='0'></input>
+<input type="text" id="<: $post.id :>-due_days" class="cooltext" name="due_days" placeholder='0' value="<: $post.due_days :>"></input>

+ 1 - 1
www/templates/html/components/post_title.tx

@@ -1,7 +1,7 @@
 <h3 class='blogtitles'>
     : if (!$style || $style == 'embed') {
         <a ><a href='<: $post.href :>' ><: $post.title :></a>
-        <a class="undecorated" href='<: $post.local_href :>'>🔗</a>
+        <a class="undecorated noprint" href='<: $post.local_href :>'>🔗</a>
     : }
     : if (!$style) {
         : if ( $post.version_max && !$rss ) {