Merge pull request #808 from datacite/footer-links

Conform to new homepage standard footer.

app/components/application-footer.js

@@ -6,98 +6,94 @@ import { inject as service } from '@ember/service';
 const data = {
   about_links: [
     {
-      name: 'What we do',
-      url: ENV.LINKS.WHAT_WE_DO_URL,
+      name: ENV.FOOTER_LINKS.WHAT_WE_DO.NAME,
+      url: ENV.FOOTER_LINKS.WHAT_WE_DO.URL
     },
     {
-      name: 'Governance',
-      url: ENV.LINKS.GOVERNANCE_URL,
+      name: ENV.FOOTER_LINKS.GOVERNANCE.NAME,
+      url: ENV.FOOTER_LINKS.GOVERNANCE.URL
     },
     {
-      name: 'Members',
-      url: ENV.LINKS.MEMBERS_URL,
+      name: ENV.FOOTER_LINKS.STEERING_AND_WORKING_GROUPS.NAME,
+      url: ENV.FOOTER_LINKS.STEERING_AND_WORKING_GROUPS.URL
     },
     {
-      name: 'Steering groups',
-      url: ENV.LINKS.STEERING_URL,
+      name: ENV.FOOTER_LINKS.TEAM.NAME,
+      url: ENV.FOOTER_LINKS.TEAM.URL
     },
     {
-      name: 'Staff',
-      url: ENV.LINKS.STAFF,
+      name: ENV.FOOTER_LINKS.JOB_OPPORTUNITIES.NAME,
+      url: ENV.FOOTER_LINKS.JOB_OPPORTUNITIES.URL
     },
     {
-      name: 'Job opportunities',
-      url: ENV.LINKS.JOB_OPPORTUNITIES_URL,
-    },
+      name: ENV.FOOTER_LINKS.PROJECTS.NAME,
+      url: ENV.FOOTER_LINKS.PROJECTS.URL
+    }
   ],
-  services_links: [
+  work_with_us_links: [
     {
-      name: 'Create DOIs with Fabrica',
-      url: ENV.FABRICA_URL,
+      name: ENV.FOOTER_LINKS.CREATE_DOIS.NAME,
+      url: ENV.FOOTER_LINKS.CREATE_DOIS.URL
     },
     {
-      name: 'Discover metadata with Commons',
-      url: ENV.LINKS.COMMONS_URL,
+      name: ENV.FOOTER_LINKS.INTEGRATE_WORKFLOWS.NAME,
+      url: ENV.FOOTER_LINKS.INTEGRATE_WORKFLOWS.URL
     },
     {
-      name: 'Integrate with APIs',
-      url: ENV.LINKS.INTEGRATOR_URL,
-    },
-    {
-      name: 'Partner Services',
-      url: ENV.LINKS.PARTNER_SERVICES_URL,
-    }
-  ],
-  resources_links: [
-    {
-      name: 'Metadata schema',
-      url: ENV.LINKS.METADATA_SCHEMA_URL,
+      name: ENV.FOOTER_LINKS.ENABLE_DISCOVERY.NAME,
+      url: ENV.FOOTER_LINKS.ENABLE_DISCOVERY.URL
     },
     {
-      name: 'Support',
-      url: ENV.LINKS.SUPPORT_URL,
+      name: ENV.FOOTER_LINKS.PROMOTE_REUSE.NAME,
+      url: ENV.FOOTER_LINKS.PROMOTE_REUSE.URL
     },
     {
-      name: 'Fee Model',
-      url: ENV.LINKS.FEE_MODEL_URL,
-    },
+      name: ENV.FOOTER_LINKS.STRATEGIC_INITIATIVES.NAME,
+      url: ENV.FOOTER_LINKS.STRATEGIC_INITIATIVES.URL
+    }
   ],
-  community_links: [
+  membership_links: [
     {
-      name: 'Members',
-      url: ENV.LINKS.MEMBERS_URL,
+      name: ENV.FOOTER_LINKS.BECOME_A_MEMBER.NAME,
+      url: ENV.FOOTER_LINKS.BECOME_A_MEMBER.URL
     },
     {
-      name: 'Partners',
-      url: ENV.LINKS.PARTNERS_URL,
+      name: ENV.FOOTER_LINKS.DATACITE_FEE_MODEL.NAME,
+      url: ENV.FOOTER_LINKS.DATACITE_FEE_MODEL.URL
     },
     {
-      name: 'Steering groups',
-      url: ENV.LINKS.STEERING_URL,
+      name: ENV.FOOTER_LINKS.MEMBERSHIP_ENQUIRY.NAME,
+      url: ENV.FOOTER_LINKS.MEMBERSHIP_ENQUIRY.URL
     },
     {
-      name: 'Service providers',
-      url: ENV.LINKS.SERVICE_PROVIDERS_URL,
-    },
+      name: ENV.FOOTER_LINKS.DATACITE_MEMBERS.NAME,
+      url: ENV.FOOTER_LINKS.DATACITE_MEMBERS.URL
+    }
+  ],
+  resources_links: [
     {
-      name: 'Roadmap',
-      url: ENV.LINKS.ROADMAP_URL,
+      name: ENV.FOOTER_LINKS.METADATA_SCHEMA.NAME,
+      url: ENV.FOOTER_LINKS.METADATA_SCHEMA.URL
     },
+    {
+      name: ENV.FOOTER_LINKS.DATACITE_MEMBERS.NAME,
+      url: ENV.FOOTER_LINKS.DATACITE_MEMBERS.URL
+    }
   ],
   contact_links: [
     {
-      name: 'Imprint',
-      url: ENV.LINKS.IMPRINT_URL,
+      name: ENV.FOOTER_LINKS.PRIVACY_POLICY.NAME,
+      url: ENV.FOOTER_LINKS.PRIVACY_POLICY.URL
     },
     {
-      name: 'Terms and conditions',
-      url: ENV.LINKS.TERMS_AND_CONDITIONS_URL,
+      name: ENV.FOOTER_LINKS.TERMS_AND_CONDITIONS.NAME,
+      url: ENV.FOOTER_LINKS.TERMS_AND_CONDITIONS.URL
     },
     {
-      name: 'Privacy policy',
-      url: ENV.LINKS.PRIVACY_POLICY_URL,
-    },
-  ],
+      name: ENV.FOOTER_LINKS.IMPRINT.NAME,
+      url: ENV.FOOTER_LINKS.IMPRINT.URL
+    }
+  ]
 };
 
 export default Component.extend({

app/templates/components/application-footer.hbs

@@ -1,39 +1,42 @@
 <footer class='row footer'>
   <div class="container-fluid">
     <div class='col-md-3 col-sm-4 footer-column'>
-      <h4>{{t "footer.about"}}</h4>
+      <h4>About Us</h4>
       <ListLinks @links={{data.about_links}} />
     </div>
     <div class='col-md-3 col-sm-4 footer-column'>
-      <h4>Services</h4>
-      <ListLinks @links={{data.services_links}} />
+      <h4>Work With Us</h4>
+      <ListLinks @links={{data.work_with_us_links}} />
     </div>
     <div class='col-md-3 col-sm-4 footer-column'>
+      <h4>Membership</h4>
+      <ListLinks @links={{data.membership_links}} />
       <h4>Resources</h4>
       <ListLinks @links={{data.resources_links}} />
-      <h4>Community</h4>
-      <ListLinks @links={{data.community_links}} />
     </div>
     <div class='col-md-3 footer-column'>
       <h4 class="share">Contact us</h4>
-      <a href='mailto:[email protected]' class="share">
+      <a href={{get (links) 'MAIL_URL' }} class="share">
         <i class="fas fa-envelope"></i>
       </a>
       <a href={{get (links) 'BLOG_URL'}} class="share">
         <i class="fas fa-blog"></i>
       </a>
-      <a href={{get (links) 'TWITTER_URL'}} class="share">
-        <i class="fab fa-twitter"></i>
-      </a>
       <a href={{get (links) 'GITHUB_URL'}} class="share">
         <i class="fab fa-github"></i>
       </a>
-      <a href={{get (links) 'YOUTUBE_URL'}} class="share">
-        <i class="fab fa-youtube"></i>
+      <a href={{get (links) 'TWITTER_URL'}} class="share">
+        <svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 512 512" style="fill: #a3acb2;position: relative;bottom: -3;"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"></path></svg>
+      </a>
+      <a href={{get (links) 'MASTODON_URL'}} class="share">
+        <svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 448 512" style="fill: #a3acb2;position: relative;bottom: -3;"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z"/></svg>
       </a>
       <a href={{get (links) 'LINKEDIN_URL'}} class="share">
         <i class="fab fa-linkedin"></i>
       </a>
+      <a href={{get (links) 'YOUTUBE_URL'}} class="share">
+        <i class="fab fa-youtube"></i>
+      </a>
       <ListLinks @links={{data.contact_links}} @class="share" />
       <FooterStatus />
     </div>

config/environment.js

@@ -4,6 +4,49 @@
 module.exports = function (environment) {
   const pkg = require('../package.json');
 
+  const links = {
+    MAIL_URL: 'mailto:[email protected]',
+    BLOG_URL: 'https://blog.datacite.org',
+    GITHUB_URL: 'https://github.com/datacite/datacite',
+    TWITTER_URL: 'https://twitter.com/datacite',
+    MASTODON_URL: 'https://openbiblio.social/@datacite',
+    LINKEDIN_URL: 'https://www.linkedin.com/company/datacite',
+    YOUTUBE_URL: 'https://www.youtube.com/channel/UCVsSDZhIN_WbnD_v5o9eB_A',
+    CREATE_A_FABRICA_ACCOUNT_URL: 'https://support.datacite.org/docs/create-a-fabrica-account',      
+    FEE_MODEL_URL: 'https://datacite.org/fee-model',
+    PRIVACY_POLICY_URL: 'https://datacite.org/privacy-policy',
+    STATUS_URL: 'https://status.datacite.org',
+    SUPPORT_URL: 'https://support.datacite.org',
+    API_DOC_URL: 'https://api.datacite.org',
+    MDS_DOC_URL: 'https://mds.datacite.org',
+    OAI_DOC_URL: 'https://oai.datacite.org',
+    GRAPHQL_TOOL_URL: 'https://api.datacite.org/graphql',
+    FABRICA_DOC_URL: 'https://support.datacite.org/docs/doi-fabrica'
+  };
+
+  const footer_links = {
+    WHAT_WE_DO: { NAME: 'What we do', URL: 'https://datacite.org/what-we-do/' },
+    GOVERNANCE: { NAME: 'Governance', URL: 'https://datacite.org/governance/' },
+    STEERING_AND_WORKING_GROUPS: { NAME: 'Steering and Working Groups', URL: 'https://datacite.org/#' },
+    TEAM: { NAME: 'Team', URL: 'https://datacite.org/team/' },
+    JOB_OPPORTUNITIES: { NAME: 'Job Opportunities', URL: 'https://datacite.org/job-opportunities/' },
+    PROJECTS: { NAME: 'Projects', URL: 'https://datacite.org/projects/' },
+    CREATE_DOIS: { NAME: 'Create DOIs', URL: 'https://datacite.org/create-dois/' },
+    INTEGRATE_WORKFLOWS: { NAME: 'Integrate Workflows', URL: 'https://datacite.org/integrate-workflows/' },
+    ENABLE_DISCOVERY: { NAME: 'Enable Discovery', URL: 'https://datacite.org/enable-discovery/' },
+    PROMOTE_REUSE: { NAME: 'Promote Reuse', URL: 'https://datacite.org/promote-reuse/' },
+    STRATEGIC_INITIATIVES: { NAME: 'Strategic Initiatives', URL: 'https://datacite.org/#' },
+    BECOME_A_MEMBER: { NAME: 'Become a Member', URL: 'https://datacite.org/become-a-member/' },
+    DATACITE_FEE_MODEL: { NAME: 'DataCite Fee Model', URL: links.FEE_MODEL },
+    MEMBERSHIP_ENQUIRY: { NAME: 'Membership Enquiry', URL: 'https://datacite.org/membership-enquiry/' },
+    DATACITE_MEMBERS: { NAME: 'DataCite Members', URL: 'https://datacite.org/members/' },
+    METADATA_SCHEMA: { NAME: 'Metadata Schema', URL: 'https://schema.datacite.org/' },
+    SUPPORT: { NAME: 'Support', URL: links.SUPPORT_URL },
+    PRIVACY_POLICY: { NAME: 'Privacy Policy', URL: links.PRIVACY_POLICY_URL },
+    TERMS_AND_CONDITIONS: { NAME: 'Terms and Conditions', URL: 'https://datacite.org/terms-and-conditions/' },
+    IMPRINT: { NAME: 'Imprint', URL: 'https://datacite.org/imprint/' }
+  };
+
   // Determines the deployment target for fabrica i.e. the different versions doi.datacite.org/doi.test.datacite.org/doi.stage.datacite.org/
   let fabricaDeployTarget = process.env.FABRICA_DEPLOY_TARGET;
 
@@ -69,10 +112,9 @@ module.exports = function (environment) {
         /^localhost:\d+$/
       ]
     },
-
     SITE_TITLE: process.env.SITE_TITLE || 'DataCite Fabrica Stage',
     NAVMENU_TITLE: process.env.NAVMENU_TITLE,
-    SEARCH_URL: process.env.SEARCH_URL || 'https://search.stage.datacite.org',
+    SEARCH_URL: process.env.SEARCH_URL || 'https://commons.stage.datacite.org',
     ORCID_URL: process.env.ORCID_URL || 'https://orcid.org',
     API_URL: process.env.API_URL || 'https://api.stage.datacite.org',
     FABRICA_URL: process.env.FABRICA_URL || 'https://doi.stage.datacite.org',
@@ -83,38 +125,8 @@ module.exports = function (environment) {
     CDN_URL: process.env.CDN_URL || 'https://assets.stage.datacite.org',
     HOME_URL: process.env.HOME_URL || 'https://www.stage.datacite.org',
     // informational links - mostly to the home page, collected here for easier maintenance.
-    LINKS: {
-      BLOG_URL: 'https://blog.datacite.org',
-      COMMONS_URL: 'https://commons.datacite.org',
-      CREATE_A_FABRICA_ACCOUNT_URL: 'https://support.datacite.org/docs/create-a-fabrica-account',
-      FEE_MODEL_URL: 'https://datacite.org/feemodel.html',
-      GITHUB_URL: 'https://github.com/datacite/datacite',
-      GOVERNANCE_URL: 'https://datacite.org/governance.html',
-      IMPRINT_URL: 'https://www.stage.datacite.org/imprint.html',
-      INTEGRATOR_URL: 'https://datacite.org/integratorapis.html',
-      JOB_OPPORTUNITIES_URL: 'https://datacite.org/jobopportunities.html',
-      LINKEDIN_URL: 'https://www.linkedin.com/company/datacite',
-      MEMBERS_URL: 'https://datacite.org/members.html',
-      METADATA_SCHEMA_URL: 'https://schema.datacite.org',
-      PARTNERS_URL: 'https://datacite.org/partners.html',
-      PARTNER_SERVICES_URL: 'https://datacite.org/partnerservices.html',
-      PRIVACY_POLICY_URL: 'https://datacite.org/privacy.html',
-      ROADMAP_URL: 'https://datacite.org/roadmap.html',
-      SERVICE_PROVIDERS_URL: 'https://datacite.org/service-providers.html',
-      STAFF: 'https://datacite.org/staff.html',
-      STATUS_URL: 'https://status.datacite.org',
-      STEERING_URL: 'https://datacite.org/steering.html',
-      SUPPORT_URL: 'https://support.datacite.org',
-      TERMS_AND_CONDITIONS_URL: 'https://datacite.org/terms.html',
-      TWITTER_URL: 'https://twitter.com/datacite',
-      WHAT_WE_DO_URL: 'https://datacite.org/value.html',
-      YOUTUBE_URL: 'https://www.youtube.com/channel/UCVsSDZhIN_WbnD_v5o9eB_A',
-      API_DOC_URL: 'https://api.datacite.org',
-      MDS_DOC_URL: 'https://mds.datacite.org',
-      OAI_DOC_URL: 'https://oai.datacite.org',
-      GRAPHQL_TOOL_URL: 'https://api.datacite.org/graphql',
-      FABRICA_DOC_URL: 'https://support.datacite.org/docs/doi-fabrica',
-    },
+    FOOTER_LINKS: footer_links,
+    LINKS: links,
     JWT_PUBLIC_KEY:
       process.env.JWT_PUBLIC_KEY ||
       '-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA22lpr1ntJQYKa+aCRjre\nPKTze/00S0SCdsWKhvk3honfjdebuxc54YdvfqKQk/1jLOPJj++vqIGwytKRI9uC\n1BmMRLrOluACiOgTc5DpzMm68lZss5D5g7tzjxB7NlFiKiYav1BtVDfvVxwuNqkY\njyNupf1Gjqp2/8wbsZ6SGIkzgovgjcHI5S8HZ7DE7rcrStISNJqTvpuMUXp++eie\nPkTgcrdZScKjO6VYu9epuhoyD2mbZdjAUbxYyjQ3vgftseLo4hXFEXpfIQzwxOLS\njmg1S/qxOzZHOMrp31pS1ricMtd4frvXztHPfh5XuyiOEozR0An9OIIwzKQsn+0q\np5QKfN+lHJflYGZ1TD8QruinWf8a5uWYd3q9c1V8RYgwgmfoxgHX5TmMbcQsBTuB\nyIy3io3rBiRnJEAgSu4PxNuQqVqqsaJ4cCmQrATLViZmXhZcbHJyWl3GJnZMpv8P\nor6m239QGZdoy5ijoOdVLQowtnsr+SWWrcYKF4J66223xjGBse7o3Q+gJUkyQKtB\nLifDld9XMTpgvEsZtZKEQ9S5gAWkiAzcjSMV0J4XMOzvHAalyNTucLc6ljG8HnjO\n34SrkvkkTlUwNsJOygRNJQujfQaStvb3MTagSqPteGhy9qSitSJPrDmN/W79stIe\nSvqHoJznDJsFfKUcypEG4l0CAwEAAQ==\n-----END PUBLIC KEY-----\n',

cypress/e2e/client_admin/info.test.ts

@@ -163,7 +163,7 @@ describe('ACCEPTANCE: CLIENT_ADMIN | INFO', () => {
       cy.get('#certificate').should('be.visible');
       cy.get('.alert.opt-in').contains(/The contacts entered may receive notifications/i)
         .within(() => {
-          cy.get('a[href*="privacy.html"]').should('be.visible');
+          cy.get('a[href*="privacy-policy"]').should('be.visible');
         }
       );
       cy.get('button#update-repository').should('be.visible');

cypress/e2e/consortium_admin/contact.test.ts

@@ -155,7 +155,7 @@ describe('ACCEPTANCE: CONSORTIUM_ADMIN | CONTACTS', () => {
 
       cy.get('.alert-warning').contains(/The contact entered may receive notifications/i)
         .within(() => {
-          cy.get('a[href*="privacy.html"]').should('be.visible');
+          cy.get('a[href*="privacy-policy"]').should('be.visible');
         }
       );
 

cypress/e2e/consortium_admin/organizations.test.ts

@@ -106,7 +106,7 @@ describe('ACCEPTANCE: CONSORTIUM_ADMIN | CONSORTIUM ORGANIZATIONS', () => {
         cy.get('.alert').contains(/The contacts entered may receive notifications about administration,/i);
         cy.get('.alert').contains(/The contacts entered may receive notifications/i)
           .within(() => {
-            cy.get('a[href*="privacy.html"]').should('be.visible');
+            cy.get('a[href*="privacy-policy"]').should('be.visible');
           }
         );
         cy.get('button#add-organization').should('be.visible');

cypress/e2e/organization_admin/contact.test.ts

@@ -156,7 +156,7 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | CONTACTS', () => {
 
       cy.get('.alert-warning').contains(/The contact entered may receive notifications/i)
         .within(() => {
-          cy.get('a[href*="privacy.html"]').should('be.visible');
+          cy.get('a[href*="privacy-policy"]').should('be.visible');
         }
       );
 

cypress/e2e/organization_admin/info.test.ts

@@ -164,7 +164,7 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | INFO', () => {
         cy.get('#secondary-technical-contact').should('be.visible');
         cy.get('.alert-warning').contains(/The contacts entered may receive notifications/i)
           .within(() => {
-            cy.get('a[href*="privacy.html"]').should('be.visible');
+            cy.get('a[href*="privacy-policy"]').should('be.visible');
           }
         );
         cy.get('button#update-provider').should('be.visible');

cypress/e2e/organization_admin/repositories.test.ts

@@ -189,7 +189,7 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | REPOSITORIES', () => {
 
       cy.get('.alert').contains(/The contacts entered may receive notifications/i)
         .within(() => {
-          cy.get('a[href*="privacy.html"]').should('be.visible');
+          cy.get('a[href*="privacy-policy"]').should('be.visible');
         }
       );
       cy.get('.alert').contains(/To save this repository, first resolve the errors with these fields:/i)

cypress/e2e/staff_admin/contact.test.ts

@@ -161,7 +161,7 @@ describe('ACCEPTANCE: STAFF_ADMIN | CONTACTS', () => {
 
       cy.get('.alert-warning').contains(/The contact entered may receive notifications/i)
         .within(() => {
-          cy.get('a[href*="privacy.html"]').should('be.visible');
+          cy.get('a[href*="privacy-policy"]').should('be.visible');
         }
       );
 

translations/en-us.yaml

@@ -3,7 +3,3 @@ general:
 
 user:
   signin: "Sign in"
-
-footer:
-  about: "About DataCite"
-  staff: "Staff"