diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts index 4ba884c..24b1248 100644 --- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts +++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts @@ -22,79 +22,98 @@ declare var UIkit; template: `
+ class="uk-overflow-auto uk-padding-remove-bottom uk-padding-remove-horizontal">
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
- OR -
-
-
-
-
- -
-
- -
-
- -
-
-
-
{{uploadError}}
+
+
Name
+
+
+
+
URL Alias
+
+
+
+
Index ID
+
+
+
+
Index Name
+
+
+
+
Index Short Name
+
+
+
+
Description
+
+
+
+ +
Logo
+
+
+
+
+ +
+
+ OR +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
{{uploadError}}
+
-
-
-
-
+
+
Status
+
+
+
+
Type
+
+
-
+
+
Template
+
+
diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html index 07701c4..546a615 100644 --- a/src/app/general/general.component.html +++ b/src/app/general/general.component.html @@ -1,33 +1,31 @@ -
+
+
+
+
+ +
+
Admin Dashboard - Manage Profile
+

{{stakeholder.name}} (unsaved changes)

+
+
+
+ + +
+
+
-
-
-
-
- Manage Profile -
-
- {{stakeholder.name}} - (unsaved changes) -
-
-
- - -
-
-
-
+
+ [paddingLarge]="true" >
diff --git a/src/app/general/general.component.ts b/src/app/general/general.component.ts index a410c66..50dd542 100644 --- a/src/app/general/general.component.ts +++ b/src/app/general/general.component.ts @@ -20,6 +20,7 @@ export class GeneralComponent implements OnInit, OnDestroy { public loading: boolean = false; private subscriptions: any[] = []; @ViewChild('editStakeholderComponent') editStakeholderComponent: EditStakeholderComponent; + public stickyPageHeader: boolean = false; constructor(private stakeholderService: StakeholderService, private title: Title) { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 59ff682..3fd632a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 59ff682af71633c4788f1e8867c9ff2fcff858b9 +Subproject commit 3fd632a2b754a336615b8a776bea95ee9808e93c diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index c6436a6..ada335d 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -13,9 +13,12 @@ -
-
Admin Dashboard
-

{{name}}

+
+ +
+
Admin Dashboard
+

{{name}}

+
diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts index 0c7f7b7..bb2da85 100644 --- a/src/app/users/users.component.ts +++ b/src/app/users/users.component.ts @@ -22,6 +22,7 @@ export class UsersComponent implements OnInit { public alias: string; public name: string; + public logo: string; public type: string; public link: string; public loading: boolean; @@ -67,6 +68,7 @@ export class UsersComponent implements OnInit { if (stakeholder) { this.alias = stakeholder.alias; this.name = stakeholder.name; + this.logo = stakeholder.logoUrl; this.title.setTitle(this.name + " | Users"); this.type = stakeholder.type; this.link = this.getURL(this.alias);