]> source.dussan.org Git - sonarqube.git/commitdiff
projects / sonarqube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 867894b)
SONAR-8470 Add favicon and apple touch icons (#1644)
authorStas Vilchik <stas-vilchik@users.noreply.github.com>
Thu, 9 Feb 2017 09:52:58 +0000 (10:52 +0100)
committerGitHub <noreply@github.com>
Thu, 9 Feb 2017 09:52:58 +0000 (10:52 +0100)
18 files changed:
server/sonar-web/public/index.html patch | blob | history
server/sonar-web/src/main/webapp/WEB-INF/web.xml patch | blob | history
server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/apple-touch-icon.png [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/favicon.ico [new file with mode: 0644] patch | blob
server/sonar-web/src/main/webapp/images/favicon.ico [deleted file] patch | blob | history
server/sonar-web/src/main/webapp/mstile-512x512.png [new file with mode: 0644] patch | blob
sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java patch | blob | history
sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java patch | blob | history

diff --git a/server/sonar-web/public/index.html b/server/sonar-web/public/index.html
index a0acf459721e9e7be05900aa4eb34b5b203e374e..f616d690eb0a06c14f72c1045dde34359ef74434 100644 (file)
--- 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 3e2e35ad4b66d5f10b583cf86801cbf35d16f892..d040ec6d1ce2ab04e03b2c98437b09ba396462ac 100644 (file)
--- 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 @@
     <extension>png</extension>
     <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>
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 (file)
index 0000000..d3bf726
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 (file)
index 0000000..21dd9ad
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 (file)
index 0000000..a8859d9
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 (file)
index 0000000..ed12b02
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 (file)
index 0000000..167bb46
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 (file)
index 0000000..821e1e4
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 (file)
index 0000000..1f10bb2
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 (file)
index 0000000..371814b
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 (file)
index 0000000..9dfb1e6
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 (file)
index 0000000..21dd9ad
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 (file)
index 0000000..21dd9ad
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 (file)
index 0000000..15b647a
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 (file)
index c6d382d..0000000
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 (file)
index 0000000..b644063
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 7d8cbb5c46e654419d39187efc4404baf70179ca..b4ed16602ccaf8facc98b3fd39f6065765288850 100644 (file)
--- 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 72c2ba21e5271ebb8b0b524880912463ba044ba4..a78348c4f45a8373498febe640db5911d0021a16 100644 (file)
--- 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 {
Continuous Inspection: https://github.com/SonarSource/sonarqube