3 files changed, 23 insertions, 15 deletions
diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index bd76a01..50aab3f 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -33,7 +33,7 @@
  color: #aaa
 .table .table .td, .table .table .tc, .table .table .th, .table .table .kind
  padding: 0
-table table td, table table th
+table table td, table table th, .table table td, .table table th
  padding: 0
 #messages
  list-style-type: none
diff --git a/templates/inventoryListing.cassius b/templates/inventoryListing.cassius
new file mode 100644
index 0000000..9a7459e
--- /dev/null
+++ b/templates/inventoryListing.cassius
@@ -0,0 +1,3 @@
+.expired
+  color: #800
+  font-weight: bold
+\ No newline at end of file
diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index 3be43db..39758bb 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -26,22 +26,27 @@
        <div .kind>#{itemKind}
        <div .type>#{itemType}
        <div .td .day>
-          $maybe bought <- itemBought
+          $case itemBought
-            #{dayFormat bought}
+            $of DateUnknown
-          $nothing
+              <hr>
-            <hr>
+            $of DateKnown d
+              #{dayFormat d}
        <div .td .day>
-          $maybe expires <- itemExpires
+          $case itemExpires
-            #{dayFormat expires}
+            $of DateNever
-          $nothing
+              <hr>
-            <hr>
+            $of DateKnown d
+              <span :d < today:.expired>#{dayFormat d}
        <div .td .day>
-          $maybe opened <- itemOpened
+          $case itemOpened
-            #{dayFormat opened}
+            $of DateKnown d
-          $nothing
+              #{dayFormat d}
-            <form method=post action=@{OpenItemR itemId}>
+            $of DateUnknown
-              <button type=submit>
+              Yes
-                Open
+            $of DateNever
+              <form method=post action=@{OpenItemR itemId}>
+                <button type=submit>
+                  Open
        <div .td>
          <form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>
            <button type=submit>

diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius index bd76a01..50aab3f 100644 --- a/templates/default-layout.cassius +++ b/templates/default-layout.cassius
@@ -33,7 +33,7 @@
33	color: #aaa	33	color: #aaa
34	.table .table .td, .table .table .tc, .table .table .th, .table .table .kind	34	.table .table .td, .table .table .tc, .table .table .th, .table .table .kind
35	padding: 0	35	padding: 0
36	table table td, table table th	36	table table td, table table th, .table table td, .table table th
37	padding: 0	37	padding: 0
38	#messages	38	#messages
39	list-style-type: none	39	list-style-type: none


diff --git a/templates/inventoryListing.cassius b/templates/inventoryListing.cassius new file mode 100644 index 0000000..9a7459e --- /dev/null +++ b/templates/inventoryListing.cassius
@@ -0,0 +1,3 @@
		1	.expired
		2	color: #800
		3	font-weight: bold \ No newline at end of file


diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet index 3be43db..39758bb 100644 --- a/templates/inventoryListing.hamlet +++ b/templates/inventoryListing.hamlet
@@ -26,22 +26,27 @@
26	<div .kind>#{itemKind}	26	<div .kind>#{itemKind}
27	<div .type>#{itemType}	27	<div .type>#{itemType}
28	<div .td .day>	28	<div .td .day>
29	$maybe bought <- itemBought	29	$case itemBought
30	#{dayFormat bought}	30	$of DateUnknown
31	$nothing	31	<hr>
32	<hr>	32	$of DateKnown d
		33	#{dayFormat d}
33	<div .td .day>	34	<div .td .day>
34	$maybe expires <- itemExpires	35	$case itemExpires
35	#{dayFormat expires}	36	$of DateNever
36	$nothing	37	<hr>
37	<hr>	38	$of DateKnown d
		39	<span :d < today:.expired>#{dayFormat d}
38	<div .td .day>	40	<div .td .day>
39	$maybe opened <- itemOpened	41	$case itemOpened
40	#{dayFormat opened}	42	$of DateKnown d
41	$nothing	43	#{dayFormat d}
42	<form method=post action=@{OpenItemR itemId}>	44	$of DateUnknown
43	<button type=submit>	45	Yes
44	Open	46	$of DateNever
		47	<form method=post action=@{OpenItemR itemId}>
		48	<button type=submit>
		49	Open
45	<div .td>	50	<div .td>
46	<form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>	51	<form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>
47	<button type=submit>	52	<button type=submit>