From: Stas Vilchik Date: Thu, 9 Feb 2017 09:52:58 +0000 (+0100) Subject: SONAR-8470 Add favicon and apple touch icons (#1644) X-Git-Tag: 6.3-RC1~101 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=29449a233885264eb30c3575d1571bd096230885;p=sonarqube.git SONAR-8470 Add favicon and apple touch icons (#1644) --- diff --git a/server/sonar-web/public/index.html b/server/sonar-web/public/index.html index a0acf459721..f616d690eb0 100644 --- a/server/sonar-web/public/index.html +++ b/server/sonar-web/public/index.html @@ -3,7 +3,25 @@ - + + + + + + + + + + + + + + + + + + + <% for (var css in htmlWebpackPlugin.files.css) { %> <% } %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/web.xml b/server/sonar-web/src/main/webapp/WEB-INF/web.xml index 3e2e35ad4b6..d040ec6d1ce 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/web.xml +++ b/server/sonar-web/src/main/webapp/WEB-INF/web.xml @@ -132,6 +132,10 @@ png image/png + + ico + image/x-icon + txt text/plain diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png b/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png new file mode 100644 index 00000000000..d3bf726f9a2 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png b/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png b/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png new file mode 100644 index 00000000000..a8859d94fc0 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png b/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png new file mode 100644 index 00000000000..ed12b023481 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png b/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png new file mode 100644 index 00000000000..167bb46f082 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png b/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png new file mode 100644 index 00000000000..821e1e4cce7 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png b/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png new file mode 100644 index 00000000000..1f10bb20da1 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png b/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png new file mode 100644 index 00000000000..371814b6a03 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png b/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png new file mode 100644 index 00000000000..9dfb1e66de4 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png b/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon.png b/server/sonar-web/src/main/webapp/apple-touch-icon.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/src/main/webapp/apple-touch-icon.png differ diff --git a/server/sonar-web/src/main/webapp/favicon.ico b/server/sonar-web/src/main/webapp/favicon.ico new file mode 100644 index 00000000000..15b647af1c2 Binary files /dev/null and b/server/sonar-web/src/main/webapp/favicon.ico differ diff --git a/server/sonar-web/src/main/webapp/images/favicon.ico b/server/sonar-web/src/main/webapp/images/favicon.ico deleted file mode 100644 index c6d382d9823..00000000000 Binary files a/server/sonar-web/src/main/webapp/images/favicon.ico and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/mstile-512x512.png b/server/sonar-web/src/main/webapp/mstile-512x512.png new file mode 100644 index 00000000000..b644063292d Binary files /dev/null and b/server/sonar-web/src/main/webapp/mstile-512x512.png differ diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java index 7d8cbb5c46e..b4ed16602cc 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java @@ -122,7 +122,7 @@ public abstract class ServletFilter implements Filter { public static class Builder { private static final String WILDCARD_CHAR = "*"; private static final Collection STATIC_RESOURCES = ImmutableList.of("/css/*", "/fonts/*", "/images/*", "/js/*", "/static/*", - "/robots.txt", "/favicon.ico", "/apple-touch-icon*"); + "/robots.txt", "/favicon.ico", "/apple-touch-icon*", "/mstile*"); private final Set inclusions = new LinkedHashSet<>(); private final Set exclusions = new LinkedHashSet<>(); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java index 72c2ba21e52..a78348c4f45 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java @@ -224,7 +224,8 @@ public class ServletFilterTest { "/static/*", "/robots.txt", "/favicon.ico", - "/apple-touch-icon*"); + "/apple-touch-icon*", + "/mstile*"); } private static class FakeFilter extends ServletFilter {