diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 8ceeea0a5..3c4516697 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -140,13 +140,21 @@ const appRoutes: Routes = [ } }, { - path: 'terms-of-service', + path: 'terms-and-conditions', loadChildren: () => import('./ui/sidebar/sidebar-footer/terms/terms.module').then(m => m.TermsModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.TERMS' } }, + { + path: 'cookies-policy', + loadChildren: () => import('./ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.module').then(m => m.CookiesPolicyModule), + data: { + breadcrumb: true, + title: 'GENERAL.TITLES.COOKIES-POLICY' + } + }, { path: 'home', loadChildren: () => import('./ui/dashboard/dashboard.module').then(m => m.DashboardModule), diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts index 5b777bc75..76cdbae4e 100644 --- a/dmp-frontend/src/app/app.component.ts +++ b/dmp-frontend/src/app/app.component.ts @@ -119,7 +119,7 @@ export class AppComponent implements OnInit { } }); - this.ccService.getConfig().content.href = this.configurationService.app + "terms-of-service"; + this.ccService.getConfig().content.href = this.configurationService.app + "cookies-policy"; this.ccService.getConfig().cookie.domain = this.configurationService.app; this.translate .get(['COOKIE.MESSAGE', 'COOKIE.DISMISS', 'COOKIE.DENY', 'COOKIE.LINK', 'COOKIE.POLICY']) diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 556d685a1..8523db47b 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -62,7 +62,7 @@ const cookieConfig: NgcCookieConsentConfig = { deny: "Refuse cookies", link: "Learn more", href: "",//environment.App + "terms-of-service", - policy: "Cookie Policy" + policy: "Cookies Policy" }, position: "bottom-right", theme: 'edgeless', diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.html new file mode 100644 index 000000000..c88a3108f --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.html @@ -0,0 +1,34 @@ +
+
+
+

{{ 'COOKIES-POLICY.TITLE' | translate}}

+
+
+
+
+

ARGOS ("us", "we", "our") uses cookies. By using ARGOS, you consent to the use of cookies.

+

Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on ARGOS, your choices regarding cookies and further information about cookies.

+

+
+

What are cookies

+

Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows ARGOS or a third-party to recognize you and make your next visit easier and ARGOS more useful to you.

+

Cookies can be "persistent" or "session" cookies.

+
+

How Argos uses cookies

+

When you use and access ARGOS, we may place cookies files in your web browser.

+

We use cookies for the following purposes: to enable certain functions of ARGOS and to provide analytics.

+

We use both session and persistent cookies on ARGOS and we use different types of cookies to run the Service:

+

1. Essential cookies. We may use essential cookies to authenticate users and prevent fraudulent use of user accounts.

+

2. Performance cookies. We use performance cookies to count visits and traffic sources, so we can measure and improve the performance of Argos, for example by analysing patterns of user behaviour in order to enhance user experience or by identifying areas of the website which may require maintenance. All information these cookies collect is anonymous.

+

 3. Third-party cookies. Apart from our own cookies, we may use cookies from sources that Argos and OpenAIRE (Argos provider) makes use of for Argos to properly function and validate input and output. Third-party cookies are also used to report usage statistics of Argos.

+

+
+

What are your choices regarding cookies

+

If you'd like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.

+

Please note, however, that if you delete cookies or refuse to accept them, you might not be able to use all of the features we offer, you may not be able to store your preferences, and some of our pages might not display properly.

+

Please contact OpenAIRE’s Data Protection Officer for further information on the cookies that we use and their purposes: dpo@openaire.eu 

+

+

Last updated: 16/06/2020

+
+
+
\ No newline at end of file diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss new file mode 100644 index 000000000..c2738b53a --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.cookies-policy-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.ts new file mode 100644 index 000000000..800f08083 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-cookies-policy', + templateUrl: './cookies-policy.component.html', + styleUrls: ['./cookies-policy.component.scss'] +}) +export class CookiesPolicyComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.module.ts new file mode 100644 index 000000000..4768b08c0 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { CookiesPolicyComponent } from '@app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component'; +import { CookiesPolicyRoutingModule } from '@app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.routing'; +import { CommonUiModule } from '@common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + CookiesPolicyRoutingModule + ], + declarations: [ + CookiesPolicyComponent + ], +}) +export class CookiesPolicyModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.routing.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.routing.ts new file mode 100644 index 000000000..27f7f9360 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { CookiesPolicyComponent } from './cookies-policy.component'; + +const routes: Routes = [ + { + path: '', + component: CookiesPolicyComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class CookiesPolicyRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html index 5c35b14c0..d9c068baa 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html @@ -33,7 +33,7 @@ {{'FOOTER.CONTACT-SUPPORT' | translate}}

- + {{'FOOTER.TERMS-OF-SERVICE' | translate}}
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html index e469ae59b..e8f39d395 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html @@ -6,7 +6,29 @@
-

{{ 'TERMS-OF-SERVICE.MAIN-CONTENT' | translate}}

+

The OpenDMP service was developed to provide a more flexible, collaborative environment with machine actionable solutions in writing, sharing and publishing Data Management Plans (DMPs). It is a product of cooperation between OpenAIRE AMKE and EUDAT CDI and is offered both as a software “OpenDMP '' and as an online service under the name “ARGOS”.

+

+
    +
  1. OpenDMP software is offered under the Free Open Source Software license  Apache 2.0, for further development and use by institutions and interested parties.
    2. +
  2. ARGOS service is offered by OpenAIRE as part of its mission to support Open Science in the European Research Area, focusing on information linking and contextualisation that enriches its Research Graph. Use of ARGOS denotes agreement with the following terms: +
      +
    1. ARGOS is a software interface and a database with no storage capacity to store or preserve research data. The DMPs created are hosted in the OpenAIRE production environment for the sole purpose of exposing the DMP records once finalised (“published”). If assigned a DOI, the DMP records are linked to and preserved in Zenodo, the OpenAIRE’s repository service. The ARGOS service is made available for use free-of-charge for research, educational and informational purposes.
      2. +
    2. Login to ARGOS is possible through a variety of external providers, among which Google, Facebook, Twitter, B2Access and OpenAIRE Login, that share information of their user profiles with ARGOS, according to the rights that have been granted to the given provider by the user. External email addresses that are used in invitations for collaborations are held in ARGOS database that stores information about only the name, surname and email address of the DMP creator and collaborator.  Personal data is collected via the login option and via email invitations sent to external DMP contributors. This personal information as well as the activity of ARGOS users is used only for deriving usage metrics and assessing the service quality. They are stored in ARGOS database for as long as the account is active and they are accessible only from people in the team in charge of quality and risk assessment. They will not be used for other purposes other than the ones stated in this document and they can be deleted at any time should the user claim a relevant request. The aforementioned processes are also facilitated by the use of cookies (see below the “Cookie policy”).
      3. +
    3. Data concerning DMP information will be used by OpenAIRE for research and development purposes, such as identifying DMP models, and for ensuring compliance with policy requirements and monitoring of DMPs uptake linked to OpenAIRE’s Monitoring Dashboards and the Open Science Observatory.
      4. +
    4. The DMP Manager, i.e. the person who creates and manages a DMP, and/ or the contributor, i.e. the person who is invited to collaborate on a DMP, shall ensure that content is accurate and presented in a way that adheres to these Terms of Service and applicable laws, including, but not limited to, privacy, data protection and intellectual property rights.
      5. +
    5. ARGOS service is provided by OpenAIRE “as is”. Although OpenAIRE and its partners take measures for the availability, dependability, and accuracy of the service, access to ARGOS, utilisation of its features and preservation of the data deposited or produced by the service are not guaranteed. OpenAIRE cannot be held responsible for any data loss regarding DMPs, ethical or financial damage or any other direct or indirect impact that any failure of ARGOS service may have on its users.  
      6. +
    6. ARGOS users are exclusively responsible for their use of content, and shall hold OpenAIRE free and harmless in connection with their download and/or use.
      7. +
    7. OpenAIRE may not be held responsible for the content provided or statements made in Data Management Plans created and managed by its users.
      8. +
    8. All content is provided “as-is”. Users of content (“Users”) shall respect applicable license conditions. Download and use of content from ARGOS does not transfer any intellectual property rights in the content to the User.
      9. +
    9. In the case any content is reported as violating third party rights or other legal provisions, ARGOS reserves the right to remove the content from the service until the dispute is legally settled. Any such incidents should be reported at noticeandtakedown@openaire.eu 
      10. +
    10. ARGOS users are held responsible for the data and information they provide in the service. Users may not add information, data or any other type of artifact that may be malicious, intentionally erroneous and potentially harmful for other ARGOS users, IPR owners and/or the general public.
      11. +
    11. In case a user of ARGOS identifies a potential infringement of copyright, harmful or malicious operation, function, code, information or data, shall inform OpenAIRE providing sufficient evidence for the identification of the case and the information and/or data challenged.
      12. +
    12. OpenAIRE reserves the right, without notice, at its sole discretion and without liability, (i) to alter or delete inappropriate content, and (ii) to restrict or remove User access where it considers that use of ARGOS interferes with its operations or violates these Terms of Service or applicable laws.
      13. +
    13. These Terms of Service are subject to change by OpenAIRE at any time and without notice, other than through posting the updated Terms of Service on the OpenAIRE website and indicating the version and date of last update.
      14. +
    +
    3. +
+

For any questions or comments you may have about the current Terms of Service, please contact us: argos@openaire.eu 

- + \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/user-guide/user-guide.routing.ts b/dmp-frontend/src/app/ui/user-guide/user-guide.routing.ts index b2a0a48d8..40b7bcfd8 100644 --- a/dmp-frontend/src/app/ui/user-guide/user-guide.routing.ts +++ b/dmp-frontend/src/app/ui/user-guide/user-guide.routing.ts @@ -1,18 +1,17 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { UserGuideContentComponent } from './user-guide-content/user-guide-content.component'; -import { UserGuideDialogComponent } from './dialog/user-guide-dialog.component'; const routes: Routes = [ { path: '', - component: UserGuideDialogComponent, + component: UserGuideContentComponent, }, ]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] }) export class UserGuideRoutingModule { } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index e73477672..0765bdde4 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -89,6 +89,7 @@ "ABOUT": "About", "PRIVACY": "Privacy Policy", "TERMS": "Terms Of Service", + "COOKIES-POLICY": "Cookies Policy", "PLANS": "My DMPs", "EXPLORE-PLANS": "Published DMPs", "QUICK-WIZARD": "New DMP (Wizard)", @@ -142,7 +143,7 @@ "DISMISS": "Accept", "DENY": "Refuse cookies", "LINK": "Learn more", - "POLICY": "Cookie Policy" + "POLICY": "Cookies Policy" }, "EMAIL-CONFIRMATION": { "EXPIRED-EMAIL": "Mail invitation expired", @@ -1041,6 +1042,7 @@ "GUIDE": "User Guide", "GLOSSARY": "Glossary", "TERMS-OF-SERVICE": "Terms Of Service", + "COOKIES-POLICY": "Cookies Policy", "PRIVACY-POLICY": "Privacy Policy" }, "GLOSSARY": { @@ -1063,9 +1065,12 @@ "MAIN-CONTENT": "" }, "TERMS-OF-SERVICE": { - "TITLE": "-Terms Of Service-", + "TITLE": "Terms of Service", "MAIN-CONTENT": "" }, + "COOKIES-POLICY": { + "TITLE": "Cookies Policy" + }, "CONTACT": { "SUPPORT": { "TITLE": "Contact Support", diff --git a/dmp-frontend/src/assets/splash/about/faqs.html b/dmp-frontend/src/assets/splash/about/faqs.html index f6370ce90..6b5027a8e 100644 --- a/dmp-frontend/src/assets/splash/about/faqs.html +++ b/dmp-frontend/src/assets/splash/about/faqs.html @@ -9,17 +9,14 @@ - + - + @@ -28,13 +25,11 @@ + +
+
+
+
+

Plan and follow your data

+
-

Argos

 

experience

+

Create

 
machine actionable DMPs.
-
-
-

1

 

Select Templates

-
-
-

2

 

Fill the information

-
-
-

3

 

Share DMP

-
+
+

Configure

 
to best fit your dicsipline.
+
+
+

Link

 
to EOSC components out of the box.
+
+
+

Share

 
easily in your repository.
-
- +
+

Bring your Data Management Plans closer to where data are generated, + analysed and stored.

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

Start your

+
+

Argos

 

experience

+
+
+
+

1

 

Select Templates

+
+
+

2

 

Fill the information

+
+
+

3

 

Share DMP

+
+
+
+
+ +
-
- -
-
-
Features
-
-
-
-
-
-
-
Produce DMP outputs
-
-
-
- Close the data management planning lifecycle by publishing your DMPs in a FAIR manner. Assign licenses, PIDs and publish DMPs in a repository of your choice. -
-
+
+
+
+ +
+
+
Features
+
+
+
+
-
-
- -
-
-
Update DMPs
-
-
-
- Treat DMPs as living documents. Secure their provenance and continue work in new versions (new DOIs assigned). -
+
+
Produce DMP outputs
+
+
+
+ Close the data management planning lifecycle by publishing your DMPs in a FAIR manner. + Assign licenses, PIDs and publish DMPs in a repository of your choice.
-
-
-
- -
-
-
Re-use datasets & templates
-
-
-
- Identify datasets to be re-used in your DMP. Copy or clone dataset descriptions to other DMPs. -
-
+
+
+
-
-
- -
-
-
Import and Export DMPs
-
-
-
- Import a .json file of your DMP and continue work in ARGOS. Export DMPs in machine readable (.xml) and machine-actionable (.json) formats. -
-
+
+
Update DMPs
-
-
-
-
- -
-
-
Customise dataset descriptions
-
-
-
- Differentiate DMPs from dataset descriptions. Describe your datasets with more than one template and tailor its content to your specific needs. -
-
-
-
-
- -
-
-
Connect with OpenAIRE & EOSC
-
-
-
- Use OpenAIRE and EOSC underlying services, sources and semantics to ease completion of DMPs and trace the quality of your research. -
+
+
+ Treat DMPs as living documents. Secure their provenance and continue work in new versions + (new DOIs assigned).
-
- -
-
-
-
-
- Who Benefits +
+
+
+
-
-
+
+
Re-use datasets & templates
+
+
+
+ Identify datasets to be re-used in your DMP. Copy or clone dataset descriptions to other + DMPs. +
+
+
+
+
+ +
+
+
Import and Export DMPs
+
+
+
+ Import a .json file of your DMP and continue work in ARGOS. Export DMPs in machine readable + (.xml) and machine-actionable (.json) formats. +
+
+
+
+
+
+
+ +
+
+
Customise dataset descriptions
+
+
+
+ Differentiate DMPs from dataset descriptions. Describe your datasets with more than one + template and tailor its content to your specific needs. +
+
+
+
+
+ +
+
+
Connect with OpenAIRE & EOSC
+
+
+
+ Use OpenAIRE and EOSC underlying services, sources and semantics to ease completion of DMPs + and trace the quality of your research. +
+
+
+
+
+
+ +
+
+
+
+
+ Who Benefits +
+
+
+
-
-
-
-
-
-
-
-
- Funders -
-
- Include DMPs in data management policies. -
-
-
- - Add, update and modify DMP templates -
-
- - Enrich your organisations’ research graph -
-
- - Link argos to your  - Monitoring Dashboard -
-
-
-
-
-
- Researchers -
-
- Become Research Data Management literate and lead Open Science cultural change/ practices. -
-
-
- - Comply with DMP requirements -
-
- - Learn and apply best practices for DMPs -
-
- - Co-edit DMPs and manage workload -
-
-
-
-
-
- Institutions -
-
- Support Open and FAIR Data Management Planning. -
-
-
- - Add, update and modify DMP templates -
-
- - Connect your organisations’ services -
-
- - Ensure research integrity and excellence -
- -
- -
-
-
-
- +
+
+
+
+ Funders +
+
+ Include DMPs in data management policies. +
+
+
+ + Add, update and modify DMP templates +
+
+ + Enrich your organisations’ research graph +
+
+ + Link argos to your  + Monitoring + Dashboard +
-
-
- - co-branding +
+
+
+
+ Researchers
-
- - ARGOS is based on OpenDMP, an open source software that can be deployed by third parties. ARGOS development team welcomes contributions by the international community to strengthen functionalities and further align with global fora. - +
+ Become Research Data Management literate and lead Open + Science cultural change/ practices.
-
-
+
+
+ + Comply with DMP requirements +
+
+ + Learn and apply best practices for DMPs +
+
+ + Co-edit DMPs and manage workload +
+
+
+
+
+
+ Institutions +
+
+ Support Open and FAIR Data Management Planning. +
+
+
+ + Add, update and modify DMP templates +
+
+ + Connect your organisations’ services +
+
+ + Ensure research integrity and excellence +
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+ + co-branding +
+
+ + ARGOS is based on OpenDMP, an open source software that can be deployed by third parties. + ARGOS development team welcomes contributions by the international community to strengthen + functionalities and further align with global fora. + +
+
+
+ -
+
- -
- -
-
-
-
- -
-
-
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under grant agreement No. 731011.
-
-
+
+
+ + +
+
+
+
+ +
+
+
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 + Research and Innovation programme under Grant Agreement No. 777541.
+
+
+ -
-
-
-
- - - - -
-
- -
-
-
- Terms and conditions - Cookies policy -
-
-
-
-
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+
-
- - - - - - - - +
+
+ + + + +
+
+ +
+
+
+ Terms and conditions + Cookies policy +
+
+
+
+
Unless otherwise indicated, all materials created by OpenAIRE are licenced under +
  +
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/resources/co-branding.html b/dmp-frontend/src/assets/splash/resources/co-branding.html index ceba58a30..a8b7e9c69 100644 --- a/dmp-frontend/src/assets/splash/resources/co-branding.html +++ b/dmp-frontend/src/assets/splash/resources/co-branding.html @@ -9,17 +9,14 @@ - + - + @@ -27,9 +24,7 @@