From 13ebc9d3f82f686ca2bc8388095feeb9067e2e40 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 31 Oct 2015 21:26:13 +0100
Subject: web: o Showning device name and description. o Trying out cards for
 the property list.

---
 web/static/app/templates/property.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'web/static/app/templates/property.html')

diff --git a/web/static/app/templates/property.html b/web/static/app/templates/property.html
index 5e8199d..8cff1f0 100644
--- a/web/static/app/templates/property.html
+++ b/web/static/app/templates/property.html
@@ -1,15 +1,19 @@
 <div class="container">
 
   <h1>
-    <a href="#/device/{{ctrl.device.id}}">{{ctrl.device.key}}</a>
-    <small class="muted">device</small>
+    <a href="#/device/{{ctrl.device.id}}">
+      {{(ctrl.device.name || ctrl.device.key)}}
+    </a>
   </h1>
 
   <h2>
-    {{ctrl.property.key}}
-    <small class="muted">property</small>
+    {{(ctrl.property.name || ctrl.property.key)}}
   </h2>
 
+  <p ng-show="ctrl.property.description">
+    {{ctrl.property.description}}
+  </p>
+
   <ul>
     <li>Created: {{ctrl.property.created_timestamp | date}}</li>
     <li>Name: {{ctrl.property.name}}</li>
@@ -42,7 +46,10 @@
     </tbody>
     <tbody ng-if="ctrl.values.length > 0">
     <tr ng-repeat="v in ctrl.values">
-      <td><dl-timestamp value="v.timestamp"></dl-timestamp></td>
+      <td>
+        {{v.timestamp | date:'medium'}},
+        <dl-timestamp value="v.timestamp"></dl-timestamp>
+      </td>
       <td>{{v.value}}</td>
     </tr>
     </tbody>
-- 
cgit v1.2.3