diff --git a/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.html b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.html new file mode 100644 index 00000000..e4ac6ef8 --- /dev/null +++ b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.html @@ -0,0 +1,79 @@ + +
+
+
+ +
+
+ Deposit {{requestFor}} +
+ +
+
+ + + +
+
+ Keywords: {{subject}} + +
+
+
+ +
+
+ +
+ + + + +
+

Please use the information/contacts shown below to deposit your {{requestFor}}.

+ +
+ +
+
+ {{fetchDataproviders.searchUtils.totalResults}} content providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}} +
+ + + +
+ +
+ No content providers found with classification "{{subject}}". +
+
+ An error occured. +
+ +
+ + You can still deposit your {{requestFor}} in + OpenAIRE's Zenodo catch-all repository () + hosted by CERN. +
+
+ +
+ + + +
+
+
+
diff --git a/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts index 6989b6a2..438db3c1 100644 --- a/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts +++ b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts @@ -14,86 +14,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; @Component({ selector: 'deposit-by-subject-result', - template: ` -
-
-
- -
-
- Deposit {{requestFor}} -
- -
-
- - - -
-
- Keywords: {{subject}} - -
-
-
- -
-
- -
- - - - -
-

Please use the information/contacts shown below to deposit your {{requestFor}}.

- -
- -
-
- {{fetchDataproviders.searchUtils.totalResults}} content providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}} -
- - - -
- -
- No content providers found with classification "{{subject}}". -
-
- An error occured. -
- -
- - You can still deposit your {{requestFor}} in - OpenAIRE's Zenodo catch-all repository () - hosted by CERN. -
-
- -
- - - -
-
-
-
- ` + templateUrl: 'depositBySubjectResult.component.html' }) export class DepositBySubjectResultComponent { diff --git a/portal-2/src/app/deposit/deposit.component.html b/portal-2/src/app/deposit/deposit.component.html new file mode 100644 index 00000000..8415b1e8 --- /dev/null +++ b/portal-2/src/app/deposit/deposit.component.html @@ -0,0 +1,56 @@ +
+
+ Deposit {{requestFor}} +
+
+ +
+
+ +
+
+

+ + Are you a grant recipient from the following: H2020; FP7 with SC39; or ERC? + + Then you are required to publish in + open access (). + One way to do this is to deposit your {{requestFor}} into an + open access repository (). +

+

+ Click the following to find more information: + FP7 guidelines (), + H2020 guidelines (), + ERC guidelines () OR + ask a question () to OpenAIRE’s national representative. +

+
+

Locate repository via your institution

+ +
+
+ + +
+ + +
+
+ +
+
+

Or locate repository in map

+
+ +
+
+
+ +
+ +
diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index 0c4f0200..04565a11 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -8,64 +8,7 @@ import {PiwikService} from '../utils/piwik/piwik.service'; @Component({ selector: 'deposit', - template: ` -
-
- Deposit {{requestFor}} -
-
- -
-
- -
-
-

- - Are you a grant recipient from the following: H2020; FP7 with SC39; or ERC? - - Then you are required to publish in - open access (). - One way to do this is to deposit your {{requestFor}} into an - open access repository (). -

-

- Click the following to find more information: - FP7 guidelines (), - H2020 guidelines (), - ERC guidelines () OR - ask a question () to OpenAIRE’s national representative. -

-
-

Locate repository via your institution

- -
-
- - -
- - -
-
- -
-
-

Or locate repository in map

-
- -
-
-
- -
- -
- ` + templateUrl: 'deposit.component.html' }) export class DepositComponent { diff --git a/portal-2/src/app/home/home.component.html b/portal-2/src/app/home/home.component.html new file mode 100644 index 00000000..549af1bd --- /dev/null +++ b/portal-2/src/app/home/home.component.html @@ -0,0 +1,65 @@ + + + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+

+ {{publicationsSize.number}} {{publicationsSize.size}} publications +

+
+
+
+
+

+ {{datasetsSize.number}} {{datasetsSize.size}} research data +

+
+
+
+
+

+ {{datasourcesSize.number}} {{datasourcesSize.size}} data sources +

+
+
+
+
+

+ {{fundersSize.number}} {{fundersSize.size}} funders +

+
+
+
+
+ all linked together +
+
+
+
+
+
+
+
+ +
+ +
diff --git a/portal-2/src/app/home/home.component.ts b/portal-2/src/app/home/home.component.ts index bb827085..8709ab84 100644 --- a/portal-2/src/app/home/home.component.ts +++ b/portal-2/src/app/home/home.component.ts @@ -20,73 +20,7 @@ import {PiwikService} from '../utils/piwik/piwik.service'; @Component({ selector: 'home', - template: ` - - -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-

- {{publicationsSize.number}} {{publicationsSize.size}} publications -

-
-
-
-
-

- {{datasetsSize.number}} {{datasetsSize.size}} research data -

-
-
-
-
-

- {{datasourcesSize.number}} {{datasourcesSize.size}} data sources -

-
-
-
-
-

- {{fundersSize.number}} {{fundersSize.size}} funders -

-
-
-
-
- all linked together -
-
-
-
-
-
-
-
- -
- -
- - ` + templateUrl: 'home.component.html', }) export class HomeComponent { public piwiksub: any; diff --git a/portal-2/src/app/login/user.component.html b/portal-2/src/app/login/user.component.html new file mode 100644 index 00000000..fc699009 --- /dev/null +++ b/portal-2/src/app/login/user.component.html @@ -0,0 +1,54 @@ + +
+
+
+ +
+ + + +
+ The requested page requires authentication. Please sign in. + + Sign in + +
+
+ You are not authorized to use the requested page +
+
+ The session has expired. Please sign in again or continue browsing as a guest. + + Sign in + +
+
{{errorMessage}}
+ +
+
+ Hello {{user.fullname}}! +
+ +
+
+
+
+
diff --git a/portal-2/src/app/login/user.component.ts b/portal-2/src/app/login/user.component.ts index 27e7cacc..1560182b 100644 --- a/portal-2/src/app/login/user.component.ts +++ b/portal-2/src/app/login/user.component.ts @@ -10,62 +10,8 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties'; @Component({ selector: 'user', - template: ` -
-
-
- -
- - - -
- The requested page requires authentication. Please sign in. - - Sign in - -
-
- You are not authorized to use the requested page -
-
- The session has expired. Please sign in again or continue browsing as a guest. - - Sign in - -
-
{{errorMessage}}
- -
-
- Hello {{user.fullname}}! -
- -
-
-
-
-
- ` -}) + templateUrl: 'user.component.html' + }) export class UserComponent { public user: User; diff --git a/portal-2/src/app/reload/reload.component.ts b/portal-2/src/app/reload/reload.component.ts index 94ddceab..b1f17fd0 100644 --- a/portal-2/src/app/reload/reload.component.ts +++ b/portal-2/src/app/reload/reload.component.ts @@ -14,7 +14,6 @@ import {Session} from '../login/utils/helper.class';
-
Go to initial page....
diff --git a/portal-2/src/app/searchPages/find/search.component.html b/portal-2/src/app/searchPages/find/search.component.html new file mode 100644 index 00000000..a6feec63 --- /dev/null +++ b/portal-2/src/app/searchPages/find/search.component.html @@ -0,0 +1,208 @@ + + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+ + + +
+ + +
+ + + + + +
+
+ +
+
+
+
diff --git a/portal-2/src/app/searchPages/find/search.component.ts b/portal-2/src/app/searchPages/find/search.component.ts index cfce9d11..4d70c9c3 100644 --- a/portal-2/src/app/searchPages/find/search.component.ts +++ b/portal-2/src/app/searchPages/find/search.component.ts @@ -28,216 +28,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; changeDetection: ChangeDetectionStrategy.Default, encapsulation: ViewEncapsulation.Emulated, selector: 'search-find', - template: ` - -
-
-
-
- -
-
-
- -
-
-
-
-
- -
- - - -
- - -
- - - - - -
-
- -
-
-
-
- - ` + templateUrl: 'search.component.html' }) export class SearchComponent { public sub: any; piwiksub: any; diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.html b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.html new file mode 100644 index 00000000..938ca3cd --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.html @@ -0,0 +1,56 @@ + +
+ + + + + + + + + + + + + + + + +
Search for: + + + + + + + + Yes
+ + + No
+ + 		+ + + + + + + + +
+
+ +
+ +
diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts index 9d3d4420..1e7ef861 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts @@ -8,64 +8,7 @@ import {Dates} from '../../utils/string-utils.class'; @Component({ selector: 'advanced-search-form', - template: ` -
- - - - - - - - - - - - - - - - -
Search for: - - - - - - - - Yes
- - - No
- - 		- - - - - - - - -
-
- -
- -
- - ` + templateUrl: 'advancedSearchForm.component.html' }) export class AdvancedSearchFormComponent { @Input() entityType; diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html new file mode 100644 index 00000000..ef3cddc7 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html @@ -0,0 +1,49 @@ + +
+
+
+
+
+ {{pageTitle}} +
+
+ Simple search + + + + +
+ +
+ + + +
+ + + +
+ + +
+ +
+
+ +
+ +
+
+ +
+
+
diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts index 6cc08ebc..e4ebe4de 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts @@ -14,57 +14,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; @Component({ selector: 'advanced-search-page', - template: ` -
-
-
-
-
- {{pageTitle}} -
-
- Simple search - - - - -
- -
- - - -
- - - -
- - -
- -
-
- -
- -
-
- -
-
-
- - ` + templateUrl: 'advancedSearchPage.component.html' }) export class AdvancedSearchPageComponent { @Input() pageTitle = ""; diff --git a/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.html b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.html new file mode 100644 index 00000000..3eb79bc6 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.html @@ -0,0 +1,50 @@ + + {{filter.title}} + + + + + + + diff --git a/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts index 931f0ad4..485e6d97 100644 --- a/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts @@ -12,61 +12,7 @@ import {SearchUtilsClass} from '../searchUtils/searchUtils.class'; import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'browse-statistic', - template: ` - - - {{filter.title}} - - - - - - - - - - ` + templateUrl: 'browseStatistic.component.html' }) export class BrowseStatisticComponent { diff --git a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.html b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.html new file mode 100644 index 00000000..fdf83db7 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.html @@ -0,0 +1,67 @@ + +
    +
  • +
    {{_formatTitle(filter.title,filter.values.length)}} +
    + +
    • +
diff --git a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts index 5e3d4ad6..a120673c 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts @@ -6,75 +6,7 @@ import {Open} from '../../utils/modal/open.component'; @Component({ selector: 'search-filter', - template: ` -
    -
  • -
    {{_formatTitle(filter.title,filter.values.length)}} -
    - -
    • -
- - ` + templateUrl: 'searchFilter.component.html' }) export class SearchFilterComponent { diff --git a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts index e292dfd4..0a6ba9a8 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts @@ -1,6 +1,7 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import {RouterHelper} from '../../utils/routerHelper.class'; +import {Router} from '@angular/router'; @Component({ selector: 'search-form', @@ -13,16 +14,12 @@ import {RouterHelper} from '../../utils/routerHelper.class'; Search - + - - ` }) @@ -36,7 +33,7 @@ export class SearchFormComponent { @Output() keywordChange = new EventEmitter(); - constructor () { + constructor (private _router:Router) { } ngOnInit() { @@ -49,4 +46,7 @@ export class SearchFormComponent { value: this.keyword }); } + goTo() { + this._router.navigate(['/search/find'], { queryParams: this.routerHelper.createQueryParam('keyword',this.keyword) }); + } } diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.html b/portal-2/src/app/searchPages/searchUtils/searchPage.component.html new file mode 100644 index 00000000..a992d6bf --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.html @@ -0,0 +1,107 @@ +
+
+
+
+ +
+
+
+ +
+
+ + More search options + + + +
+ Keywords: + + + {{filter.title}}: + + , + + + + + + Clear All + +
+
+ Try new Query +
+
+ +
+
+
+ +
+
+ + + +
+
+ +
Filter By:
+ +
+
+ +
+ + + +
+
+
+ + +
+ + +
+ + + + +
+ +
+ + + + + + + + + + +
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts index 7b09f7e8..f87025f2 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts @@ -19,118 +19,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; @Component({ selector: 'search-page', - template: ` -
-
-
-
- -
-
-
- -
-
- - More search options - - - -
- Keywords: - - - {{filter.title}}: - - , - - - - - - Clear All - -
-
- Try new Query -
-
- -
-
-
- -
-
- - - -
-
- -
Filter By:
- -
-
- -
- - - -
-
-
- - -
- - -
- - - - -
- -
- - - - - - - - - - -
-
- -
-
- -
-
- -
- -
-
-
-
-
- - - - ` + templateUrl: 'searchPage.component.html' + }) export class SearchPageComponent { @Input() pageTitle = ""; diff --git a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html new file mode 100644 index 00000000..e97596f2 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html @@ -0,0 +1,168 @@ + +
+
+
+ +
+
+
+ +
+
+
+ Keywords: {{searchUtils.keyword}} + + + {{filter.title}}: + {{value.name}} + , + + + + + + Clear All + +
+
+
+
+
+ + + + +
+
+ +
+
+ + + +
+
+ +
Filter By:
+ +
+
+ +
+
+ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} + + +
+

+ + + + + + +

+
Name + + + + + Type + + + + + Country + + + + + Institution + + + + + Compatibility + + + + +
+ + + + + [no title available] + + + + {{dataprovider.type}} + - + + {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} + - + + + {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} + + - + + {{dataprovider.compatibility}} + - +
+
+ + +
+
+ +
+ + +
+
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts index 10969242..2de14356 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts @@ -17,176 +17,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; @Component({ selector: 'search-page-table', - template: ` -
-
-
- -
-
-
- -
-
-
- Keywords: {{searchUtils.keyword}} - - - {{filter.title}}: - {{value.name}} - , - - - - - - Clear All - -
-
-
-
-
- - - - -
-
- -
-
- - - -
-
- -
Filter By:
- -
-
- -
-
- - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - -
-

- - - - - - -

-
Name - - - - - Type - - - - - Country - - - - - Institution - - - - - Compatibility - - - - -
- - - - - [no title available] - - - - {{dataprovider.type}} - - - - {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} - - - - - {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} - - - - - {{dataprovider.compatibility}} - - -
-
- - -
-
- -
- - -
-
-
- ` -}) + templateUrl:'searchPageTableView.component.html' + }) export class SearchPageTableViewComponent { @Input() pageTitle = ""; @Input() results; diff --git a/portal-2/src/app/searchPages/searchUtils/searchResult.component.html b/portal-2/src/app/searchPages/searchUtils/searchResult.component.html new file mode 100644 index 00000000..8a0ebbf8 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/searchResult.component.html @@ -0,0 +1,123 @@ + + diff --git a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts index 19107234..ac9e968a 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts @@ -5,130 +5,7 @@ import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'search-result', - template: ` - - ` + templateUrl:'searchResult.component.html' }) export class SearchResultComponent { diff --git a/portal-2/src/app/searchPages/searchUtils/tabResult.component.html b/portal-2/src/app/searchPages/searchUtils/tabResult.component.html new file mode 100644 index 00000000..c9f7fbc2 --- /dev/null +++ b/portal-2/src/app/searchPages/searchUtils/tabResult.component.html @@ -0,0 +1,121 @@ + diff --git a/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts b/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts index bcdd45b8..39576e56 100644 --- a/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts @@ -5,130 +5,8 @@ import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'tab-result', - template: ` - - ` -}) + templateUrl: 'tabResult.component.html' + }) export class TabResultComponent { @Input() results: SearchResult[]; diff --git a/portal-2/src/app/sharedComponents/bottom.component.html b/portal-2/src/app/sharedComponents/bottom.component.html new file mode 100644 index 00000000..8f1e61c3 --- /dev/null +++ b/portal-2/src/app/sharedComponents/bottom.component.html @@ -0,0 +1,79 @@ + + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ European Commission +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ OpenAIRE +
+
+
Creative UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+
OPENAIRE IS POWERED BY D-NET.
+
+
+ +
+
+
+
+
+
diff --git a/portal-2/src/app/sharedComponents/bottom.component.ts b/portal-2/src/app/sharedComponents/bottom.component.ts index 72eec52b..3ae13c03 100644 --- a/portal-2/src/app/sharedComponents/bottom.component.ts +++ b/portal-2/src/app/sharedComponents/bottom.component.ts @@ -3,89 +3,7 @@ import 'rxjs/Rx'; @Component({ selector: 'bottom', - template: ` - -
-
-
-
-
-
- - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- European Commission -
-
-
-
- -
-
-
-
-
-
-
-
-
-
- OpenAIRE -
-
-
Creative UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
-
OPENAIRE IS POWERED BY D-NET.
-
-
- -
-
-
-
-
-
- - - -` + templateUrl: 'bottom.component.html' }) export class BottomComponent { diff --git a/portal-2/src/app/sharedComponents/navigationBar.component.html b/portal-2/src/app/sharedComponents/navigationBar.component.html new file mode 100644 index 00000000..9732aa0e --- /dev/null +++ b/portal-2/src/app/sharedComponents/navigationBar.component.html @@ -0,0 +1,194 @@ +
+ + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
diff --git a/portal-2/src/app/sharedComponents/navigationBar.component.ts b/portal-2/src/app/sharedComponents/navigationBar.component.ts index 5c9fa208..d6633963 100644 --- a/portal-2/src/app/sharedComponents/navigationBar.component.ts +++ b/portal-2/src/app/sharedComponents/navigationBar.component.ts @@ -6,213 +6,7 @@ import {Session} from '../login/utils/helper.class'; @Component({ selector: 'navbar', - template: ` - - - -
- - -
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
- - - - - - - - -` + templateUrl: 'navigationBar.component.html' }) export class NavigationBarComponent { public isAuthorized: boolean = false; diff --git a/portal-2/src/app/utils/helper/helper.component.ts b/portal-2/src/app/utils/helper/helper.component.ts index d2dee100..66c3c70c 100644 --- a/portal-2/src/app/utils/helper/helper.component.ts +++ b/portal-2/src/app/utils/helper/helper.component.ts @@ -6,13 +6,10 @@ import {OpenaireProperties} from '../properties/openaireProperties'; @Component({ selector: 'helper', template: ` -
- - ` }) export class HelperComponent {