3 files changed, 23 insertions, 15 deletions
diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index da76e28..bc64e8e 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -40,7 +40,7 @@ div.itemId
  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 f0ff1e4..802905d 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -30,22 +30,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 da76e28..bc64e8e 100644 --- a/templates/default-layout.cassius +++ b/templates/default-layout.cassius
@@ -40,7 +40,7 @@ div.itemId
40	color: #aaa	40	color: #aaa
41	.table .table .td, .table .table .tc, .table .table .th, .table .table .kind	41	.table .table .td, .table .table .tc, .table .table .th, .table .table .kind
42	padding: 0	42	padding: 0
43	table table td, table table th	43	table table td, table table th, .table table td, .table table th
44	padding: 0	44	padding: 0
45	#messages	45	#messages
46	list-style-type: none	46	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 f0ff1e4..802905d 100644 --- a/templates/inventoryListing.hamlet +++ b/templates/inventoryListing.hamlet
@@ -30,22 +30,27 @@
30	<div .kind>#{itemKind}	30	<div .kind>#{itemKind}
31	<div .type>#{itemType}	31	<div .type>#{itemType}
32	<div .td .day>	32	<div .td .day>
33	$maybe bought <- itemBought	33	$case itemBought
34	#{dayFormat bought}	34	$of DateUnknown
35	$nothing	35	<hr>
36	<hr>	36	$of DateKnown d
		37	#{dayFormat d}
37	<div .td .day>	38	<div .td .day>
38	$maybe expires <- itemExpires	39	$case itemExpires
39	#{dayFormat expires}	40	$of DateNever
40	$nothing	41	<hr>
41	<hr>	42	$of DateKnown d
		43	<span :d < today:.expired>#{dayFormat d}
42	<div .td .day>	44	<div .td .day>
43	$maybe opened <- itemOpened	45	$case itemOpened
44	#{dayFormat opened}	46	$of DateKnown d
45	$nothing	47	#{dayFormat d}
46	<form method=post action=@{OpenItemR itemId}>	48	$of DateUnknown
47	<button type=submit>	49	Yes
48	Open	50	$of DateNever
		51	<form method=post action=@{OpenItemR itemId}>
		52	<button type=submit>
		53	Open
49	<div .td>	54	<div .td>
50	<form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>	55	<form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>
51	<button type=submit>	56	<button type=submit>