Merge staging for release

Gemfile.lock

@@ -93,7 +93,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.2)
+    concurrent-ruby (1.1.3)
     crass (1.0.4)
     cube-ruby (0.0.3)
     daemons (1.2.6)
@@ -137,7 +137,7 @@ GEM
     lz4-ruby (0.3.3)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.9.1)
+    method_source (0.9.2)
     mime-types (2.99.3)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
@@ -149,13 +149,13 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (5.0.2)
     netrc (0.11.0)
-    newrelic_rpm (5.4.0.347)
+    newrelic_rpm (5.5.0.348)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    oj (3.7.0)
+    oj (3.7.1)
     open_uri_redirections (0.2.1)
-    popper_js (1.14.3)
-    pry (0.12.0)
+    popper_js (1.14.5)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rack (1.6.11)
@@ -201,7 +201,7 @@ GEM
       netrc (~> 0.7)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
-    sass (3.6.0)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -231,12 +231,12 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext

app/assets/stylesheets/application.css.scss

@@ -27,6 +27,7 @@
 @import "admin";
 @import "annotator";
 @import "bioportal";
+@import "footer";
 @import "home";
 @import "mappings";
 @import "notes";

app/assets/stylesheets/footer.scss

@@ -0,0 +1,3 @@
+.legal-text {
+	font-size: 0.9rem;
+}

app/views/layouts/_footer.html.haml

@@ -11,7 +11,7 @@
           %li= link_to('BioPortal REST API', 'http://data.bioontology.org/documentation', target: '_blank')
           %li= link_to('BioPortal Virtual Appliance', 'https://www.bioontology.org/wiki/index.php/Category:NCBO_Virtual_Appliance', target: '_blank')
           %li= link_to('NCBO Web Widgets', 'http://www.bioontology.org/wiki/index.php/NCBO_Widgets', target: '_blank')      
-      %div.col-6.col-md
+      %div.col-6.col-md.footer-support
         %h6 SUPPORT
         %ul.list-unstyled
           %li= link_to('Contact Us', feedback_path(location: encode_param(request.url)), class: 'pop_window')
@@ -36,13 +36,12 @@
           %li.list-inline-item
             = link_to('http://github.com/ncbo', target: '_blank') do
               %i.fab.fa-2x.fa-github
-    %div.row{style: "font-size: 0.9rem;"}
+    %div.row.legal-text
+      %div.col
+        = t('.grant_html')
+    %div.row.pt-2.legal-text
       %div.col
-        The 
-        %strong National Center for Biomedical Ontology 
-        was founded as one of the National Centers for Biomedical Computing, supported by the NHGRI, the NHLBI, and the NIH Common Fund under grant U54-HG004028.
-    %div.row.pt-2{style: "font-size: 0.9rem;"}
-      %div.col Copyright © 2005‑2018, The Board of Trustees of Leland Stanford Junior University. All rights reserved.
+        = t('.copyright_html')
     %div.row.pt-2
       %div.col
         %ul.list-inline

config/locales/en.rb

@@ -10,6 +10,13 @@
       } 
     },
 
+    layouts: {
+      footer: {
+        copyright_html: 'Copyright © 2005‑2018, The Board of Trustees of Leland Stanford Junior University. All rights reserved.',
+        grant_html: 'The <strong>National Center for Biomedical Ontology</strong> was founded as one of the National Centers for Biomedical Computing, supported by the NHGRI, the NHLBI, and the NIH Common Fund under grant U54-HG004028.'
+      }
+    },
+
     home: {
       index: {
         find_ontology_placeholder: 'Start typing ontology name, then choose from list',