Support types

3 files changed, 19 insertions, 8 deletions

diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index c1ccf72..bd76a01 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -1,20 +1,20 @@
 .main
   min-width: 20em
-.table
+.table, table
   display: table
   border-collapse: collapse
-.table div
+.table div, table td
   vertical-align: middle
-.td
+.td, td
   display: table-cell
   text-align: center
   padding: 0.25em
-.tr
+.tr, tr
   display: table-row
 .tc
   display: table-caption
   padding: 0.25em
-.th
+.th, th
   display: table-cell
   font-variant: small-caps
   font-weight: bold
@@ -26,8 +26,15 @@
   padding: 0.25em
 .kind:only-child
   text-align: center
+.type
+  display: table-cell
+  text-align: center
+  padding: 0.25em
+  color: #aaa
 .table .table .td, .table .table .tc, .table .table .th, .table .table .kind
   padding: 0
+table table td, table table th
+  padding: 0
 #messages
   list-style-type: none
   margin: 1em auto 1em 0
@@ -55,7 +62,7 @@ button
   background-color: #f0f0f0
 .color:nth-child(odd)
   background-color: #fff
-body > div
+body > div, body > table
   margin: 0 auto
 .table > h1
   display: table-caption
diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index 775176d..3be43db 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -1,6 +1,7 @@
 <div .table>
   <div .tr .sepBelow>
     <div .th>Item
+    <div .th>Type
     <div .th>Bought
     <div .th>Expires
     <div .th>Opened
@@ -12,7 +13,7 @@
         <div .td>
           <button type=submit>
             Insert
-  $forall Entity itemId Item{..} <- stock
+  $forall WithType (Entity itemId Item{..}) itemType <- stock
     $if Just itemId == (preview updateId =<< formState)
       $with Just UpdateForm{..} <- formState
          <form .tr .color action=@{UpdateItemR fsUpdateId}##{toPathPiece fsUpdateId} method=post enctype=#{fsUpdateEncoding} ##{toPathPiece fsUpdateId}>
@@ -23,6 +24,7 @@
     $else
       <div .tr .color ##{toPathPiece itemId}>
         <div .kind>#{itemKind}
+        <div .type>#{itemType}
         <div .td .day>
           $maybe bought <- itemBought
             #{dayFormat bought}
diff --git a/templates/referenceListing.hamlet b/templates/referenceListing.hamlet
index a76e603..414a3ec 100644
--- a/templates/referenceListing.hamlet
+++ b/templates/referenceListing.hamlet
@@ -1,6 +1,7 @@
 <div .table>
   <div .tr .sepBelow>
     <div .th>Item
+    <div .th>Type
     <div .th>Actions
   $if isJust (preview insertForm =<< formState)
     $with Just InsertForm{..} <- formState
@@ -9,9 +10,10 @@
         <div .td>
           <button type=submit>
             Insert
-  $forall Entity referenceId Reference{..} <- reference
+  $forall WithType (Entity referenceId Reference{..}) referenceType <- reference
     <div .tr .color ##{toPathPiece referenceId}>
       <div .kind>#{referenceKind}
+      <div .type>#{referenceType}
       <form .td method=post action=@{DeleteRefItemR referenceId}>
         <button type=submit>
           Delete