diff options
18 files changed, 26 insertions, 3 deletions
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 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" charset="UTF-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <link href="%WEB_CONTEXT%/images/favicon.ico" rel="shortcut icon" type="image/x-icon"> + + <link rel="apple-touch-icon" href="%WEB_CONTEXT%/apple-touch-icon.png"> + <link rel="apple-touch-icon" sizes="57x57" href="%WEB_CONTEXT%/apple-touch-icon-57x57.png"> + <link rel="apple-touch-icon" sizes="60x60" href="%WEB_CONTEXT%/apple-touch-icon-60x60.png"> + <link rel="apple-touch-icon" sizes="72x72" href="%WEB_CONTEXT%/apple-touch-icon-72x72.png"> + <link rel="apple-touch-icon" sizes="76x76" href="%WEB_CONTEXT%/apple-touch-icon-76x76.png"> + <link rel="apple-touch-icon" sizes="114x114" href="%WEB_CONTEXT%/apple-touch-icon-114x114.png"> + <link rel="apple-touch-icon" sizes="120x120" href="%WEB_CONTEXT%/apple-touch-icon-120x120.png"> + <link rel="apple-touch-icon" sizes="144x144" href="%WEB_CONTEXT%/apple-touch-icon-144x144.png"> + <link rel="apple-touch-icon" sizes="152x152" href="%WEB_CONTEXT%/apple-touch-icon-152x152.png"> + <link rel="apple-touch-icon" sizes="180x180" href="%WEB_CONTEXT%/apple-touch-icon-180x180.png"> + + <link rel="icon" type="image/x-icon" href="%WEB_CONTEXT%/favicon.ico"> + + <meta name="application-name" content="SonarQube"/> + + <meta name="msapplication-TileColor" content="#FFFFFF" /> + <meta name="msapplication-TileImage" content="%WEB_CONTEXT%/mstile-512x512.png" /> + <% for (var css in htmlWebpackPlugin.files.css) { %> <link href="%WEB_CONTEXT%/<%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet"> <% } %> 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 @@ -133,6 +133,10 @@ <mime-type>image/png</mime-type> </mime-mapping> <mime-mapping> + <extension>ico</extension> + <mime-type>image/x-icon</mime-type> + </mime-mapping> + <mime-mapping> <extension>txt</extension> <mime-type>text/plain</mime-type> </mime-mapping> 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 Binary files differnew file mode 100644 index 00000000000..d3bf726f9a2 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png 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 Binary files differnew file mode 100644 index 00000000000..21dd9adace9 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png 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 Binary files differnew file mode 100644 index 00000000000..a8859d94fc0 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png 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 Binary files differnew file mode 100644 index 00000000000..ed12b023481 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png 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 Binary files differnew file mode 100644 index 00000000000..167bb46f082 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png 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 Binary files differnew file mode 100644 index 00000000000..821e1e4cce7 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png 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 Binary files differnew file mode 100644 index 00000000000..1f10bb20da1 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png 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 Binary files differnew file mode 100644 index 00000000000..371814b6a03 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png 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 Binary files differnew file mode 100644 index 00000000000..9dfb1e66de4 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png 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 Binary files differnew file mode 100644 index 00000000000..21dd9adace9 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon.png b/server/sonar-web/src/main/webapp/apple-touch-icon.png Binary files differnew file mode 100644 index 00000000000..21dd9adace9 --- /dev/null +++ b/server/sonar-web/src/main/webapp/apple-touch-icon.png diff --git a/server/sonar-web/src/main/webapp/favicon.ico b/server/sonar-web/src/main/webapp/favicon.ico Binary files differnew file mode 100644 index 00000000000..15b647af1c2 --- /dev/null +++ b/server/sonar-web/src/main/webapp/favicon.ico diff --git a/server/sonar-web/src/main/webapp/images/favicon.ico b/server/sonar-web/src/main/webapp/images/favicon.ico Binary files differdeleted file mode 100644 index c6d382d9823..00000000000 --- a/server/sonar-web/src/main/webapp/images/favicon.ico +++ /dev/null diff --git a/server/sonar-web/src/main/webapp/mstile-512x512.png b/server/sonar-web/src/main/webapp/mstile-512x512.png Binary files differnew file mode 100644 index 00000000000..b644063292d --- /dev/null +++ b/server/sonar-web/src/main/webapp/mstile-512x512.png 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<String> 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<String> inclusions = new LinkedHashSet<>(); private final Set<String> 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 { |
