move instance-list to attribute

Author: SomeKittens

client/directives/instanceList/directiveInstanceList.js

@@ -12,7 +12,7 @@ function instanceList(
   $state
 ) {
   return {
-    restrict: 'E',
+    restrict: 'A',
     templateUrl: 'viewInstanceList',
     scope: {
       data: '=',

client/directives/instanceList/viewInstanceList.jade

@@ -1,63 +1,61 @@
-section.row.boxes
-
-  .spinner-wrapper.spinner-md.in(
-    ng-if = "state.loadingInstances"
-    ng-include = "'spinner'"
+.spinner-wrapper.spinner-md.in(
+  ng-if = "state.loadingInstances"
+  ng-include = "'spinner'"
+)
+
+h2.sub-header.load(
+)
+  span.sub-header-text Boxes
+  a.btn.btn-sm.white.sub-header-action(
+    ng-click = "stateToNew()"
+    ng-href = "/{{ data.activeAccount.oauthName() }}/new"
+    tooltip = "New Box"
+    tooltip-options = "{\"class\":\"bottom\",\"left\":6,\"top\":30}"
   )
+    svg.iconnables.icons-add
+      use(
+        xlink:href = "#icons-add"
+      )
 
-  h2.sub-header.load(
+//- *
+//- LINKED NAV LAYOUT
+//- *
+
+ul.box-group
+  //- .active for current active box
+  //- .active.expanded for current active box with links
+  //- .runnning for running box
+
+  //- if not .active
+  li.box-group-item.btn.white.load(
+    ng-class = "getInstanceClasses(instance)"
+    ng-repeat = "instance in data.instances.models | orderBy:'attrs.name'"
+    ng-show = "data.instances.models.length && !state.loadingInstances"
+    tooltip = "{{ instance.attrs.name }}"
+    tooltip-options = "{\"class\":\"nav-tooltips right\",\"left\":31,\"top\":10}"
   )
-    span.sub-header-text Boxes
-    a.btn.btn-sm.white.sub-header-action(
-      ng-click = "stateToNew()"
-      ng-href = "/{{ data.activeAccount.oauthName() }}/new"
-      tooltip = "New Box"
-      tooltip-options = "{\"class\":\"bottom\",\"left\":6,\"top\":30}"
+    a.box-item-name.text-overflow(
+      ng-click = "stateToInstance(instance)"
+      ng-href = "/{{ data.activeAccount.oauthName() }}/{{ instance.attrs.name }}"
+      ng-model = "instance"
+    ) {{ instance.attrs.name }}
+    span.icons-status(
+      title = "{{ getInstanceAltTitle(instance) }}"
+    )
+    linked-instances(
+      instances = 'data.instances'
+      instance-dependencies = "instance.dependencies"
+      ng-if = "getInstanceClasses(instance).expanded"
+      state-to-instance = 'stateToInstance'
+      type = "sidebar"
     )
-      svg.iconnables.icons-add
-        use(
-          xlink:href = "#icons-add"
-        )
-
   //- *
-  //- LINKED NAV LAYOUT
+  //- 0.3 linked boxes
   //- *
-
-  ul.box-group
-    //- .active for current active box
-    //- .active.expanded for current active box with links
-    //- .runnning for running box
-
-    //- if not .active
-    li.box-group-item.btn.white.load(
-      ng-class = "getInstanceClasses(instance)"
-      ng-repeat = "instance in data.instances.models | orderBy:'attrs.name'"
-      ng-show = "data.instances.models.length && !state.loadingInstances"
-      tooltip = "{{ instance.attrs.name }}"
-      tooltip-options = "{\"class\":\"nav-tooltips right\",\"left\":31,\"top\":10}"
-    )
-      a.box-item-name.text-overflow(
-        ng-click = "stateToInstance(instance)"
-        ng-href = "/{{ data.activeAccount.oauthName() }}/{{ instance.attrs.name }}"
-        ng-model = "instance"
-      ) {{ instance.attrs.name }}
-      span.icons-status(
-        title = "{{ getInstanceAltTitle(instance) }}"
-      )
-      linked-instances(
-        instances = 'data.instances'
-        instance-dependencies = "instance.dependencies"
-        ng-if = "getInstanceClasses(instance).expanded"
-        state-to-instance = 'stateToInstance'
-        type = "sidebar"
-      )
-    //- *
-    //- 0.3 linked boxes
-    //- *
-    //- if .active
+  //- if .active
 
 
 
-    //- *
-    //- END LINKED NAV LAYOUT
-    //- *
+  //- *
+  //- END LINKED NAV LAYOUT
+  //- *

client/templates/abstractLayouts/instanceLayout/viewInstanceLayout.jade

@@ -7,7 +7,8 @@ nav.sidebar.global-sidebar(
     accounts-select
     data = "dataApp.data"
   )
-  instance-list(
+  section.row.boxes(
+    instance-list
     data = "dataApp.data"
     state = "dataInstanceLayout.state"
   )