From af1de79ec42069360294a443d70fd6a15e13f14b Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 16 Jan 2017 10:27:23 +0000 Subject: [PATCH] clear unused fileds from uikit | add jquery localy | add logo image | use select instead of dropdown in Adv. search| add statistics charts in LPs| comment code for inline claiming | change navbar - remove links to claiming, login git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45392 d315682c-612b-4755-9ff5-7f18f6832af3 --- portal-2/src/app/app.component.ts | 17 +- portal-2/src/app/deposit/deposit.component.ts | 10 +- .../dataProvider/statisticsTab.component.ts | 70 +- .../dataProvider/tabs.component.ts | 5 +- .../dataset/dataset.component.html | 21 +- .../landingPages/dataset/dataset.component.ts | 7 +- .../project/project.component.html | 39 +- .../landingPages/project/project.component.ts | 15 +- .../publication/publication.component.html | 21 +- .../publication/publication.component.ts | 8 +- .../advancedSearchForm.component.ts | 40 +- .../searchUtils/searchForm.component.ts | 2 +- .../searchUtils/searchPage.component.ts | 4 +- portal-2/src/app/services/dataset.service.ts | 2 +- .../navigationBar.component.ts | 43 +- portal-2/src/app/test/test.component.ts | 11 +- .../utils/properties/openaireProperties.ts | 18 +- portal-2/src/assets/custom.css | 0 portal-2/src/assets/jquery/jquery.min.js | 5 + portal-2/src/assets/newlogo.png | Bin 0 -> 18584 bytes .../css/components/accordion.almost-flat.css | 39 - .../uikit-2.27.2/css/components/accordion.css | 37 - .../css/components/accordion.gradient.css | 39 - .../css/components/accordion.gradient.min.css | 2 - .../css/components/accordion.min.css | 2 - .../components/autocomplete.almost-flat.css | 57 - .../css/components/autocomplete.css | 55 - .../css/components/autocomplete.gradient.css | 57 - .../components/autocomplete.gradient.min.css | 2 - .../css/components/autocomplete.min.css | 2 - .../css/components/datepicker.almost-flat.css | 129 - .../css/components/datepicker.css | 123 - .../css/components/datepicker.gradient.css | 139 - .../components/datepicker.gradient.min.css | 2 - .../css/components/datepicker.min.css | 2 - .../css/components/dotnav.almost-flat.css | 128 - .../uikit-2.27.2/css/components/dotnav.css | 124 - .../css/components/dotnav.gradient.css | 128 - .../css/components/dotnav.gradient.min.css | 2 - .../css/components/dotnav.min.css | 2 - .../components/form-advanced.almost-flat.css | 78 - .../css/components/form-advanced.css | 78 - .../css/components/form-advanced.gradient.css | 78 - .../components/form-advanced.gradient.min.css | 2 - .../css/components/form-advanced.min.css | 2 - .../css/components/form-file.almost-flat.css | 34 - .../uikit-2.27.2/css/components/form-file.css | 34 - .../css/components/form-file.gradient.css | 34 - .../css/components/form-file.gradient.min.css | 2 - .../css/components/form-file.min.css | 2 - .../components/form-password.almost-flat.css | 34 - .../css/components/form-password.css | 34 - .../css/components/form-password.gradient.css | 34 - .../components/form-password.gradient.min.css | 2 - .../css/components/form-password.min.css | 2 - .../components/form-select.almost-flat.css | 35 - .../css/components/form-select.css | 35 - .../css/components/form-select.gradient.css | 35 - .../components/form-select.gradient.min.css | 2 - .../css/components/form-select.min.css | 2 - .../css/components/htmleditor.almost-flat.css | 222 - .../css/components/htmleditor.css | 164 - .../css/components/htmleditor.gradient.css | 229 - .../components/htmleditor.gradient.min.css | 2 - .../css/components/htmleditor.min.css | 2 - .../css/components/nestable.almost-flat.css | 139 - .../uikit-2.27.2/css/components/nestable.css | 136 - .../css/components/nestable.gradient.css | 143 - .../css/components/nestable.gradient.min.css | 2 - .../css/components/nestable.min.css | 2 - .../css/components/notify.almost-flat.css | 98 - .../uikit-2.27.2/css/components/notify.css | 92 - .../css/components/notify.gradient.css | 98 - .../css/components/notify.gradient.min.css | 2 - .../css/components/notify.min.css | 2 - .../components/placeholder.almost-flat.css | 29 - .../css/components/placeholder.css | 29 - .../css/components/placeholder.gradient.css | 29 - .../components/placeholder.gradient.min.css | 2 - .../css/components/placeholder.min.css | 2 - .../css/components/progress.almost-flat.css | 104 - .../uikit-2.27.2/css/components/progress.css | 94 - .../css/components/progress.gradient.css | 112 - .../css/components/progress.gradient.min.css | 2 - .../css/components/progress.min.css | 2 - .../css/components/search.almost-flat.css | 191 - .../uikit-2.27.2/css/components/search.css | 189 - .../css/components/search.gradient.css | 191 - .../css/components/search.gradient.min.css | 2 - .../css/components/search.min.css | 2 - .../css/components/slidenav.almost-flat.css | 98 - .../uikit-2.27.2/css/components/slidenav.css | 98 - .../css/components/slidenav.gradient.css | 98 - .../css/components/slidenav.gradient.min.css | 2 - .../css/components/slidenav.min.css | 2 - .../css/components/slider.almost-flat.css | 94 - .../uikit-2.27.2/css/components/slider.css | 94 - .../css/components/slider.gradient.css | 94 - .../css/components/slider.gradient.min.css | 2 - .../css/components/slider.min.css | 2 - .../css/components/slideshow.almost-flat.css | 144 - .../uikit-2.27.2/css/components/slideshow.css | 144 - .../css/components/slideshow.gradient.css | 144 - .../css/components/slideshow.gradient.min.css | 2 - .../css/components/slideshow.min.css | 2 - .../css/components/sortable.almost-flat.css | 66 - .../uikit-2.27.2/css/components/sortable.css | 66 - .../css/components/sortable.gradient.css | 66 - .../css/components/sortable.gradient.min.css | 2 - .../css/components/sortable.min.css | 2 - .../css/components/sticky.almost-flat.css | 26 - .../uikit-2.27.2/css/components/sticky.css | 26 - .../css/components/sticky.gradient.css | 26 - .../css/components/sticky.gradient.min.css | 2 - .../css/components/sticky.min.css | 2 - .../css/components/tooltip.almost-flat.css | 119 - .../uikit-2.27.2/css/components/tooltip.css | 117 - .../css/components/tooltip.gradient.css | 119 - .../css/components/tooltip.gradient.min.css | 2 - .../css/components/tooltip.min.css | 2 - .../css/components/upload.almost-flat.css | 10 - .../uikit-2.27.2/css/components/upload.css | 10 - .../css/components/upload.gradient.css | 10 - .../css/components/upload.gradient.min.css | 2 - .../css/components/upload.min.css | 2 - .../uikit-2.27.2/css/uikit.almost-flat.css | 9100 ---------------- .../src/assets/uikit-2.27.2/css/uikit.css | 8800 ---------------- .../uikit-2.27.2/css/uikit.gradient.css | 9163 ----------------- .../uikit-2.27.2/css/uikit.gradient.min.css | 2 - .../uikit-2.27.2/js/components/accordion.js | 180 - .../js/components/autocomplete.js | 340 - .../uikit-2.27.2/js/components/datepicker.js | 3167 ------ .../js/components/form-password.js | 67 - .../uikit-2.27.2/js/components/form-select.js | 85 - .../js/components/grid-parallax.js | 168 - .../assets/uikit-2.27.2/js/components/grid.js | 540 - .../uikit-2.27.2/js/components/htmleditor.js | 679 -- .../uikit-2.27.2/js/components/lightbox.js | 588 -- .../uikit-2.27.2/js/components/nestable.js | 653 -- .../uikit-2.27.2/js/components/notify.js | 189 - .../uikit-2.27.2/js/components/pagination.js | 147 - .../uikit-2.27.2/js/components/parallax.js | 462 - .../uikit-2.27.2/js/components/search.js | 92 - .../uikit-2.27.2/js/components/slider.js | 552 - .../uikit-2.27.2/js/components/slideset.js | 523 - .../js/components/slideshow-fx.js | 382 - .../uikit-2.27.2/js/components/slideshow.js | 596 -- .../uikit-2.27.2/js/components/sortable.js | 688 -- .../uikit-2.27.2/js/components/sticky.js | 364 - .../uikit-2.27.2/js/components/timepicker.js | 192 - .../uikit-2.27.2/js/components/tooltip.js | 235 - .../uikit-2.27.2/js/components/upload.js | 262 - .../src/assets/uikit-2.27.2/js/core/alert.js | 66 - .../src/assets/uikit-2.27.2/js/core/button.js | 156 - .../src/assets/uikit-2.27.2/js/core/core.js | 820 -- .../src/assets/uikit-2.27.2/js/core/cover.js | 87 - .../assets/uikit-2.27.2/js/core/dropdown.js | 534 - .../src/assets/uikit-2.27.2/js/core/grid.js | 117 - .../src/assets/uikit-2.27.2/js/core/modal.js | 387 - .../src/assets/uikit-2.27.2/js/core/nav.js | 153 - .../assets/uikit-2.27.2/js/core/offcanvas.js | 197 - .../assets/uikit-2.27.2/js/core/scrollspy.js | 209 - .../uikit-2.27.2/js/core/smooth-scroll.js | 62 - .../assets/uikit-2.27.2/js/core/switcher.js | 307 - .../src/assets/uikit-2.27.2/js/core/tab.js | 169 - .../src/assets/uikit-2.27.2/js/core/toggle.js | 124 - .../src/assets/uikit-2.27.2/js/core/touch.js | 175 - .../assets/uikit-2.27.2/js/core/utility.js | 335 - portal-2/src/assets/uikit-2.27.2/js/uikit.js | 3898 ------- portal-2/src/assets/uikit.flat.min.css | 1 - portal-2/src/index.html | 29 +- 171 files changed, 228 insertions(+), 51792 deletions(-) create mode 100644 portal-2/src/assets/custom.css create mode 100644 portal-2/src/assets/jquery/jquery.min.js create mode 100644 portal-2/src/assets/newlogo.png delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/accordion.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/accordion.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/accordion.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/accordion.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/accordion.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/autocomplete.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/autocomplete.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/autocomplete.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/autocomplete.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/autocomplete.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/datepicker.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/datepicker.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/datepicker.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/datepicker.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/datepicker.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/dotnav.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/dotnav.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/dotnav.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/dotnav.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/dotnav.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-advanced.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-advanced.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-advanced.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-advanced.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-advanced.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-file.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-file.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-file.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-file.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-file.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-password.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-password.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-password.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-password.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-password.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-select.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-select.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-select.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-select.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/form-select.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/htmleditor.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/htmleditor.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/htmleditor.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/htmleditor.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/htmleditor.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/nestable.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/nestable.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/nestable.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/nestable.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/nestable.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/notify.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/notify.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/notify.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/notify.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/notify.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/placeholder.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/placeholder.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/placeholder.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/placeholder.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/placeholder.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/progress.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/progress.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/progress.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/progress.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/progress.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/search.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/search.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/search.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/search.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/search.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slidenav.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slidenav.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slidenav.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slidenav.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slidenav.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slider.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slider.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slider.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slider.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slider.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slideshow.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slideshow.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slideshow.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slideshow.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/slideshow.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sortable.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sortable.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sortable.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sortable.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sortable.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sticky.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sticky.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sticky.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sticky.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/sticky.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/tooltip.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/tooltip.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/tooltip.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/tooltip.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/tooltip.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/upload.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/upload.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/upload.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/upload.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/components/upload.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/uikit.almost-flat.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/uikit.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/uikit.gradient.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/css/uikit.gradient.min.css delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/accordion.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/autocomplete.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/datepicker.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/form-password.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/form-select.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/grid-parallax.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/grid.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/htmleditor.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/lightbox.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/nestable.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/notify.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/pagination.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/parallax.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/search.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/slider.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/slideset.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/slideshow-fx.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/slideshow.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/sortable.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/sticky.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/timepicker.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/tooltip.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/components/upload.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/alert.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/button.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/core.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/cover.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/dropdown.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/grid.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/modal.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/nav.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/offcanvas.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/scrollspy.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/smooth-scroll.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/switcher.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/tab.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/toggle.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/touch.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/core/utility.js delete mode 100644 portal-2/src/assets/uikit-2.27.2/js/uikit.js delete mode 100644 portal-2/src/assets/uikit.flat.min.css diff --git a/portal-2/src/app/app.component.ts b/portal-2/src/app/app.component.ts index 25c5c5fb..8e2dce77 100644 --- a/portal-2/src/app/app.component.ts +++ b/portal-2/src/app/app.component.ts @@ -32,19 +32,20 @@ export class XLargeDirective {
- -
-
+
+ +
- -
- -
+
+
diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index aff93727..eed4892b 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -33,15 +33,11 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic

Locate data provider via your institution

-
-
-
- + -
- -
+
diff --git a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts index 9a6645b4..b4ece4c6 100644 --- a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts @@ -1,28 +1,80 @@ import {Component, Input} from '@angular/core'; +import { SearchDatasetsComponent } from '../../searchPages/simple/searchDatasets.component'; +import { SearchPublicationsComponent } from '../../searchPages/simple/searchPublications.component'; +import {OpenaireProperties} from '../../utils/properties/openaireProperties'; @Component({ selector: 'statisticsTab', template: ` -
- There are no statistics -
+
+ There are no statistics +
+
+

+ The results below are discovered through our pilot algorithms. + Let us know how we are doing! +

+

Latest Documents Timeline

+ +

Documents Types

+ +
+ + +
+
+

Funders in Data Providers Publications

+ +

Projects with most Publications

+ + +
+
+
+

Projects with most Research Data

+ -
-

- The results below are discovered through our pilot algorithms. - Let us know how we are doing! -

+
` }) export class StatisticsTabComponent { @Input() statistics; + @Input() id; + @Input() searchDatasetsComponent : SearchDatasetsComponent; + @Input() searchPublicationsComponent : SearchPublicationsComponent; + // last docs timeline + // (* if pubs and data) + private docsTimelineUrl; + + // document types: + // (* if pubs and data) + private docsTypesUrl:string; + // + // publications funder + // (* if pubs and projects) + private pubsFunderUrl:string; + // + // projects with most research data + // (* if data and projects) + private dataProjectsUrl:string ; + // + // projects with most publications + // (* if pubs and projects) + private pubsProjectsUrl:string; constructor () {} - ngOnInit() {} + ngOnInit() { + + this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h250'; + this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + } ngOnDestroy() {} } diff --git a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts index 7ec53d67..00217ff3 100644 --- a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts @@ -107,7 +107,10 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s [paramsForSearchLink]="paramsForSearchLink" [searchDatasetsComponent]="searchDatasetsComponent"> - + + diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.html b/portal-2/src/app/landingPages/dataset/dataset.component.html index e2e7dac5..ef7fdbab 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.html +++ b/portal-2/src/app/landingPages/dataset/dataset.component.html @@ -37,10 +37,10 @@
-
+
  • @@ -112,7 +112,6 @@
    • -
  • Collected from
    @@ -143,8 +142,8 @@
    • -
  • -
    +
  • +
    Funded By
    Funded By
    - - +
    • -
  • -
    +
  • +
    Related to
    @@ -190,8 +189,8 @@
    Related to
    - - +
diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.ts b/portal-2/src/app/landingPages/dataset/dataset.component.ts index 99b37a72..c3a1da0d 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.ts +++ b/portal-2/src/app/landingPages/dataset/dataset.component.ts @@ -40,10 +40,10 @@ export class DatasetComponent { private result ; private metricsClicked: boolean; - @ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ; + /*@ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ; @ViewChild (InlineClaimContextComponent) inlineClaimContext : InlineClaimContextComponent ; @ViewChild (InlineClaimResultComponent) inlineClaimResult : InlineClaimResultComponent ; - +*/ public warningMessage = ""; public errorMessage = ""; ngOnDestroy() { @@ -73,7 +73,7 @@ export class DatasetComponent { } /********** Methods for Inline Claim of project / dataset ******/ - toggleClaimProject(){ + /* toggleClaimProject(){ this.inlineClaimProject.toggle(); } projectAdded($event){ @@ -137,6 +137,7 @@ export class DatasetComponent { //TODO } + */ showChange($event) { this.showAllReferences=$event.value; } diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index 9cdb3cf3..3cc76f99 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -49,10 +49,11 @@ -
+ +
-
  • -
    - There are no statistics -
    -
    -

    - The results below are discovered through our pilot algorithms. - Let us know how we are doing! -

    -
    +
    + There are no statistics +
    + + +
    +

    + The results below are discovered through our pilot algorithms. + Let us know how we are doing! +

    +
    +

    Scientific Results

    + +

    Access Mode

    + +

    By Datasource

    + +
    +
  • - +
    • @@ -140,7 +150,6 @@
  • Share - Bookmark
    • -
  • View all Project Publications diff --git a/portal-2/src/app/landingPages/project/project.component.ts b/portal-2/src/app/landingPages/project/project.component.ts index 212896ed..3e959a58 100644 --- a/portal-2/src/app/landingPages/project/project.component.ts +++ b/portal-2/src/app/landingPages/project/project.component.ts @@ -24,11 +24,15 @@ export class ProjectComponent{ public projectInfo: ProjectInfo; private projectName: string; private metricsClicked: boolean; + private statsClicked: boolean; private viewsFrameUrl: string; + private chartScientificResultsUrl: string; + private chartAccessModeUrl: string; + private chartDatasourcesUrl: string; private project ; - @ViewChild (InlineClaimResultComponent) inlineClaimResult : InlineClaimResultComponent ; + /*@ViewChild (InlineClaimResultComponent) inlineClaimResult : InlineClaimResultComponent ;*/ public warningMessage = ""; @@ -56,6 +60,7 @@ export class ProjectComponent{ ngOnInit() { this.metricsClicked = false; + this.statsClicked = false; this.sub = this.route.queryParams.subscribe(params => { this.projectId = params['projectId']; @@ -122,6 +127,10 @@ export class ProjectComponent{ this.projectName = (this.projectInfo.acronym != undefined && this.projectInfo.acronym != '') ? this.projectInfo.acronym : this.projectInfo.title; this.viewsFrameUrl = ('http://vaggelas.athenarc.gr/stats/merge.php?com=query&data=[{"table":"project_stats_monthly","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Number of views for project '+this.projectName+'","yaxisheaders":["sum of views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"id","values":["'+this.projectId+'"],"to":"-1"}]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'); + //stats tab charts + this.chartScientificResultsUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + this.chartAccessModeUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; + this.chartDatasourcesUrl= 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "column", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h250'; }, err => { console.log(err); @@ -133,7 +142,7 @@ export class ProjectComponent{ /* ********* Methods for Inline Claim of results ***** */ - toggleClaimResult(){ + /* toggleClaimResult(){ this.inlineClaimResult.toggle(); } publicationAdded($event){ @@ -144,6 +153,6 @@ export class ProjectComponent{ var contexts =$event.value; //TODO - } + }*/ } diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index 470b2016..9e57d5a0 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -54,10 +54,10 @@
    -
    +
    diff --git a/portal-2/src/app/landingPages/publication/publication.component.ts b/portal-2/src/app/landingPages/publication/publication.component.ts index a5a83857..32083ca4 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.ts +++ b/portal-2/src/app/landingPages/publication/publication.component.ts @@ -60,10 +60,10 @@ export class PublicationComponent { public result ; - @ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ; +/* @ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ; @ViewChild (InlineClaimContextComponent) inlineClaimContext : InlineClaimContextComponent ; @ViewChild (InlineClaimResultComponent) inlineClaimResult : InlineClaimResultComponent ; - +*/ public warningMessage = ""; public errorMessage = ""; @@ -103,7 +103,7 @@ export class PublicationComponent { /* ********* Methods for Inline Claim of project / publication ***** */ - toggleClaimProject(){ + /* toggleClaimProject(){ this.inlineClaimProject.toggle(); } projectAdded($event){ @@ -168,7 +168,7 @@ export class PublicationComponent { //TODO } - +*/ showChange($event) { this.showAllReferences=$event.value; } diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts index 8cf634ea..0d7ed689 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts @@ -15,7 +15,7 @@ import {Dates} from '../../utils/string-utils.class'; -