Merge pull request #126 from ror-community/staging

Merge staging to master
ror-community · Jan 4, 2023 · 422f5c2 · 422f5c2
2 parents 50816e6 + 2bca2ca
commit 422f5c2
Show file tree

Hide file tree

Showing 32 changed files with 18,829 additions and 25 deletions.
diff --git a/app/index.html b/app/index.html
@@ -9,15 +9,16 @@
 
     {{content-for "head"}}
 
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" />
     <link href="//cdnjs.cloudflare.com/ajax/libs/cc-icons/1.2.1/css/cc-icons.min.css" rel="stylesheet">
     <link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
 
+    <link href="{{rootURL}}assets/fontawesome/css/fontawesome.css" rel="stylesheet">
+    <link href="{{rootURL}}assets/fontawesome/css/brands.css" rel="stylesheet">
+    <link href="{{rootURL}}assets/fontawesome/css/solid.css" rel="stylesheet">
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css"type='text/css'>
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css" type='text/css'>
 
-    <link rel="stylesheet" href="https://ror.org/css/hugo-ror.css?v=4" type='text/css'>
+    <link rel="stylesheet" href="https://ror.org/css/hugo-ror.css?v4">
     <link rel="stylesheet" href="{{rootURL}}assets/ror-app.css" type='text/css'>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">

diff --git a/app/routes/organizations/index.js b/app/routes/organizations/index.js
@@ -24,7 +24,7 @@ export default Route.extend({
         ror_id = params.query.replace(/ror\.org\//g, '')
       }
       if(ror_id){
-        this.transitionTo('/' + ror_id);
+        window.location.href = ror_id
         return;
       } else {
         // eslint-disable-next-line
@@ -53,4 +53,5 @@ export default Route.extend({
       refreshModel: true
     }
   }
+
 });
diff --git a/app/templates/components/application-header.hbs b/app/templates/components/application-header.hbs
@@ -42,7 +42,7 @@ onCollapse=(action (mut collapsed) true) onExpand=(action (mut collapsed) false)
 
         {{#nav.item}}
         <a class="nav-link external" href="https://ror.readme.io">
-          <p>Support <i class="fa fa-external-link"></i></p>
+          <p>Support <i class="fa-solid fa-external-link"></i></p>
         </a>
         {{/nav.item}}
 

diff --git a/app/templates/components/application-socials.hbs b/app/templates/components/application-socials.hbs
@@ -1,17 +1,19 @@
 <section class="section section-socials" data-background-color="light-grey">
 	<div class="container">
 		<div class="row justify-content-between no-gutters ml-auto mr-auto text-center">
-			<div class="col-sm-6 col-md-1"><a href="mailto:info@ror.org"><i class="fa fa-envelope"></i>
+			<div class="col-sm-6 col-md-1"><a href="mailto:info@ror.org"><i class="fa-solid fa-envelope"></i>
 					<span>Email</span></a></div>
-			<div class="col-sm-6 col-md-1"><a href="https://twitter.com/ResearchOrgs"><i class="fa fa-twitter"></i>
+			<div class="col-sm-6 col-md-1"><a href="https://mastodon.social/@ResearchOrgs"><i class="fa-brands fa-mastodon"></i>
+					<span>Mastodon</span></a></div>
+			<div class="col-sm-6 col-md-1"><a href="https://twitter.com/ResearchOrgs"><i class="fa-brands fa-twitter"></i>
 					<span>Twitter</span></a></div>
-			<div class="col-sm-6 col-md-1"><a href="https://www.youtube.com/channel/UCQBOpOpW-JEKoVCUlmCK1Eg"><i class="fa fa-youtube"></i>
+			<div class="col-sm-6 col-md-1"><a href="https://www.youtube.com/channel/UCQBOpOpW-JEKoVCUlmCK1Eg"><i class="fa-brands fa-youtube"></i>
 					<span>YouTube</span></a></div>
-			<div class="col-sm-6 col-md-1"><a href="https://www.linkedin.com/company/ror-research-organization-registry/"><i class="fa fa-linkedin"></i>
+			<div class="col-sm-6 col-md-1"><a href="https://www.linkedin.com/company/ror-research-organization-registry/"><i class="fa-brands fa-linkedin"></i>
 					<span>LinkedIn</span></a></div>
-			<div class="col-sm-6 col-md-1"><a href="https://github.com/ror-community"><i class="fa fa-github"></i>
+			<div class="col-sm-6 col-md-1"><a href="https://github.com/ror-community"><i class="fa-brands fa-github"></i>
 					<span>GitHub</span></a></div>
-			<div class="col-sm-6 col-md-1"><a href="https://ror.readme.io/"><i class="fa fa-life-ring"></i>
+			<div class="col-sm-6 col-md-1"><a href="https://ror.readme.io/"><i class="fa-solid fa-life-ring"></i>
 					<span>Support</span></a></div>
 		</div>
 	</div>

diff --git a/app/templates/components/filter-sidebar.hbs b/app/templates/components/filter-sidebar.hbs
@@ -1,6 +1,6 @@
 <div id="filters" class="small">
     <div class="filter-group">
-        <h3>Record status <i class="fa fa-question-circle" aria-hidden="true"><BsPopover @triggerEvents="hover" class="popover">Each ROR record has a status of active, inactive or withdrawn. <b>Inactive</b> indicates that an organization has split, merged or otherwise ceased to operate. <b>Withdrawn</b> indicates that an organization was added to ROR in error.</BsPopover></i></h3>
+        <h3>Record status <i class="fa-solid fa-question-circle" aria-hidden="true"><BsPopover @triggerEvents="hover" class="popover">Each ROR record has a status of active, inactive or withdrawn. <b>Inactive</b> indicates that an organization has split, merged or otherwise ceased to operate. <b>Withdrawn</b> indicates that an organization was added to ROR in error.</BsPopover></i></h3>
         <hr>
         <div class="filters-list">
             {{input class="filters-list-input" type="checkbox" id="active-status" name="activeStatus" checked=activeStatus}}
@@ -16,7 +16,7 @@
         </div>
     </div>
     <div>
-        <button class="btn btn-sma btn-round btn-primary" type="submit" id="filter-button" {{action "applyFilter"}}><i class="fa fa-check-circle" aria-hidden="true"></i>Apply</button>
-        <button class="btn btn-sma btn-round btn-secondary" type="submit" id="clear-button" {{action "clearFilter"}}><i class="fa fa-times-circle" aria-hidden="true"></i>Clear</button>
+        <button class="btn btn-sma btn-round btn-primary" type="submit" id="filter-button" {{action "applyFilter"}}><i class="fa-solid fa-check-circle" aria-hidden="true"></i>Apply</button>
+        <button class="btn btn-sma btn-round btn-secondary" type="submit" id="clear-button" {{action "clearFilter"}}><i class="fa-solid fa-times-circle" aria-hidden="true"></i>Clear</button>
     </div>
 </div>
diff --git a/app/templates/components/page-numbers.hbs b/app/templates/components/page-numbers.hbs
@@ -2,18 +2,18 @@
   <ul class="pagination justify-content-center">
     {{#if previousPage}}
       <li class="page-item">
-        {{#link-to 
-          link 
+        {{#link-to
+          link
           (query-params
           page=previousPage)
           class="page-link"
           aria-label="Previous"
-        }}<span aria-hidden="true"><i class="fa fa-angle-double-left" aria-hidden="true"></i></span>
+        }}<span aria-hidden="true"><i class="fa-solid fa-angle-double-left" aria-hidden="true"></i></span>
         {{/link-to}}
       </li>
     {{else}}
       <li class="page-item disabled">
-        <a class="page-link"><span aria-hidden="true"><i class="fa fa-angle-double-left" aria-hidden="true"></i></span></a>
+        <a class="page-link"><span aria-hidden="true"><i class="fa-solid fa-angle-double-left" aria-hidden="true"></i></span></a>
       </li>
     {{/if}}
 
@@ -28,8 +28,8 @@
         </li>
       {{else}}
         <li class="page-item">
-          {{#link-to 
-            link 
+          {{#link-to
+            link
             (query-params
             page=item.page)
             class="page-link"
@@ -41,18 +41,18 @@
 
     {{#if nextPage}}
       <li class="page-item">
-        {{#link-to 
-          link 
+        {{#link-to
+          link
           (query-params
           page=nextPage)
           class="page-link"
           aria-label="Next"
-        }}<span aria-hidden="true"><i class="fa fa-angle-double-right" aria-hidden="true"></i></span>
+        }}<span aria-hidden="true"><i class="fa-solid fa-angle-double-right" aria-hidden="true"></i></span>
         {{/link-to}}
       </li>
     {{else}}
       <li class="page-item">
-        <a class="page-link"><span aria-hidden="true"><i class="fa fa-angle-double-right" aria-hidden="true"></i></span></a>
+        <a class="page-link"><span aria-hidden="true"><i class="fa-solid fa-angle-double-right" aria-hidden="true"></i></span></a>
       </li>
     {{/if}}
   </ul>