Merge pull request #87 from portagenetwork/issue82

Issue82

app/assets/stylesheets/blocks/_font_awesomes.scss

@@ -26,7 +26,6 @@
 a {
    i {
      &.fas {
-
        &.fa-file-pdf,
        &.fa-file-word {
          color: $color-fa;

app/assets/stylesheets/utils/_icons.scss

@@ -2,4 +2,4 @@
 @mixin icon($icon) {
   @extend .fa;
   @extend .fa-#{$icon}:before;
-}
+}

app/views/orgs/_profile_form.html.erb

@@ -3,6 +3,9 @@
 <%
   shared_links_tooltip = _('Links will be displayed next to your organisation\'s logo')
   org_config_info_tooltip =  _('This information can only be changed by a system administrator. Contact the Help Desk if you have questions or to request changes.')
+  org_types_tooltip = _(
+    'This information can only be changed by a system administrator. Contact %{support_email} if you have questions or to request changes.' % { support_email: Rails.configuration.x.organisation.email}
+     )
 %>
 
 <%= form_for(org, url: url, html: { multipart: true, method: method,
@@ -126,7 +129,13 @@
   <div class="row">
     <% if current_user.can_super_admin? %>
       <fieldset class="col-xs-8">
-        <legend><%= _('Organisation Types') %></legend>
+        <legend>
+          <%= _('Organisation Types') %>
+          <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
+            &nbsp; <i class="fas fa-question-circle fa-reverse" ></i>
+            <em class="sr-only"></em>
+          </a>
+        </legend>
         <div class="checkbox">
           <%= f.label :funder do %>
             <%= f.check_box :funder, { class: 'org_types', value: org.funder? }, "true", "false" %>
@@ -149,7 +158,13 @@
     <% else %>
       <div class="col-xs-8">
         <dl>
-          <dt><%= _('Organisation type(s)') %></dt>
+          <dt>
+            <%= _('Organisation type(s)') %>
+            <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
+              &nbsp; <i class="fas fa-question-circle fa-reverse" ></i>
+              <em class="sr-only"></em>
+            </a>
+          </dt>
           <dd><%= org.org_type_to_s %></dd>
         </dl>
       </div>

app/views/shared/_links.html.erb

@@ -9,10 +9,10 @@
           <span class="max-number-links">
             <%= max_number_links %>
           </span>)
-        </small>&nbsp;
+        </small>
         <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip"
            data-placement="right" title="<%= tooltip %>">
-          <i class="fas fa-question-circle fa-reverse" aria-hidden="true"></i>
+          &nbsp; <i class="fas fa-question-circle fa-reverse" aria-hidden="true"></i>
           <em class="sr-only"><%= tooltip %></em>
         </a>
       </h3>

app/views/shared/_popover.html.erb

@@ -2,7 +2,7 @@
 <% if message.present? %>
   <i class="popover-icon" data-toggle="tooltip"
      title="<%= message %>" placement="<%= placement %>">
-    <i class="fas fa-question-circle"></i>
-    <em class="sr-only"><%= message %>></em>
+    &nbsp; <i class="fas fa-question-circle"></i>
+    <em class="sr-only"><%= message %></em>
   </i>
 <% end %>

config/webpack/environment.js

@@ -1,6 +1,6 @@
 const { environment } = require('@rails/webpacker');
-const erb = require('./loaders/erb');
 const webpack = require('webpack');
+const erb = require('./loaders/erb');
 const eslint = require('./loaders/eslint');
 
 environment.loaders.prepend('erb', erb);
@@ -17,5 +17,5 @@ environment.config.set('resolve.alias', {
   'bootstrap-sass': 'bootstrap-sass/assets/javascripts/bootstrap/',
 });
 
-environment.loaders.prepend('erb', erb)
+environment.loaders.prepend('erb', erb);
 module.exports = environment;