2 files changed, 29 insertions, 8 deletions
diff --git a/web/static/app/templates/device-edit-attribute.modal.html b/web/static/app/templates/device-edit-attribute.modal.html
index e471e5f..fc22d7b 100644
--- a/web/static/app/templates/device-edit-attribute.modal.html
+++ b/web/static/app/templates/device-edit-attribute.modal.html
@@ -2,12 +2,27 @@
   <button type="button" class="close" ng-click="$dismiss()">
     <span>&times;</span>
   </button>
-  <h4 class="modal-title">Edit device {{attributeName}}</h4>
+  <h4 class="modal-title">Edit device {{ctrl.attributeName}}</h4>
 </div>
 <div class="modal-body">
-  <p>One fine body&hellip;</p>
+  <form>
+    <fieldset class="form-group">
+      <label for="attribute" style="text-transform: capitalize">{{ctrl.label}}</label>
+      <input type="email" class="form-control" id="attribute" ng-model="ctrl.value"/>
+    </fieldset>
+  </form>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-secondary" ng-click="$dismiss()">Cancel</button>
-  <button type="button" class="btn btn-primary" ng-click="ctrl.update()">Update</button>
+
+  <div class="row">
+    <div class="col-sm-7 text-left">
+      <p class="form-control-static">
+        {{ctrl.error}}
+      </p>
+    </div>
+    <div class="col-sm-5">
+      <button type="button" class="btn btn-secondary" ng-click="$dismiss()">Cancel</button>
+      <button type="button" class="btn btn-primary" ng-click="ctrl.update()">Update</button>
+    </div>
+  </div>
 </div>
diff --git a/web/static/app/templates/device.html b/web/static/app/templates/device.html
index d126f1d..270c461 100644
--- a/web/static/app/templates/device.html
+++ b/web/static/app/templates/device.html
@@ -56,19 +56,25 @@
 
   <dl class="dl-horizontalX">
     <dt class="col-sm-3">Created</dt>
-    <dd class="col-sm-9">{{ctrl.device.created_timestamp | date}}</dd>
+    <dd class="col-sm-9">&nbsp;
+      {{ctrl.device.created_timestamp | date}}</dd>
 
     <dt class="col-sm-3">Name</dt>
     <dd class="col-sm-9">
-      &nbsp;{{ctrl.device.name}}
-
+      {{ctrl.device.name}}
       <a ng-click="ctrl.editDeviceAttribute('name')" class="pull-right">
         <i class="fa fa-edit"/>
       </a>
     </dd>
 
     <dt class="col-sm-3">Description</dt>
-    <dd class="col-sm-9">&nbsp;{{ctrl.device.description}}</dd>
+    <dd class="col-sm-9">
+      {{ctrl.device.description}}
+
+      <a ng-click="ctrl.editDeviceAttribute('description')" class="pull-right">
+        <i class="fa fa-edit"/>
+      </a>
+    </dd>
   </dl>
 
   <h3>Properties</h3>