Merge pull request #992 from scientist-softserv/i-829-favicon

Add favicon to proprietor page

app/helpers/hyrax_helper.rb

@@ -21,8 +21,17 @@ def banner_image
     Site.instance.banner_image? ? Site.instance.banner_image.url : super
   end
 
-  def favicon
-    Site.instance.favicon? ? Site.instance.favicon.url : super
+  def favicon(size)
+    icon = Site.instance.favicon
+    if icon
+      case icon
+      when FaviconUploader
+        return Site.instance.favicon.url(size)
+      when String
+        return Site.instance.favicon
+      end
+    end
+    nil
   end
 
   def logo_image

app/models/nil_site.rb

@@ -33,8 +33,8 @@ def admin_emails=(value)
     value
   end
 
-  def favicon?
-    false
+  def favicon
+    "favicon.png"
   end
 
   def banner_image?

app/views/_head_tag_extras.html.erb

@@ -1,24 +1,25 @@
 <%= render_gtm_head(request.original_url) %>
+
 <!-- generics -->
-<link rel="icon" href="<%= Site&.favicon&.url(:v32) %>" sizes="32x32">
-<link rel="icon" href="<%= Site&.favicon&.url(:v57) %>" sizes="57x57">
-<link rel="icon" href="<%= Site&.favicon&.url(:v76) %>" sizes="76x76">
-<link rel="icon" href="<%= Site&.favicon&.url(:v96) %>" sizes="96x96">
-<link rel="icon" href="<%= Site&.favicon&.url(:v128) %>" sizes="128x128">
-<link rel="icon" href="<%= Site&.favicon&.url(:v128) %>" sizes="192x192">
-<link rel="icon" href="<%= Site&.favicon&.url(:v228) %>" sizes="228x228">
+<link rel="icon" href="<%= favicon(:v32) %>" sizes="32x32">
+<link rel="icon" href="<%= favicon(:v57) %>" sizes="57x57">
+<link rel="icon" href="<%= favicon(:v76) %>" sizes="76x76">
+<link rel="icon" href="<%= favicon(:v96) %>" sizes="96x96">
+<link rel="icon" href="<%= favicon(:v128) %>" sizes="128x128">
+<link rel="icon" href="<%= favicon(:v128) %>" sizes="192x192">
+<link rel="icon" href="<%= favicon(:v228) %>" sizes="228x228">
 
 <!-- Android -->
-<link rel="shortcut icon" href="<%= Site&.favicon&.url(:v196) %>" sizes="196x196">
+<link rel="shortcut icon" href="<%= favicon(:v196) %>" sizes="196x196">
 
 <!-- iOS -->
-<link rel="apple-touch-icon" href="<%= Site&.favicon&.url(:v120) %>" sizes="120x120">
-<link rel="apple-touch-icon" href="<%= Site&.favicon&.url(:v152) %>" sizes="152x152">
-<link rel="apple-touch-icon" href="<%= Site&.favicon&.url(:v180) %>" sizes="180x180">
+<link rel="apple-touch-icon" href="<%= favicon(:v120) %>" sizes="120x120">
+<link rel="apple-touch-icon" href="<%= favicon(:v152) %>" sizes="152x152">
+<link rel="apple-touch-icon" href="<%= favicon(:v180) %>" sizes="180x180">
 
 <!-- Windows 8 IE 10-->
 <meta name="msapplication-TileColor" content="#FFFFFF">
-<meta name="msapplication-TileImage" content="<%= Site&.favicon&.url(:v228)">
+<meta name="msapplication-TileImage" content="<%= favicon(:v228) %>">
 
 <!— Windows 8.1 + IE11 and above —>
 <meta name="msapplication-config" content="/browserconfig.xml" />