MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Angular 16 Irish Monitor to develop #33

Merged
k.triantafyllou merged 151 commits from angular-16-irish-monitor into develop 2024-02-13 09:32:41 +01:00
Conversation 0 Commits 151 Files Changed 100 +6 -12
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 205b97487c - Show all commits

8
searchPages/searchUtils/searchSorting.component.ts
View File

@ -20,8 +20,7 @@ export class SearchSortingComponent {
@Input() entityType: string = ''; @Input() entityType: string = '';
@Output() sortByChange = new EventEmitter(); @Output() sortByChange = new EventEmitter();
public options: Option[]; public options: Option[];
private generalOptions = properties.environment != "production" ? private generalOptions = [
[
{value: '', label: 'Relevance'}, {value: '', label: 'Relevance'},
{value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
{value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}, {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'},
@ -29,11 +28,6 @@ export class SearchSortingComponent {
{value: 'popularity,descending', label: 'Popularity'}, {value: 'popularity,descending', label: 'Popularity'},
{value: 'influence,descending', label: 'Influence'}, {value: 'influence,descending', label: 'Influence'},
{value: 'impulse,descending', label: 'Impulse'} {value: 'impulse,descending', label: 'Impulse'}
] :
[
{value: '', label: 'Relevance'},
{value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
{value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}
]; ];
private communityOptions = [ private communityOptions = [
{value: '', label: 'Title'}, {value: '', label: 'Title'},

10
utils/modal/alert.ts
View File

@ -31,15 +31,15 @@ declare var UIkit: any;
<ng-content></ng-content> <ng-content></ng-content>
</div> </div>
<div *ngIf="(choice || okButton || cancelButton) && alertFooter" class="uk-modal-footer"> <div *ngIf="(choice || okButton || cancelButton) && alertFooter" class="uk-modal-footer">
<div class="uk-grid uk-flex uk-flex-middle" uk-grid> <div class="uk-grid uk-flex uk-flex-middle uk-margin-remove-left" uk-grid>
<label *ngIf="choice" class="uk-width-expand"> <label *ngIf="choice" class="uk-width-expand">
<input type="checkbox" [(ngModel)]="select"> <input type="checkbox" [(ngModel)]="select">
<span class="uk-margin-small-left">Don't show this message again</span> <span class="uk-margin-small-left">Don't show this message again</span>
</label> </label>
<div [ngClass]="(choice)?'uk-width-auto':'uk-width-1-1'"> <div [ngClass]="(choice)?'uk-width-auto':'uk-width-1-1 uk-padding-remove-horizontal'">
<div class="uk-width-1-1" [ngClass]="(previousButton && (cancelButton || okButton)) ? 'uk-flex uk-flex-between uk-grid' : ''"> <div class="uk-width-1-1" [ngClass]="(previousButton && (cancelButton || okButton)) ? 'uk-flex uk-flex-between uk-grid uk-margin-remove-left' : ''">
<div *ngIf="previousButton" class="uk-flex-left"> <div *ngIf="previousButton" class="uk-flex-left uk-padding-remove-horizontal">
<button class="uk-button uk-button-default uk-margin-small-left" <button class="uk-button uk-button-default"
(click)="previous()">{{previousButtonText}}</button> (click)="previous()">{{previousButtonText}}</button>
</div> </div>
<div class="uk-flex-right uk-grid uk-grid-small" uk-grid> <div class="uk-flex-right uk-grid uk-grid-small" uk-grid>