Changed html structure around ui-view
Change-Id: I7b0c841870c32f3db4c99d6734611d5d21a83567
diff --git a/src/app/main.html b/src/app/main.html
index b278921..a96b5b2 100644
--- a/src/app/main.html
+++ b/src/app/main.html
@@ -17,6 +17,10 @@
<xos-nav></xos-nav>
- <div ui-view></div>
+ <div class="content">
+ <div class="container-fluid">
+ <div ui-view></div>
+ </div>
+ </div>
</div>
\ No newline at end of file
diff --git a/src/app/views/crud/crud.html b/src/app/views/crud/crud.html
index 5b8a241..8d457e2 100644
--- a/src/app/views/crud/crud.html
+++ b/src/app/views/crud/crud.html
@@ -1,51 +1,47 @@
-<section class="content">
- <div class="container-fluid">
- <div class="row">
- <div class="col-lg-12">
- <div class="view-header">
- <div class="pull-right text-right" style="line-height: 14px">
- <!--<small>UI Elements<br>General<br> <span class="c-white">Grid system</span></small>-->
- <a class="btn btn-default" ng-if="vm.list" href="{{vm.baseUrl}}add">Add</a>
- <a class="btn btn-default" ng-if="!vm.list" href="{{vm.baseUrl}}">Back to {{vm.title.toLowerCase()}} list</a>
- </div>
- <div class="header-icon">
- <i class="pe page-header-icon pe-7s-note2"></i>
- </div>
- <div class="header-title">
- <h3>{{vm.title}}</h3>
- <!--<small>-->
- <!--Responsive, mobile first fluid grid system.-->
- <!--</small>-->
- </div>
- </div>
- <hr>
+<div class="row">
+ <div class="col-lg-12">
+ <div class="view-header">
+ <div class="pull-right text-right" style="line-height: 14px">
+ <!--<small>UI Elements<br>General<br> <span class="c-white">Grid system</span></small>-->
+ <a class="btn btn-default" ng-if="vm.list" href="{{vm.baseUrl}}add">Add</a>
+ <a class="btn btn-default" ng-if="!vm.list" href="{{vm.baseUrl}}">Back to {{vm.title.toLowerCase()}} list</a>
+ </div>
+ <div class="header-icon">
+ <i class="pe page-header-icon pe-7s-note2"></i>
+ </div>
+ <div class="header-title">
+ <h3>{{vm.title}}</h3>
+ <!--<small>-->
+ <!--Responsive, mobile first fluid grid system.-->
+ <!--</small>-->
</div>
</div>
- <div class="row" ng-show="vm.related.length > 0 && vm.model.id">
- <div class="view-header">
- <div class="col-lg-4">
- <h4>Related Items: </h4>
- </div>
- <div class="col-lg-8 text-right">
- <div class="btn-group">
- <a ng-if="vm.list" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/" class="btn btn-default">
- {{r}}
- </a>
- <a ng-if="!vm.list && vm.getRelatedItem(r, vm.model)" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/{{vm.getRelatedItem(r, vm.model)}}" class="btn btn-default">
- {{r}}
- </a>
- </div>
- </div>
- <hr>
- </div>
- </div>
- <div ng-if="vm.list">
- <xos-table config="vm.tableCfg" data="vm.tableData"></xos-table>
- </div>
-
- <div ng-if="!vm.list">
- <!--<pre>{{vm.model | json}}</pre>-->
- <xos-form ng-model="vm.model" config="vm.formCfg"></xos-form>
- </div>
+ <hr>
</div>
-</section>
+</div>
+<div class="row" ng-show="vm.related.length > 0 && vm.model.id">
+ <div class="view-header">
+ <div class="col-lg-4">
+ <h4>Related Items: </h4>
+ </div>
+ <div class="col-lg-8 text-right">
+ <div class="btn-group">
+ <a ng-if="vm.list" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/" class="btn btn-default">
+ {{r}}
+ </a>
+ <a ng-if="!vm.list && vm.getRelatedItem(r, vm.model)" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/{{vm.getRelatedItem(r, vm.model)}}" class="btn btn-default">
+ {{r}}
+ </a>
+ </div>
+ </div>
+ <hr>
+ </div>
+</div>
+<div ng-if="vm.list">
+ <xos-table config="vm.tableCfg" data="vm.tableData"></xos-table>
+</div>
+
+<div ng-if="!vm.list">
+ <!--<pre>{{vm.model | json}}</pre>-->
+ <xos-form ng-model="vm.model" config="vm.formCfg"></xos-form>
+</div>
diff --git a/src/app/views/dashboard/dashboard.html b/src/app/views/dashboard/dashboard.html
index 3e67052..db87d74 100644
--- a/src/app/views/dashboard/dashboard.html
+++ b/src/app/views/dashboard/dashboard.html
@@ -1,57 +1,53 @@
-<section class="content">
- <div class="container-fluid">
- <!--<h1>Dashboard</h1>-->
- <div class="row">
- <div class="col-xs-12" id="dashboard-component-container"></div>
- </div>
- <div class="row">
- <div class="col-xs-4">
- <div class="panel panel-filled">
- <div class="panel-body text-center">
- <h2 class="m-b-none">
- {{vm.nodes}}
- <!--<span class="slight"><i class="fa fa-play fa-rotate-270 text-warning"> </i> +20%</span>-->
- </h2>
- <h4>
- <a ui-sref="xos.core.nodes">
- Nodes
- </a>
- </h4>
- <!--<div class="small">% New Sessions</div>-->
- <!--<div class="slight m-t-sm"><i class="fa fa-clock-o"> </i> Updated: <span class="c-white">10:22pm</span></div>-->
- </div>
- </div>
- </div>
-
- <div class="col-xs-4">
- <div class="panel panel-filled">
- <div class="panel-body text-center">
- <h2 class="m-b-none">
- {{vm.slices}}
- </h2>
- <h4>
- <a ui-sref="xos.core.slices">
- Slices
- </a>
- </h4>
- </div>
- </div>
- </div>
-
- <div class="col-xs-4">
- <div class="panel panel-filled">
- <div class="panel-body text-center">
- <h2 class="m-b-none">
- {{vm.instances}}
- </h2>
- <h4>
- <a ui-sref="xos.core.instances">
- Instances
- </a>
- </h4>
- </div>
- </div>
+ <!--<h1>Dashboard</h1>-->
+<div class="row">
+ <div class="col-xs-12" id="dashboard-component-container"></div>
+</div>
+<div class="row">
+ <div class="col-xs-4">
+ <div class="panel panel-filled">
+ <div class="panel-body text-center">
+ <h2 class="m-b-none">
+ {{vm.nodes}}
+ <!--<span class="slight"><i class="fa fa-play fa-rotate-270 text-warning"> </i> +20%</span>-->
+ </h2>
+ <h4>
+ <a ui-sref="xos.core.nodes">
+ Nodes
+ </a>
+ </h4>
+ <!--<div class="small">% New Sessions</div>-->
+ <!--<div class="slight m-t-sm"><i class="fa fa-clock-o"> </i> Updated: <span class="c-white">10:22pm</span></div>-->
</div>
</div>
</div>
-</section>
\ No newline at end of file
+
+ <div class="col-xs-4">
+ <div class="panel panel-filled">
+ <div class="panel-body text-center">
+ <h2 class="m-b-none">
+ {{vm.slices}}
+ </h2>
+ <h4>
+ <a ui-sref="xos.core.slices">
+ Slices
+ </a>
+ </h4>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-xs-4">
+ <div class="panel panel-filled">
+ <div class="panel-body text-center">
+ <h2 class="m-b-none">
+ {{vm.instances}}
+ </h2>
+ <h4>
+ <a ui-sref="xos.core.instances">
+ Instances
+ </a>
+ </h4>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file