firewall_gui: fix markup typos

firewall_gui/static/partials/vlan-edit.html

@@ -108,7 +108,7 @@
       </div>
     </div>
     <div class="control-group" ng-class="hasError('vlans')">
-      <label class="control-label" for="hostgroups">NAT to (?)</label>
+      <label class="control-label" for="vlans">NAT to (?)</label>
       <div class="controls">
         <div class="well well-small">
           <span class="label label-info" ng-repeat="vlan in entity.vlans | filter: destroyed">
@@ -117,10 +117,10 @@
           </span>
         </div>
         <div class="input-append">
-          <input class="span2 vlan" id="vlan" type="text" ng-model="newVlan">
+          <input class="span2 vlan" id="vlans" type="text" ng-model="newVlan">
           <button class="btn" type="button" ng-click="addVlan(newVlan)">Add</button>
-          <span class="help-inline" ng-bind="getError('vlans')"></span>
         </div>
+        <span class="help-inline" ng-bind="getError('vlans')"></span>
       </div>
     </div>
     <div class="control-group">

firewall_gui/static/partials/vlangroup-edit.html

@@ -42,20 +42,20 @@
         <span class="help-inline" ng-bind="getError('description')"></span>
       </div>
     </div>
-    <div class="control-group" ng-class="hasError('vlangroups')">
-      <label class="control-label" for="vlangroups">Vlans</label>
+    <div class="control-group" ng-class="hasError('vlans')">
+      <label class="control-label" for="vlans">Vlans</label>
       <div class="controls">
         <div class="well well-small">
-          <span class="label label-info" ng-repeat="vlan in entity.vlans">
+          <span class="label label-info" ng-repeat="vlan in entity.vlans | filter: destroyed">
             <a href="#/vlans/{{vlan.id}}">{{vlan.name}}</a>
-            <a href><i class="icon-remove"></i></a>
+            <a href ng-click="removeVlan(vlan)"><i class="icon-remove"></i></a>
           </span>
         </div>
         <div class="input-append">
-          <input class="span2 vlan" id="vlan" type="text" data-provide="typeahead">
-          <button class="btn" type="button">Add</button>
-          <span class="help-inline" ng-bind="getError('vlangroups')"></span>
+          <input class="span2 vlan" id="vlans" type="text" data-provide="typeahead" ng-model="newVlan">
+          <button class="btn" type="button" ng-click="addVlan(newVlan)">Add</button>
         </div>
+        <span class="help-inline" ng-bind="getError('vlans')"></span>
       </div>
     </div>
     <div class="control-group">