Dashboard and nginx fixes
Change-Id: I4ee34b24779f929f41852d4662018caead860ab6
diff --git a/src/app/core/header/header.ts b/src/app/core/header/header.ts
index efaa385..849767f 100644
--- a/src/app/core/header/header.ts
+++ b/src/app/core/header/header.ts
@@ -35,7 +35,7 @@
// tapToDismiss: false
});
- this.userEmail = this.authService.getUser().email;
+ this.userEmail = this.authService.getUser() ? this.authService.getUser().email : '';
this.syncStore.query()
.subscribe(
diff --git a/src/app/core/nav/nav.scss b/src/app/core/nav/nav.scss
index 7646cd9..ef3020b 100644
--- a/src/app/core/nav/nav.scss
+++ b/src/app/core/nav/nav.scss
@@ -1,5 +1,18 @@
xos-nav {
+ .navigation {
+ max-height: 100%;
+ display: block;
+ overflow-y: scroll;
+
+ nav {
+ margin-bottom: 200px;
+ }
+ }
+
.nav-info {
+ position: fixed !important;
+ bottom: 0;
+ width: 200px;
.row + .row:last-child {
margin-top: 20px;
}
diff --git a/src/app/core/services/helpers/config.helpers.ts b/src/app/core/services/helpers/config.helpers.ts
index f9b76f0..599edaf 100644
--- a/src/app/core/services/helpers/config.helpers.ts
+++ b/src/app/core/services/helpers/config.helpers.ts
@@ -30,7 +30,8 @@
'no_policy',
'omf_friendly',
'enabled',
- 'validators'
+ 'validators',
+ 'password'
];
constructor() {
diff --git a/src/app/core/table/table.html b/src/app/core/table/table.html
index 23b5a2f..382dbec 100644
--- a/src/app/core/table/table.html
+++ b/src/app/core/table/table.html
@@ -8,19 +8,20 @@
ng-model="vm.query"/>
</div>
</div>
- <table ng-class="vm.classes">
+ <div class="table-responsive">
+ <table ng-class="vm.classes">
<thead>
<tr>
<th ng-repeat="col in vm.columns">
{{col.label}}
- <span ng-if="vm.config.order">
+ <div ng-if="vm.config.order">
<a href="" ng-click="vm.orderBy = col.prop; vm.reverse = false">
<i class="fa fa-chevron-up"></i>
</a>
<a href="" ng-click="vm.orderBy = col.prop; vm.reverse = true">
<i class="fa fa-chevron-down"></i>
</a>
- </span>
+ </div>
</th>
<th ng-if="vm.config.actions">Actions:</th>
</tr>
@@ -90,6 +91,7 @@
</tr>
</tbody>
</table>
+ </div>
<!--</div>-->
<!--<div ng-show="(vm.data.length == 0 || !vm.data) && vm.loader == false">-->
<!--<xos-alert config="{type: 'info'}">-->
diff --git a/src/app/core/table/table.scss b/src/app/core/table/table.scss
index fbf6ee7..a2af05e 100644
--- a/src/app/core/table/table.scss
+++ b/src/app/core/table/table.scss
@@ -1,7 +1,10 @@
+xos-table {
+ .row + .table-responsive {
+ margin-top: 10px;
+ }
+}
+
table {
- width: 100%;
- max-width: 100%;
- margin-bottom: 20px;
border-collapse: collapse !important;
background: darken(grey, 20);
border: 1px solid darken(grey, 35);
diff --git a/src/app/core/table/table.ts b/src/app/core/table/table.ts
index dba740e..1ed258d 100644
--- a/src/app/core/table/table.ts
+++ b/src/app/core/table/table.ts
@@ -22,13 +22,15 @@
}
interface IXosTableCgfOrder {
- reverse: boolean;
+ reverse?: boolean;
field: string;
}
export interface IXosTableCfg {
columns: any[];
- order?: IXosTableCgfOrder; // | boolean;
+ order?: IXosTableCgfOrder;
+ filter?: string;
+ actions?: any[]; // TODO create interface
}
class TableCtrl {