From b8448dab08f5f153768c0faf5a1b3ae234519272 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 9 May 2017 13:13:36 +0000 Subject: [PATCH] Change classes, css, and components to UIKIT3 git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47121 d315682c-612b-4755-9ff5-7f18f6832af3 --- workingUIKIT/package.json | 2 + workingUIKIT/src/app/app.component.ts | 12 +- .../claimContextSearchForm.component.ts | 10 +- .../claimProjectSearchForm.component.ts | 6 +- .../claimResultSearchForm.component.html | 42 +- .../displayClaims.component.html | 22 +- .../claimsByToken/claimsByToken.component.ts | 16 +- .../directLinking/directLinking.component.ts | 12 +- .../linking/bulkClaim/bulkClaim.component.ts | 10 +- .../insertClaim/insertClaim.component.ts | 2 +- .../linking/linkingGeneric.component.ts | 20 +- .../claims/linking/linkingHome.component.ts | 16 +- .../selected/selectedContexts.component.ts | 12 +- .../selected/selectedProjects.component.ts | 26 +- .../selected/selectedResults.component.ts | 28 +- .../src/app/deposit/deposit.component.ts | 4 +- .../app/deposit/depositResult.component.ts | 8 +- .../dataProvider/dataProvider.component.html | 8 +- .../dataset/dataset.component.html | 20 +- .../src/app/landingPages/metrics.component.ts | 6 +- .../organization/organization.component.html | 12 +- .../landingPages/person/person.component.html | 10 +- .../project/project.component.html | 24 +- .../publication/publication.component.html | 30 +- .../publication/publication.component.ts | 4 +- .../landingPages/showSubjects.component.ts | 6 +- workingUIKIT/src/app/login/user.component.ts | 12 +- .../src/app/login/userMini.component.ts | 2 +- .../app/searchPages/find/search.component.ts | 35 +- .../advancedSearchForm.component.ts | 18 +- .../advancedSearchPage.component.ts | 2 +- .../searchUtils/browseEntities.component.ts | 2 +- .../searchUtils/browseStatistic.component.ts | 6 +- .../searchUtils/dateFilter.component.ts | 2 +- .../searchUtils/searchDownload.component.ts | 2 +- .../searchUtils/searchFilter.component.ts | 10 +- .../searchUtils/searchForm.component.ts | 4 +- .../searchUtils/searchPage.component.ts | 16 +- .../app/sharedComponents/bottom.component.ts | 106 ++- .../cookie-law/cookie-law.component.ts | 2 +- .../cookie-law/cookie-law.html | 4 +- .../navigationBar.component.ts | 323 ++++++++-- .../entitiesAutoComplete.component.ts | 8 +- workingUIKIT/src/app/utils/modal/alert.ts | 16 +- .../src/app/utils/modal/open.component.ts | 6 +- .../app/utils/modal/selectModal.component.ts | 6 +- .../app/utils/pagingFormatter.component.ts | 6 +- .../utils/pagingFormatterNoLoad.component.ts | 4 +- .../staticAutoComplete.component.ts | 6 +- workingUIKIT/src/assets/custom.css | 602 ++++++++++++++++++ workingUIKIT/src/assets/dl119_files/80x15.png | Bin 0 -> 410 bytes .../src/assets/dl119_files/Home-icon.png | Bin 0 -> 3119 bytes .../assets/dl119_files/Logo_Horizontal.png | Bin 0 -> 12549 bytes .../Logo_Horizontal_white_small.png | Bin 0 -> 4630 bytes .../src/assets/dl119_files/Symbol.png | Bin 0 -> 8018 bytes .../src/assets/dl119_files/custom.css | 602 ++++++++++++++++++ .../assets/dl119_files/ec_logo_inv_small.png | Bin 0 -> 4060 bytes workingUIKIT/src/assets/dl119_files/jquery.js | 5 + workingUIKIT/src/assets/dl119_files/theme.css | 9 + .../src/assets/dl119_files/uikit-icons-max.js | 4 + workingUIKIT/src/assets/dl119_files/uikit.js | 5 + workingUIKIT/src/assets/jquery.js | 5 + workingUIKIT/src/assets/theme.css | 9 + .../components/accordion.almost-flat.min.css | 2 - .../autocomplete.almost-flat.min.css | 2 - .../css/components/dotnav.almost-flat.min.css | 2 - .../form-advanced.almost-flat.min.css | 2 - .../components/form-file.almost-flat.min.css | 2 - .../form-password.almost-flat.min.css | 2 - .../form-select.almost-flat.min.css | 2 - .../components/htmleditor.almost-flat.min.css | 2 - .../components/nestable.almost-flat.min.css | 2 - .../css/components/notify.almost-flat.min.css | 2 - .../placeholder.almost-flat.min.css | 2 - .../components/progress.almost-flat.min.css | 2 - .../css/components/search.almost-flat.min.css | 2 - .../components/slidenav.almost-flat.min.css | 2 - .../css/components/slider.almost-flat.min.css | 2 - .../components/slideshow.almost-flat.min.css | 2 - .../components/sortable.almost-flat.min.css | 2 - .../css/components/sticky.almost-flat.min.css | 2 - .../components/tooltip.almost-flat.min.css | 2 - .../css/components/upload.almost-flat.min.css | 2 - .../css/uikit.almost-flat.min.css | 2 - .../src/assets/uikit-2.27.2/css/uikit.min.css | 2 - .../assets/uikit-2.27.2/fonts/FontAwesome.otf | Bin 124988 -> 0 bytes .../fonts/fontawesome-webfont.ttf | Bin 152796 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 90412 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 71896 -> 0 bytes .../js/components/accordion.min.js | 2 - .../js/components/autocomplete.min.js | 2 - .../js/components/form-password.min.js | 2 - .../js/components/form-select.min.js | 2 - .../js/components/grid-parallax.min.js | 2 - .../uikit-2.27.2/js/components/grid.min.js | 2 - .../js/components/htmleditor.min.js | 2 - .../js/components/lightbox.min.js | 2 - .../js/components/nestable.min.js | 2 - .../uikit-2.27.2/js/components/notify.min.js | 2 - .../js/components/pagination.min.js | 2 - .../js/components/parallax.min.js | 2 - .../uikit-2.27.2/js/components/search.min.js | 2 - .../uikit-2.27.2/js/components/slider.min.js | 2 - .../js/components/slideset.min.js | 2 - .../js/components/slideshow-fx.min.js | 2 - .../js/components/slideshow.min.js | 2 - .../js/components/sortable.min.js | 2 - .../uikit-2.27.2/js/components/sticky.min.js | 2 - .../js/components/timepicker.min.js | 2 - .../uikit-2.27.2/js/components/tooltip.min.js | 2 - .../uikit-2.27.2/js/components/upload.min.js | 2 - .../assets/uikit-2.27.2/js/core/alert.min.js | 2 - .../assets/uikit-2.27.2/js/core/button.min.js | 2 - .../assets/uikit-2.27.2/js/core/core.min.js | 2 - .../assets/uikit-2.27.2/js/core/cover.min.js | 2 - .../uikit-2.27.2/js/core/dropdown.min.js | 2 - .../assets/uikit-2.27.2/js/core/grid.min.js | 2 - .../assets/uikit-2.27.2/js/core/modal.min.js | 2 - .../assets/uikit-2.27.2/js/core/nav.min.js | 2 - .../uikit-2.27.2/js/core/offcanvas.min.js | 2 - .../uikit-2.27.2/js/core/scrollspy.min.js | 2 - .../uikit-2.27.2/js/core/smooth-scroll.min.js | 2 - .../uikit-2.27.2/js/core/switcher.min.js | 2 - .../assets/uikit-2.27.2/js/core/tab.min.js | 2 - .../assets/uikit-2.27.2/js/core/toggle.min.js | 2 - .../assets/uikit-2.27.2/js/core/touch.min.js | 2 - .../uikit-2.27.2/js/core/utility.min.js | 2 - .../src/assets/uikit-2.27.2/js/uikit.min.js | 3 - workingUIKIT/src/assets/uikit-icons-max.js | 4 + workingUIKIT/src/assets/uikit.js | 5 + workingUIKIT/src/index.html | 79 +-- workingUIKIT/src/server.ts | 2 +- 132 files changed, 1886 insertions(+), 534 deletions(-) create mode 100644 workingUIKIT/src/assets/dl119_files/80x15.png create mode 100644 workingUIKIT/src/assets/dl119_files/Home-icon.png create mode 100644 workingUIKIT/src/assets/dl119_files/Logo_Horizontal.png create mode 100644 workingUIKIT/src/assets/dl119_files/Logo_Horizontal_white_small.png create mode 100644 workingUIKIT/src/assets/dl119_files/Symbol.png create mode 100644 workingUIKIT/src/assets/dl119_files/custom.css create mode 100644 workingUIKIT/src/assets/dl119_files/ec_logo_inv_small.png create mode 100644 workingUIKIT/src/assets/dl119_files/jquery.js create mode 100644 workingUIKIT/src/assets/dl119_files/theme.css create mode 100644 workingUIKIT/src/assets/dl119_files/uikit-icons-max.js create mode 100644 workingUIKIT/src/assets/dl119_files/uikit.js create mode 100644 workingUIKIT/src/assets/jquery.js create mode 100644 workingUIKIT/src/assets/theme.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/accordion.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/autocomplete.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/dotnav.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/form-advanced.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/form-file.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/form-password.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/form-select.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/htmleditor.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/nestable.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/notify.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/placeholder.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/progress.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/search.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/slidenav.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/slider.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/slideshow.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/sortable.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/sticky.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/tooltip.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/components/upload.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/uikit.almost-flat.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/css/uikit.min.css delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/fonts/FontAwesome.otf delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/fonts/fontawesome-webfont.ttf delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/fonts/fontawesome-webfont.woff delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/fonts/fontawesome-webfont.woff2 delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/accordion.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/autocomplete.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/form-password.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/form-select.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/grid-parallax.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/grid.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/htmleditor.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/lightbox.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/nestable.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/notify.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/pagination.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/parallax.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/search.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/slider.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/slideset.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/slideshow-fx.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/slideshow.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/sortable.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/sticky.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/timepicker.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/tooltip.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/components/upload.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/alert.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/button.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/core.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/cover.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/dropdown.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/grid.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/modal.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/nav.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/offcanvas.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/scrollspy.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/smooth-scroll.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/switcher.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/tab.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/toggle.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/touch.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/core/utility.min.js delete mode 100644 workingUIKIT/src/assets/uikit-2.27.2/js/uikit.min.js create mode 100644 workingUIKIT/src/assets/uikit-icons-max.js create mode 100644 workingUIKIT/src/assets/uikit.js diff --git a/workingUIKIT/package.json b/workingUIKIT/package.json index 06548ad4..86dc6e25 100644 --- a/workingUIKIT/package.json +++ b/workingUIKIT/package.json @@ -63,12 +63,14 @@ "clipboard": "^1.5.16", "compression": "^1.6.2", "express": "^4.14.0", + "jquery": "^3.2.1", "js.clone": "0.0.3", "methods": "~1.1.2", "morgan": "^1.7.0", "preboot": "~4.5.2", "rxjs": "5.0.0-beta.12", "ts-md5": "^1.2.0", + "uikit": "^3.0.0-beta.22", "webfontloader": "^1.6.26", "zone.js": "~0.6.26" }, diff --git a/workingUIKIT/src/app/app.component.ts b/workingUIKIT/src/app/app.component.ts index fde6260d..86a36690 100644 --- a/workingUIKIT/src/app/app.component.ts +++ b/workingUIKIT/src/app/app.component.ts @@ -29,17 +29,17 @@ export class XLargeDirective { -
-
-
-
+
+
+
+
-
-
+
You have selected {{selected.length}} claim(s)
-
+
- +

-
No entries found.
+
No entries found.
@@ -83,7 +83,7 @@ {{claim.date}} - + diff --git a/workingUIKIT/src/app/claims/claimsByToken/claimsByToken.component.ts b/workingUIKIT/src/app/claims/claimsByToken/claimsByToken.component.ts index cde79125..81839164 100644 --- a/workingUIKIT/src/app/claims/claimsByToken/claimsByToken.component.ts +++ b/workingUIKIT/src/app/claims/claimsByToken/claimsByToken.component.ts @@ -19,22 +19,22 @@ import {RouterHelper} from '../../utils/routerHelper.class';

Claims Manager

- -
+
- +

Oops! Your email does not give you the authority to view claims for the selected project. Please contact the administrators.

@@ -49,7 +49,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
-
No pending claims found.
+
No pending claims found.
@@ -93,7 +93,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';

Already Curated Claims

-
No curated claims found.
+
No curated claims found.
@@ -129,7 +129,7 @@ import {RouterHelper} from '../../utils/routerHelper.class'; - + diff --git a/workingUIKIT/src/app/claims/directLinking/directLinking.component.ts b/workingUIKIT/src/app/claims/directLinking/directLinking.component.ts index b8c2d80e..e8021acd 100644 --- a/workingUIKIT/src/app/claims/directLinking/directLinking.component.ts +++ b/workingUIKIT/src/app/claims/directLinking/directLinking.component.ts @@ -22,10 +22,10 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service';
-
+
@@ -34,7 +34,7 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service';
-
+
{{projects[0].funderName}} | {{projects[0].projectName}} {{(projects[0].projectAcronym)?'('+projects[0].projectAcronym+')':''}}
@@ -55,15 +55,15 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service';
-
diff --git a/workingUIKIT/src/app/claims/linking/bulkClaim/bulkClaim.component.ts b/workingUIKIT/src/app/claims/linking/bulkClaim/bulkClaim.component.ts index 75190374..96844221 100644 --- a/workingUIKIT/src/app/claims/linking/bulkClaim/bulkClaim.component.ts +++ b/workingUIKIT/src/app/claims/linking/bulkClaim/bulkClaim.component.ts @@ -9,13 +9,13 @@ import {Dates, DOI} from '../../../utils/string-utils.class'; selector: 'bulk-claim', template: `
-
+
Upload a DOI csv file:
- -