MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 8 Wiki Activity

[plugins-functionality | WIP ] updates and fixes after initial beta release

This commit is contained in:
argirok 2024-03-28 12:37:00 +02:00
parent 75b4328623
commit b6e803b56e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/pages/community-info/profile/edit-community/edit-community.component.ts
View File

@ -35,7 +35,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
removeButtons: 'Save,NewPage,DocProps,Preview,Print,' + removeButtons: 'Save,NewPage,DocProps,Preview,Print,' +
'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' + 'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' +
'CreateDiv,Flash,PageBreak,' + 'CreateDiv,Flash,PageBreak,' +
'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language', 'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock',
extraPlugins: 'divarea'}"> extraPlugins: 'divarea'}">
</ckeditor> </ckeditor>
</div> </div>

15
src/app/pages/content-providers/manage-content-providers.component.ts
View File

@ -32,16 +32,17 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
(communityContentProvidersChanged)="communityContentProvidersChanged($event)"></add-content-providers> (communityContentProvidersChanged)="communityContentProvidersChanged($event)"></add-content-providers>
</fs-modal> </fs-modal>
<fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();" <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();"
[okButtonDisabled]="criteria && criteria.disabled"> [okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)">
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<mat-slide-toggle [checked]="enabled" (change)="enabled = !enabled"></mat-slide-toggle> <mat-slide-toggle [checked]="enabled" (change)="enabled = !enabled; depositInfoChanged = true;"></mat-slide-toggle>
<label class="uk-margin-medium-top uk-margin-small-left ">Content source</label> <label class="uk-margin-medium-top uk-margin-small-left ">Content source</label>
<br> <br>
<mat-slide-toggle [checked]="deposit" (change)="deposit = !deposit"></mat-slide-toggle> <mat-slide-toggle [checked]="deposit" (change)="deposit = !deposit; depositInfoChanged = true;"></mat-slide-toggle>
<label class="uk-margin-medium-top uk-margin-small-left ">Suggest for deposit</label> <label class="uk-margin-medium-top uk-margin-small-left ">Suggest for deposit</label>
<div class="uk-width-1-1 uk-margin-medium-top" input placeholder="Type a message or instruction for researchers about deposition in this datasource" <div class="uk-width-1-1 uk-margin-medium-top" input placeholder="Type a message or instruction for researchers about deposition in this datasource"
[value]="message" (valueChange)="message=$event"> [value]="message" (valueChange)="message=$event; depositInfoChanged = true;">
</div> </div>
<div class="uk-text-center uk-text-bold uk-text-large uk-margin-medium-top">Content filters</div>
<criteria #criteria *ngIf="dataProvider" [height]="filtersModal.bodyHeight - 200" <criteria #criteria *ngIf="dataProvider" [height]="filtersModal.bodyHeight - 200"
[selectionCriteria]="dataProvider.selectioncriteria"> [selectionCriteria]="dataProvider.selectioncriteria">
<div no-criteria> <div no-criteria>
@ -73,7 +74,7 @@ export class ManageContentProvidersComponent implements OnInit {
message = ""; message = "";
deposit= false; deposit= false;
enabled = false; enabled = false;
depositInfoChanged =false;
constructor(private title: Title, constructor(private title: Title,
private cdr: ChangeDetectorRef, private cdr: ChangeDetectorRef,
private communityService: CommunityService, private communityService: CommunityService,
@ -112,10 +113,12 @@ export class ManageContentProvidersComponent implements OnInit {
this.deposit = this.dataProvider.deposit; this.deposit = this.dataProvider.deposit;
this.message = this.dataProvider.message; this.message = this.dataProvider.message;
this.enabled = this.dataProvider.enabled; this.enabled = this.dataProvider.enabled;
this.filtersModal.title = 'Edit datasource Options'; this.depositInfoChanged = false;
this.filtersModal.title = 'Edit datasource options';
this.filtersModal.okButtonText = "Save"; this.filtersModal.okButtonText = "Save";
this.filtersModal.back = true; this.filtersModal.back = true;
this.filtersModal.okButton = true; this.filtersModal.okButton = true;
this.filtersModal.open(); this.filtersModal.open();
this.cdr.detectChanges(); this.cdr.detectChanges();
} }

2
src/app/pages/content-providers/remove-content-providers.component.html
View File

@ -59,7 +59,7 @@
<div *ngIf="item.deposit && item.message" class=" uk-text-small uk-margin-top"> <div *ngIf="item.deposit && item.message" class=" uk-text-small uk-margin-top">
<span class="uk-text-muted uk-text-xsmall">Deposit info:</span> <span class="uk-text-muted uk-text-xsmall">Deposit info:</span>
{{item.message}}</div> {{item.message}}</div>
<div *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-bottom uk-text-small"> <div *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-bottom uk-margin-small-top uk-text-small">
<div class="uk-text-meta uk-margin-small-bottom">Filters</div> <div class="uk-text-meta uk-margin-small-bottom">Filters</div>
<div [innerHTML]="criteriaUtils.getFiltersAsText(item.selectioncriteria.criteria)"></div> <div [innerHTML]="criteriaUtils.getFiltersAsText(item.selectioncriteria.criteria)"></div>
<div *ngIf="item.selectioncriteria.criteria.length > 3" class="uk-margin-small-top"> <div *ngIf="item.selectioncriteria.criteria.length > 3" class="uk-margin-small-top">