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

[Connect Admin | Trunk]: In customization deleted icon "reset" icon replaced by "settings_backup_restore". 

1. border.component.ts & customization.component.html & customization.module.ts & customize-buttons.component.ts: [Bug fix] Removed deprecated deleted icons | "reset" icon replaced by "settings_backup_restore" | removed padding from tooltips.
2. environment.ts: Commented properties "deleteCacheUrl" and "deleteBrowserCacheUrl".
This commit is contained in:
Konstantina Galouni 2022-12-09 16:34:19 +02:00
parent 9507545fd8
commit 4cfc90e7f8
8 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/pages/customization/border.component.ts
View File

@ -6,10 +6,10 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core';
template: ` template: `
<div class="uk-grid "> <div class="uk-grid ">
<div class="uk-margin-remove"> <div class="uk-margin-remove">
<div class="uk-text-bold uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta"> Border radius (px) <div class="uk-text-bold uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-flex uk-flex-middle"> Border radius (px)
<a *ngIf="radius != radiusPublished" class="uk-margin-small-left" <a *ngIf="radius != radiusPublished" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
(click)="radius = radiusPublished;borderChanged()"> <icon name="reset"></icon></a> (click)="radius = radiusPublished;borderChanged()"> <icon name="settings_backup_restore" flex="true"></icon></a>
</div> </div>
<div class="input-box"> <div class="input-box">
@ -17,10 +17,10 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core';
</div> </div>
</div> </div>
<div class="uk-margin-small-top"> <div class="uk-margin-small-top">
<div class="uk-text-bold uk-text-uppercase uk-text-meta uk-margin-xsmall-bottom"> Border width (px) <div class="uk-text-bold uk-text-uppercase uk-text-meta uk-margin-xsmall-bottom uk-flex uk-flex-middle"> Border width (px)
<a *ngIf="width != widthPublished" class="uk-margin-small-left" <a *ngIf="width != widthPublished" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
(click)="width = widthPublished; borderChanged()"> <icon name="reset"></icon></a> (click)="width = widthPublished; borderChanged()"> <icon name="settings_backup_restore" flex="true"></icon></a>
</div> </div>
<div class="input-box"> <div class="input-box">
<div input inputClass="flat x-small" [(value)]="width" (valueChange)="borderChanged()" type="text" ></div> <div input inputClass="flat x-small" [(value)]="width" (valueChange)="borderChanged()" type="text" ></div>

31
src/app/pages/customization/customization.component.html
View File

@ -153,20 +153,20 @@
(change)="draftCustomizationOptions.identityIsCustom = (change)="draftCustomizationOptions.identityIsCustom =
!draftCustomizationOptions.identityIsCustom; !draftCustomizationOptions.identityIsCustom;
draftCustomizationOptions.identityIsCustom?'':this.resetIdentityToDefault();" draftCustomizationOptions.identityIsCustom?'':this.resetIdentityToDefault();"
[attr.uk-tooltip]="'title:<div class=\'uk-padding-small uk-width-large\'>' + [attr.uk-tooltip]="'title:<div class=\'uk-width-large\'>' +
(draftCustomizationOptions.identityIsCustom?'Change to default identity values':'Customize identity colors')+'</div>'" (draftCustomizationOptions.identityIsCustom?'Change to default identity values':'Customize identity colors')+'</div>'"
> >
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
</div> </div>
<div *ngIf="draftCustomizationOptions.identityIsCustom" class=" uk-margin-large-top uk-margin-medium-bottom"> <div *ngIf="draftCustomizationOptions.identityIsCustom" class=" uk-margin-large-top uk-margin-medium-bottom">
<div class=" uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold"> <div class=" uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-flex uk-flex-middle">
Colors Colors
<a *ngIf="hasChanges(publishedCustomizationOptions.identity, draftCustomizationOptions.identity) && <a *ngIf="hasChanges(publishedCustomizationOptions.identity, draftCustomizationOptions.identity) &&
draftCustomizationOptions.identityIsCustom" class="uk-margin-small-left" draftCustomizationOptions.identityIsCustom" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
(click)="resetIdentityToPublished();"> (click)="resetIdentityToPublished();">
<icon name="reset"></icon> <icon name="settings_backup_restore" flex="true"></icon>
</a> </a>
</div> </div>
<color [color]="draftCustomizationOptions.identity.mainColor" [light]="false" (colorChange)= <color [color]="draftCustomizationOptions.identity.mainColor" [light]="false" (colorChange)=
@ -187,7 +187,7 @@
[checked]="draftCustomizationOptions.backgroundsIsCustom" [checked]="draftCustomizationOptions.backgroundsIsCustom"
(change)="draftCustomizationOptions.backgroundsIsCustom=!draftCustomizationOptions.backgroundsIsCustom; (change)="draftCustomizationOptions.backgroundsIsCustom=!draftCustomizationOptions.backgroundsIsCustom;
draftCustomizationOptions.backgroundsIsCustom?'':this.resetBackgroundsToDefault(); " draftCustomizationOptions.backgroundsIsCustom?'':this.resetBackgroundsToDefault(); "
[attr.uk-tooltip]="'title:<div class=\'uk-padding-small uk-width-large\'>' + [attr.uk-tooltip]="'title:<div class=\'uk-width-large\'>' +
(draftCustomizationOptions.backgroundsIsCustom?'Change to default values produced based on the identity colors':'Customize options for background and buttons')+'</div>'" (draftCustomizationOptions.backgroundsIsCustom?'Change to default values produced based on the identity colors':'Customize options for background and buttons')+'</div>'"
> >
</mat-slide-toggle> </mat-slide-toggle>
@ -195,7 +195,7 @@
</div> </div>
<div *ngIf="draftCustomizationOptions.backgroundsIsCustom" > <div *ngIf="draftCustomizationOptions.backgroundsIsCustom" >
<div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top"> <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle">
Colors Colors
<a *ngIf="( <a *ngIf="(
hasChanges(publishedCustomizationOptions.backgrounds.light, draftCustomizationOptions.backgrounds.light)|| hasChanges(publishedCustomizationOptions.backgrounds.light, draftCustomizationOptions.backgrounds.light)||
@ -203,10 +203,10 @@
hasChanges(publishedCustomizationOptions.backgrounds.form.color, draftCustomizationOptions.backgrounds.form.color)) hasChanges(publishedCustomizationOptions.backgrounds.form.color, draftCustomizationOptions.backgrounds.form.color))
&& draftCustomizationOptions.backgroundsIsCustom" && draftCustomizationOptions.backgroundsIsCustom"
(click)="resetBackgroundsTo(publishedCustomizationOptions.backgrounds);" (click)="resetBackgroundsTo(publishedCustomizationOptions.backgrounds);"
class="uk-margin-small-left" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
> >
<icon name="reset"></icon> <icon name="settings_backup_restore" flex="true"></icon>
</a> </a>
</div> </div>
<background label="Dark" [background]="draftCustomizationOptions.backgrounds.dark" <background label="Dark" [background]="draftCustomizationOptions.backgrounds.dark"
@ -217,14 +217,13 @@
[light]="true" [light]="true"
[oldBackground]="publishedCustomizationOptions.backgrounds.form" [oldBackground]="publishedCustomizationOptions.backgrounds.form"
[communityId]="communityId" description="The area under menu"></background> [communityId]="communityId" description="The area under menu"></background>
<div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top"> <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle">
Hero section image Hero section image
<a *ngIf="(formHasChanges(publishedCustomizationOptions, draftCustomizationOptions) ) <a *ngIf="(formHasChanges(publishedCustomizationOptions, draftCustomizationOptions) )
&& draftCustomizationOptions.backgroundsIsCustom" && draftCustomizationOptions.backgroundsIsCustom"
(click)="resetImageTo(publishedCustomizationOptions.backgrounds);" class="uk-margin-small-left" (click)="resetImageTo(publishedCustomizationOptions.backgrounds);" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>">
> <icon name="settings_backup_restore" flex="true"></icon>
<icon name="reset"></icon>
</a> </a>
</div> </div>
<div class="uk-margin-medium-bottom"> <div class="uk-margin-medium-bottom">
@ -245,7 +244,7 @@
[checked]="draftCustomizationOptions.buttonsIsCustom" [checked]="draftCustomizationOptions.buttonsIsCustom"
(change)="draftCustomizationOptions.buttonsIsCustom=!draftCustomizationOptions.buttonsIsCustom; (change)="draftCustomizationOptions.buttonsIsCustom=!draftCustomizationOptions.buttonsIsCustom;
draftCustomizationOptions.buttonsIsCustom?'':this.resetButtonsToDefault(); " draftCustomizationOptions.buttonsIsCustom?'':this.resetButtonsToDefault(); "
[attr.uk-tooltip]="'title:<div class=\'uk-padding-small uk-width-large\'>' + [attr.uk-tooltip]="'title:<div class=\'uk-width-large\'>' +
(draftCustomizationOptions.buttonsIsCustom?'Change to default values produced based on the identity colors':'Customize options for background and buttons')+'</div>'" (draftCustomizationOptions.buttonsIsCustom?'Change to default values produced based on the identity colors':'Customize options for background and buttons')+'</div>'"
> >
</mat-slide-toggle> </mat-slide-toggle>

5
src/app/pages/customization/customization.module.ts
View File

@ -22,7 +22,6 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import {CustomizeButtonsComponent} from './customize-buttons.component'; import {CustomizeButtonsComponent} from './customize-buttons.component';
import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module'; import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module';
import {IconsService} from '../../openaireLibrary/utils/icons/icons.service'; import {IconsService} from '../../openaireLibrary/utils/icons/icons.service';
import {refresh, reset} from '../../openaireLibrary/utils/icons/icons';
import {BackgroundComponent} from './background.component'; import {BackgroundComponent} from './background.component';
import {InputModule} from '../../openaireLibrary/sharedComponents/input/input.module'; import {InputModule} from '../../openaireLibrary/sharedComponents/input/input.module';
import {BackgroundUploadComponent} from "./background-upload.component"; import {BackgroundUploadComponent} from "./background-upload.component";
@ -44,7 +43,5 @@ import {SideBarModule} from "../../openaireLibrary/dashboard/sharedComponents/si
] ]
}) })
export class CustomizationModule { export class CustomizationModule {
constructor(private iconsService: IconsService) { constructor() {}
this.iconsService.registerIcons([reset, refresh]);
}
} }

16
src/app/pages/customization/customize-buttons.component.ts
View File

@ -21,10 +21,10 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust
</div> </div>
<div *ngIf="!onlyBorder" class="uk-grid uk-margin-top" > <div *ngIf="!onlyBorder" class="uk-grid uk-margin-top" >
<div class=""> <div class="">
<div class=" uk-margin-xsmall-bottom uk-text-bold uk-margin-small-left uk-text-meta uk-text-uppercase">Colors <div class=" uk-margin-xsmall-bottom uk-text-bold uk-margin-small-left uk-text-meta uk-text-uppercase uk-flex uk-flex-middle">Colors
<a *ngIf="buttons.color !=buttonsPublished.color || buttons.backgroundColor != buttonsPublished.backgroundColor || buttons.borderColor !=buttonsPublished.borderColor " class="uk-margin-small-left" <a *ngIf="buttons.color !=buttonsPublished.color || buttons.backgroundColor != buttonsPublished.backgroundColor || buttons.borderColor !=buttonsPublished.borderColor " class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
(click)="buttons.color =buttonsPublished.color; buttons.backgroundColor = buttonsPublished.backgroundColor ; buttons.borderColor =buttonsPublished.borderColor "> <icon name="reset"></icon></a> (click)="buttons.color =buttonsPublished.color; buttons.backgroundColor = buttonsPublished.backgroundColor ; buttons.borderColor =buttonsPublished.borderColor "> <icon name="settings_backup_restore" flex="true"></icon></a>
</div> </div>
<color [color]="buttons.color" (colorChange)= <color [color]="buttons.color" (colorChange)=
" buttons.color = $event; " " buttons.color = $event; "
@ -40,11 +40,11 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust
></color> ></color>
</div> </div>
<div class="uk-margin-top"> <div class="uk-margin-top">
<div class=" uk-margin-xsmall-bottom uk-text-bold uk-margin-small-left uk-text-meta uk-text-uppercase">Colors on hover <div class=" uk-margin-xsmall-bottom uk-text-bold uk-margin-small-left uk-text-meta uk-text-uppercase uk-flex uk-flex-middle">Colors on hover
<a *ngIf="hasChanges(buttons.onHover,buttonsPublished.onHover)" class="uk-margin-small-left" <a *ngIf="hasChanges(buttons.onHover,buttonsPublished.onHover)" class="uk-margin-small-left uk-button-link"
uk-tooltip="title:<div class='uk-padding-small uk-width-large'>Reset to previously saved options</div>" uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>"
(click)="buttons.onHover.color =buttonsPublished.onHover.color; buttons.onHover.backgroundColor = buttonsPublished.onHover.backgroundColor ; (click)="buttons.onHover.color =buttonsPublished.onHover.color; buttons.onHover.backgroundColor = buttonsPublished.onHover.backgroundColor ;
buttons.onHover.borderColor = buttonsPublished.onHover.borderColor"> <icon name="reset"></icon></a> buttons.onHover.borderColor = buttonsPublished.onHover.borderColor"> <icon name="settings_backup_restore" flex="true"></icon></a>
</div> </div>
<div class=""> <div class="">
<color [color]="buttons.onHover.color" (colorChange)= <color [color]="buttons.onHover.color" (colorChange)=

2
src/app/pages/manage-communities/manage-communities.module.ts
View File

@ -10,7 +10,7 @@ import {UrlPrefixModule} from '../../openaireLibrary/utils/pipes/url-prefix.modu
import {CommunitiesService} from '../../openaireLibrary/connect/communities/communities.service'; import {CommunitiesService} from '../../openaireLibrary/connect/communities/communities.service';
import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module'; import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module';
import {IconsService} from '../../openaireLibrary/utils/icons/icons.service'; import {IconsService} from '../../openaireLibrary/utils/icons/icons.service';
import {earth, group, lock} from '../../openaireLibrary/utils/icons/icons'; import {earth} from '../../openaireLibrary/utils/icons/icons';
import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {SearchInputModule} from '../../openaireLibrary/sharedComponents/search-input/search-input.module'; import {SearchInputModule} from '../../openaireLibrary/sharedComponents/search-input/search-input.module';

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 9141b4c9c3363ceb8a690a361d483268eb7eabe4 Subproject commit fdcbc17b88deb76cee2cd4432282468be9f56b7e

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 143c2719ec972c8456817c7c1dd17f96593eeddf Subproject commit 201ff990c0b2532951a796b10799ab95cb40c0b0

4
src/environments/environment.ts
View File

@ -51,8 +51,8 @@ export let properties: EnvProperties = {
feedbackmail: 'openaire.test@gmail.com', feedbackmail: 'openaire.test@gmail.com',
feedbackmailForMissingEntities: 'feedback@openaire.eu', feedbackmailForMissingEntities: 'feedback@openaire.eu',
cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=', cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=',
deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear', // deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear',
deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/cache', // deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/cache',
adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/', adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/',
adminToolsCommunity: 'openaire', adminToolsCommunity: 'openaire',
communityAPI: 'https://dev-openaire.d4science.org/openaire/community/', communityAPI: 'https://dev-openaire.d4science.org/openaire/community/',