Move network form into include file

Move to include file for reuse in network page.
dropbox · Jan 14, 2015 · c50cb84 · c50cb84
1 parent bb0d607
commit c50cb84
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 73 deletions.
diff --git a/nsot/static/js/controllers.js b/nsot/static/js/controllers.js
@@ -145,6 +145,7 @@
         var siteId = $scope.siteId = $routeParams.siteId;
         $scope.pager = null;
         $scope.limier = null;
+        $scope.form_url = "/static/templates/includes/networks-form.html";
 
         $scope.form_attrs = [];
 

diff --git a/nsot/static/templates/includes/networks-form.html b/nsot/static/templates/includes/networks-form.html
@@ -0,0 +1,73 @@
+<form novalidate name="networkForm" class="nsot-form">
+    <div class="form-group" ng-class="{
+        'has-error' : networkForm.name.$invalid,
+        'has-success' : networkForm.name.$valid,
+    }">
+        <input type="text"
+               class="form-control"
+               name="cidr"
+               placeholder="Network (required)"
+               ng-model="network.cidr"
+               ng-minlength="1"
+               required
+        >
+    </div>
+    <h4 class="form-subheading">Attributes</h4>
+    <div class="form-group" ng-repeat="(idx, attr) in attributes
+                                       |filter:{required:true}">
+        <div class="row">
+            <div class="col-sm-5 text-right">
+                <h4>[[attr.name]]</h4>
+            </div>
+            <div class="col-sm-6" style="padding-left: 0px;">
+                <input type="text"
+                       class="form-control"
+                       name="value"
+                       placeholder="Value (required)"
+                       ng-model="network.attributes[attr.name]"
+                       required
+                >
+            </div>
+        </div>
+    </div>
+    <div class="form-group" ng-repeat="form_attr in form_attrs">
+        <div class="row">
+            <div class="col-sm-5">
+                <select
+                    name="attribute"
+                    class="form-control"
+                    ng-model="form_attr.name">
+                    <option value="" disabled selected></option>
+                    <option value="[[attr.name]]"
+                            ng-repeat="(idx, attr) in attributes
+                                       |filter:{required:false}">
+                        [[attr.name]]
+                    </option>
+                </select>
+            </div>
+            <div class="col-sm-6" style="padding-left: 0px;">
+                <input type="text"
+                       class="form-control"
+                       name="value"
+                       placeholder="Value"
+                       ng-model="form_attr.value"
+                >
+            </div>
+            <div class="col-sm-1">
+                <span class="attr-buttons">
+                    <span class="fa fa-lg fa-minus-circle rm-attr-btn"
+                          ng-click="removeAttr($index);"
+                    ></span>
+                </span>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-sm-12 text-right">
+            <a ng-click="addAttr($index)" class="add-attr-btn">
+                Add an attribute
+                <i class="fa fa-lg fa-plus-circle add-attr-btn"></i>
+            </a>
+        </div>
+    </div>
+</form>
diff --git a/nsot/static/templates/networks.html b/nsot/static/templates/networks.html
@@ -17,79 +17,7 @@
             <div ng-if="error" class="alert alert-danger">
                 [[error.code]] - [[error.message]]
             </div>
-            <form novalidate name="networkForm" class="nsot-form">
-                <div class="form-group" ng-class="{
-                    'has-error' : networkForm.name.$invalid,
-                    'has-success' : networkForm.name.$valid,
-                }">
-                    <input type="text"
-                           class="form-control"
-                           name="cidr"
-                           placeholder="Network (required)"
-                           ng-model="network.cidr"
-                           ng-minlength="1"
-                           required
-                    >
-                </div>
-                <h4 class="form-subheading"> Attributes </h4>
-                <div class="form-group" ng-repeat="(idx, attr) in attributes
-                                                   |filter:{required:true}">
-                    <div class="row">
-                        <div class="col-sm-5 text-right">
-                            <h4>[[attr.name]]</h4>
-                        </div>
-                        <div class="col-sm-6" style="padding-left: 0px;">
-                            <input type="text"
-                                   class="form-control"
-                                   name="value"
-                                   placeholder="Value (required)"
-                                   ng-model="network.attributes[attr.name]"
-                                   required
-                            >
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group" ng-repeat="form_attr in form_attrs">
-                    <div class="row">
-                        <div class="col-sm-5">
-                            <select
-                                name="attribute"
-                                class="form-control"
-                                ng-model="form_attr.name">
-                                <option value="" disabled selected></option>
-                                <option value="[[attr.name]]"
-                                        ng-repeat="(idx, attr) in attributes
-                                                   |filter:{required:false}">
-                                    [[attr.name]]
-                                </option>
-                            </select>
-                        </div>
-                        <div class="col-sm-6" style="padding-left: 0px;">
-                            <input type="text"
-                                   class="form-control"
-                                   name="value"
-                                   placeholder="Value"
-                                   ng-model="form_attr.value"
-                            >
-                        </div>
-                        <div class="col-sm-1">
-                            <span class="attr-buttons">
-                                <span class="fa fa-lg fa-minus-circle rm-attr-btn"
-                                      ng-click="removeAttr($index);"
-                                ></span>
-                            </span>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-12 text-right">
-                        <a ng-click="addAttr($index)" class="add-attr-btn">
-                            Add an attribute
-                            <i class="fa fa-lg fa-plus-circle add-attr-btn"></i>
-                        </a>
-                    </div>
-                </div>
-            </form>
+            <div ng-include="form_url"></div>
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">