From e4bef006d35431adbfc7ca992b4f16d58eafd81f Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 8 Sep 2020 18:11:29 +0300 Subject: [PATCH 1/3] Fixes bug, cant remove finalized dataset --- dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index da99abc8d..46f506710 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -84,7 +84,7 @@
  • {{'DMP-EDITOR.STEPPER.DATASET' | translate}}
    - remove_circle_outline + remove_circle_outline
    check{{'TYPES.DATASET-STATUS.FINALISED' | translate}} diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index eb8ae2c58..5f8b0017a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -355,6 +355,11 @@ a:hover { cursor: auto !important; } +.add-dataset-btn:hover { + color: #129d99 !important; + border: 1px solid #129d99; +} + .dataset-list { list-style-type: none; padding-left: 0px; From 1737c96621ce1d557afd1e6dc48eb01364552eef Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 8 Sep 2020 18:18:18 +0300 Subject: [PATCH 2/3] Fixes condition visibility of remove dataset --- dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 46f506710..60fb6fef6 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -84,7 +84,7 @@
  • {{'DMP-EDITOR.STEPPER.DATASET' | translate}}
    - remove_circle_outline + remove_circle_outline
    check{{'TYPES.DATASET-STATUS.FINALISED' | translate}} From efaebe8574cff9dc6074863642ee729ede0a000b Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 9 Sep 2020 11:08:53 +0300 Subject: [PATCH 3/3] Adds slider on static page per 3 sec, stops on option click. --- dmp-frontend/src/assets/splash/index.html | 8 ++++---- dmp-frontend/src/assets/splash/js/scripts.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/assets/splash/index.html b/dmp-frontend/src/assets/splash/index.html index b5df09f6f..9f1b8dd75 100644 --- a/dmp-frontend/src/assets/splash/index.html +++ b/dmp-frontend/src/assets/splash/index.html @@ -103,13 +103,13 @@

    Argos

     

    experience

    -
    +

    1

     

    Select Templates

    -
    +

    2

     

    Fill the information

    -
    +

    3

     

    Share DMP

    @@ -393,4 +393,4 @@ - \ No newline at end of file + diff --git a/dmp-frontend/src/assets/splash/js/scripts.js b/dmp-frontend/src/assets/splash/js/scripts.js index 6abf11b0b..724c64c44 100644 --- a/dmp-frontend/src/assets/splash/js/scripts.js +++ b/dmp-frontend/src/assets/splash/js/scripts.js @@ -45,3 +45,19 @@ window.onclick = function (event) { this.closeOpenDropdowns(); } } + +// Slideshow per 3 sec, stops on option click +window.onload = function slideImages() { + var x = -1; + slides = setInterval(function displayNextImage() { + x = (x === images.length - 1) ? 0 : x + 1; + document.getElementById('template-preview').src = images[x]; + toggleClass(['id1','id2','id3'], 'id'.concat((x + 1).toString())); + }, 3000); +} + +var slides; +var images = []; +images[0] = 'assets/img/template-preview-1.svg'; +images[1] = 'assets/img/template-preview-2.svg'; +images[2] = 'assets/img/template-preview-3.svg';