External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10388 from jakemcdermott/fix-favico

Browse Source 
Use favicon for dev and prod builds

SUMMARY

Reviewed-by: Michael Abashian <None>
Reviewed-by: Sarah Akus <sarah.akus@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-06-09 18:10:39 +00:00
committed by GitHub
parent 0a63c2d4a0 0195bab931
commit 122b36dcc5
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui_next/public/index.html
View File

@@ -1,3 +1,20 @@
<!-- There's multiple layers of templating in this file:
* "< ... >" with % symbols are ejs templates used by react-scripts at build time. These
templates are mainly used to check whether or not we're building a ui for production
versus one that will be sent from the ui dev server. Since this type of template is
applied at build time, it can be used to conditionally render the others.
* "% ... %" are templates used by the react-scripts dev server when serving the ui from
port 3001. These are applied at runtime and only work for development mode.
* "{ ... }" with % symbols and "{{ ... }}" are django templates that only run for
production builds (e.g port 8043) when serving the ui from a webserver.
-->
<% if (process.env.NODE_ENV === 'production') { %>
{% load static %}
<% } %>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@@ -9,6 +26,9 @@
http-equiv="Content-Security-Policy" http-equiv="Content-Security-Policy"
content="default-src 'self'; connect-src 'self' ws: wss:; style-src 'self' 'unsafe-inline'; script-src 'self' 'nonce-{{ csp_nonce }}' *.pendo.io; img-src 'self' *.pendo.io data:;" content="default-src 'self'; connect-src 'self' ws: wss:; style-src 'self' 'unsafe-inline'; script-src 'self' 'nonce-{{ csp_nonce }}' *.pendo.io; img-src 'self' *.pendo.io data:;"
/> />
<link rel="shortcut icon" href="{% static 'media/favicon.ico' %}" />
<% } else { %>
<link rel="shortcut icon" href="%PUBLIC_URL%/static/media/favicon.ico" />
<% } %> <% } %>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />

BIN
awx/ui_next/public/static/media/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB