Project

General

Profile

« Previous | Next » 

Revision 56583

Remove is Prior to option from edit and add page form.

View differences:

modules/uoa-admin-portal/trunk/src/app/pages/curator/curator.component.html
8 8
  <div *ngIf="showLoading" class="uk-animation-fade uk-width-1-1" role="alert">
9 9
    <span class="loading-gif uk-align-center"></span>
10 10
  </div>
11
  <div *ngIf="curatorId != null && curator != null && !showLoading" class="uk-width-1-1 uk-margin-left">
12
    <div class="uk-alert uk-alert-primary uk-margin-top-large">
13
      <span class="uk-margin-small-right uk-icon" uk-icon="info"></span>
14
      Edit your personal info and it will be visible in Curators' page of your Community Gateway.
15
    </div>
16
  </div>
11 17
  <table *ngIf="curatorId != null && curator != null && !showLoading" class="uk-width-1-2@m uk-width-1-1@s uk-align-center">
12 18
    <tbody class="uk-table uk-align-center">
13 19
      <tr *ngIf="curator.email != null" >
modules/uoa-admin-portal/trunk/src/app/pages/helpcontent/page-help-content-form.component.html
59 59
        <label for="orderTag">Order</label>
60 60
        <input type="number" step="1" class="form-control" formControlName="order" id="orderTag" placeholder="Order (e.g. 2)">
61 61
    </div>
62
    <div class="form-group">
62
    <!--<div class="form-group">
63 63
        <label>Help text before existing content</label>
64 64
        <label class="checkbox">
65 65
            <span class="uk-margin-small-right" style="font-weight: normal;">Before</span>
66 66
            <input tabindex="0" type="checkbox" formControlName="isPriorTo">
67

  
68 67
        </label>
69
    </div>
68
    </div>-->
70 69
    <div class="form-group">
71 70
        <label>Select Status</label>
72 71
        <label class="checkbox">
modules/uoa-admin-portal/trunk/src/app/pages/helpcontent/page-help-content-form.component.ts
44 44
             if(!Session.isLoggedIn()){
45 45
               this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
46 46
             } else {
47
                 this.myForm.valueChanges.subscribe(value => {
48
                     let pid = value.page;
49
                     this._helpContentService.getPage(pid,this.properties.adminToolsAPIURL).subscribe(page => {
47
                 if(this.pageId) {
48
                     this._helpContentService.getPage(this.pageId,this.properties.adminToolsAPIURL).subscribe(page => {
50 49
                         this.placements.top = page.top;
51 50
                         this.placements.bottom = page.bottom;
52 51
                         this.placements.left = page.left;
53 52
                         this.placements.right = page.right;
53

  
54 54
                     });
55
                 })
55
                 } else {
56
                     this.myForm.valueChanges.subscribe(value => {
57
                         let pid = value.page;
58
                         this._helpContentService.getPage(pid, this.properties.adminToolsAPIURL).subscribe(page => {
59
                             this.placements.top = page.top;
60
                             this.placements.bottom = page.bottom;
61
                             this.placements.left = page.left;
62
                             this.placements.right = page.right;
63

  
64
                         });
65
                     });
66
                 }
56 67
                 this._helpContentService.getPages(this.properties.adminToolsAPIURL, this.communityPid).subscribe(
57 68
                   pages => {
58 69
                       this.availablePages = pages;
......
71 82
            content : ['', Validators.required],
72 83
            order : [1, Validators.required],
73 84
            isActive : true,
74
            isPriorTo : false,
85
            //isPriorTo : false,
75 86
            _id : '',
76 87
        });
77 88
    }
......
84 95
            content : [''],
85 96
            order : 1,
86 97
            isActive : true,
87
            isPriorTo : false,
98
            //isPriorTo : false,
88 99
            _id : ''
89 100
        });
90 101
        this.myForm.markAsPristine();
modules/uoa-admin-portal/trunk/src/app/pages/helpcontent/page-help-contents.component.html
89 89
                                            <th>Content</th>
90 90
                                            <th>Placement</th>
91 91
                                            <th>Order</th>
92
                                            <th>Before</th>
92
                                            <!--<th>Before</th>-->
93 93
                                            <th>Change status</th>
94 94
                                            <th>Actions</th>
95 95
                                        </tr>
......
115 115
                                                <div class="order" href="#">{{check.pageHelpContent.order}}
116 116
                                                </div>
117 117
                                            </td>
118
                                            <td>
118
                                            <!--<td>
119 119
                                                <div class="isPriorTo" href="#">{{check.pageHelpContent.isPriorTo}}
120 120
                                                </div>
121
                                            </td>
121
                                            </td>-->
122 122
                                            <td>
123 123
                                              <mat-slide-toggle [checked]="check.pageHelpContent.isActive"
124 124
                                                                (change)="($event.source.checked = check.pageHelpContent.isActive);togglePageHelpContents(!check.pageHelpContent.isActive,[check.pageHelpContent._id])"></mat-slide-toggle>
modules/uoa-admin-portal/trunk/src/assets/env-properties.json
53 53

  
54 54
  "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
55 55

  
56
  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",
56
  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
57 57

  
58 58
  "adminToolsCommunity" :"openaire",
59 59
  "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",

Also available in: Unified diff