From e96bf2e3296485e100e71c3c2b5155421bcb756a Mon Sep 17 00:00:00 2001
From: Andrew Bone <AndrewB05@gmail.com>
Date: Fri, 22 Mar 2019 17:54:46 +0000
Subject: [PATCH] Add discernible text for organization link (#2168)

---
 .../javascripts/utilities/buildArticleHTML.js.erb      |  2 +-
 app/views/articles/_single_story.html.erb              | 10 +++++++---
 app/views/notifications/_article.html.erb              | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/utilities/buildArticleHTML.js.erb b/app/assets/javascripts/utilities/buildArticleHTML.js.erb
index a227dcf22..e91c8dd6e 100644
--- a/app/assets/javascripts/utilities/buildArticleHTML.js.erb
+++ b/app/assets/javascripts/utilities/buildArticleHTML.js.erb
@@ -49,7 +49,7 @@ function buildArticleHTML(article) {
     var profileUsername = article.user.username
     var orgHeadline = "";
     if (article.organization && !document.getElementById("organization-article-index")) {
-      orgHeadline = '<div class="article-organization-headline"><a href="/'+article.organization.slug+'" class="article-organization-headline-inner"><img src="'+article.organization.profile_image_90+'" alt="'+article.organization.name+' logo" />'+article.organization.name+'</a><a class="org-headline-filler" href="'+article.path+'">&nbsp;</a></div>'
+      orgHeadline = '<div class="article-organization-headline"><a class="org-headline-filler" href="/'+article.organization.slug+'"><span class="article-organization-headline-inner"><img alt="'+article.organization.name+' logo" src="'+article.organization.profile_image_90+'">'+article.organization.name+'</span></a></div>'
     }
     var bodyTextSnippet = "";
     var commentsBlobSnippet = "";
diff --git a/app/views/articles/_single_story.html.erb b/app/views/articles/_single_story.html.erb
index fe478d8b8..eb3be7de4 100644
--- a/app/views/articles/_single_story.html.erb
+++ b/app/views/articles/_single_story.html.erb
@@ -7,9 +7,13 @@
   <% end %>
   <% if story.organization && !@organization_article_index %>
     <div class="article-organization-headline">
-      <a href="/<%= story.organization.slug %>" class="article-organization-headline-inner">
-      <img src="<%= story.organization.profile_image_90 %>" alt="<%= story.organization.name %> logo"><%= story.organization.name %>
-      </a><a class="org-headline-filler" href="<%= story.path %>">&nbsp;</a></div>
+      <a class="org-headline-filler" href="/<%= story.organization.slug %>">
+        <span class="article-organization-headline-inner">
+          <img alt="<%= story.organization.name %> logo" src="<%= story.organization.profile_image_90 %>">
+          <%= story.organization.name %>
+        </span>
+      </a>
+    </div>
   <% end %>
   <a href="<%= story.user.path %>" class="small-pic-link-wrapper">
     <div class="small-pic">
diff --git a/app/views/notifications/_article.html.erb b/app/views/notifications/_article.html.erb
index f05f9d079..9154f95b0 100644
--- a/app/views/notifications/_article.html.erb
+++ b/app/views/notifications/_article.html.erb
@@ -6,11 +6,13 @@
   <% json_data = notification.json_data %>
   <% if json_data["organization"] %>
     <div class="article-organization-headline">
-      <a href="<%= json_data["organization"]["path"] %>" class="article-organization-headline-inner">
-        <img src="<%= json_data["organization"]["profile_image_90"] %>" alt="<%= json_data["organization"]["name"] %> logo"> <%= json_data["organization"]["name"] %>
+      <a class="org-headline-filler" href="<%= json_data["organization"]["path"] %>">
+        <span class="article-organization-headline-inner">
+          <img alt="<%= json_data["organization"]["name"] %> logo" src="<%= json_data["organization"]["profile_image_90"] %>">
+          <%= json_data["organization"]["name"] %>
+        </span>
       </a>
-      <a class="org-headline-filler" href="<%= json_data["organization"]["path"] %>">&nbsp;</a>
-    </div>
+   </div>
   <% end %>
   <% cache "activity-profile-pic-#{json_data['user']['id']}-#{json_data['user']['profile_image_90']}" do %>
     <a href="<%= json_data["user"]["path"] %>" class="small-pic-link-wrapper">