Project

General

Profile

« Previous | Next » 

Revision 60928

[Admin | New UI]: Fix tabs on manage communities to fit with new smooth scroll service

View differences:

modules/uoa-admin-portal/branches/new-UI/src/app/pages/manage-communities/manage-communities.component.ts
14 14
@Component({
15 15
  selector: 'manage-communities',
16 16
  template: `
17
    <div page-content>
17
    <div page-content [id]="tab">
18 18
      <div header>
19 19
        <ul class="uk-tab customTabs admin uk-flex uk-flex-center uk-flex-left@m" uk-tab>
20 20
          <li [class.uk-active]="tab === 'all'"><a routerLink="./"><span class="title">All</span></a></li>
......
43 43
              No communities to manage yet
44 44
            </h4>
45 45
          </div>
46
          <div *ngIf="tab != 'communities' && ris.length > 0" class="uk-margin-large-top">
46
          <div *ngIf="tab != 'communities' && ris.length > 0" [class.uk-margin-large-top]="tab === 'all'">
47 47
            <h6 class="uk-text-bold">Research Initiatives</h6>
48 48
            <div class="uk-grid uk-grid-match uk-child-width-1-4@xl uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid
49 49
                 uk-height-match="target: .name;">
modules/uoa-admin-portal/branches/new-UI/src/app/app.component.ts
11 11
import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo";
12 12
import {CommunityService} from "./openaireLibrary/connect/community/community.service";
13 13
import {arrow_left} from "./openaireLibrary/utils/icons/icons";
14
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
14 15

  
15 16
@Component({
16 17
  selector: 'app',
......
53 54
              private communityService: CommunityService,
54 55
              private router: Router,
55 56
              private cdr: ChangeDetectorRef,
57
              private smoothScroll: SmoothScroll,
56 58
              private layoutService: LayoutService,
57 59
              private userManagementService: UserManagementService) {
58 60
    this.subscriptions.push(this.router.events.subscribe(event => {
......
154 156
    this.communityService.clearSubscriptions();
155 157
    this.userManagementService.clearSubscriptions();
156 158
    this.layoutService.clearSubscriptions();
159
    this.smoothScroll.clearSubscriptions();
157 160
  }
158 161
  
159 162
  public get open() {
modules/uoa-admin-portal/branches/new-UI/src/app/app.routing.ts
62 62
@NgModule({
63 63
    imports: [RouterModule.forRoot(routes, {
64 64
        preloadingStrategy: PreloadAllModules,
65
        scrollPositionRestoration: "top",
66 65
        onSameUrlNavigation: "reload",
67 66
        relativeLinkResolution: 'corrected'
68 67
    })],

Also available in: Unified diff