[develop | ADDED | DONE]: Add version check = false for ckeditor. Add tooltip in background upload in customization.
This commit is contained in:
parent
689ae5ee9a
commit
8b37f109c2
|
|
@ -1 +1 @@
|
|||
Subproject commit d411407d8ae8ec1b749411e5e2f698b529aebce7
|
||||
Subproject commit 45f638e0174167381f5120e22c8e3b03d601e505
|
||||
|
|
@ -17,7 +17,7 @@ declare var UIkit;
|
|||
</div>
|
||||
<div inner>
|
||||
<div>
|
||||
<div class="uk-alert uk-alert-warning uk-margin-top ">
|
||||
<div class="uk-alert uk-alert-warning uk-margin-top">
|
||||
<div class="uk-text-large">Use only after connect deployment. And only if there are css updates!</div>
|
||||
Press the following button to update the timestamp in the saved layouts and recreate the css files.
|
||||
</div>
|
||||
|
|
@ -26,8 +26,6 @@ declare var UIkit;
|
|||
</div>
|
||||
<div class="uk-margin-medium-top">
|
||||
<div>Purge ICM cache for all communities</div>
|
||||
|
||||
|
||||
<button (click)="purgeBrowserCache()" class="uk-button uk-button-danger uk-margin-top"
|
||||
[class.uk-disabled]="savingChanges || !properties.deleteBrowserCacheUrl"> Purge Browser Cache</button>
|
||||
<hr>
|
||||
|
|
@ -83,7 +81,7 @@ export class ConnectAdminCustomizationComponent implements OnInit {
|
|||
this.savingChanges = true;
|
||||
let connectCssIsSaved = false;
|
||||
let defaultCssIsSaved = false;
|
||||
this.subscriptions.push(this.customizationService.getLayouts(properties, ).subscribe(async layouts => {
|
||||
this.subscriptions.push(this.customizationService.getLayouts(properties).subscribe(async layouts => {
|
||||
|
||||
this.totalLayouts = layouts ? layouts.length : 0;
|
||||
for(let layout of layouts){
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ declare var UIkit;
|
|||
selector: 'background-upload',
|
||||
template: `
|
||||
<input #file id="photo" type="file" class="uk-hidden" (change)="fileChangeEvent($event)"/>
|
||||
<div *ngIf="!background.imageFile"
|
||||
<div *ngIf="!background.imageFile" [attr.uk-tooltip]="'Please upload a JPG or PNG image under ' + maxsize / (1000 * 1024) + 'MB.'"
|
||||
class=" upload uk-text-center uk-height-small uk-flex uk-flex-middle uk-flex-center uk-text-uppercase">
|
||||
<span uk-icon="icon: cloud-upload"></span>
|
||||
<div uk-form-custom>
|
||||
|
|
@ -55,7 +55,7 @@ export class BackgroundUploadComponent implements OnInit {
|
|||
@Input() light:boolean; //fonts mode
|
||||
public file: File;
|
||||
// public photo: string | ArrayBuffer;
|
||||
private maxsize: number = 2000 * 1024;
|
||||
public maxsize: number = 2 * 1000 * 1024;
|
||||
properties;
|
||||
private subscriptions: any[] = [];
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ export class BackgroundUploadComponent implements OnInit {
|
|||
});
|
||||
this.removePhoto();
|
||||
} else if (this.file.size > this.maxsize) {
|
||||
UIkit.notification('File exceeds size\'s limit (' + this.maxsize / 1024 + 'KB)! ', {
|
||||
UIkit.notification('File exceeds size\'s limit (' + this.maxsize / (1000 * 1024) + 'MB)! ', {
|
||||
status: 'danger',
|
||||
timeout: 6000,
|
||||
pos: 'bottom-right'
|
||||
|
|
@ -136,7 +136,7 @@ export class BackgroundUploadComponent implements OnInit {
|
|||
|
||||
}, error => {
|
||||
if (error.error.message) {
|
||||
UIkit.notification('The maximum size of an image is 1MB, please check if your file exceeds this limit.', {
|
||||
UIkit.notification('The maximum size of an image is ' + this.maxsize / (1000 * 1024) + 'MB, please check if your file exceeds this limit.', {
|
||||
status: 'danger',
|
||||
timeout: 6000,
|
||||
pos: 'bottom-right'
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 40aff22099b01ca3cce91bcb017cf3e29a55d98e
|
||||
Subproject commit 682e29734001949a776716d9b395a6919ffe6c21
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="/">
|
||||
<title>Administration Dashboard | OpenAIRE-Connect</title>
|
||||
|
|
@ -23,10 +23,13 @@
|
|||
<meta name="robots" content="noindex">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script>
|
||||
<script>
|
||||
CKEDITOR.config.versionCheck = false;
|
||||
</script>
|
||||
<script src="https://unpkg.com/smoothscroll-polyfill@0.4.3/dist/smoothscroll.min.js"></script>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
</body>
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue