diff options
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java | 22 | ||||
| -rw-r--r-- | juick-www/src/main/webapp/WEB-INF/layouts/content.html | 52 |
2 files changed, 53 insertions, 21 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java index 14dc1cd2..fdb741f6 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java +++ b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java @@ -79,9 +79,25 @@ public class PageTemplates { out.print(headers); } out.print("<title>" + title + "</title>"); - out.println("<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\"/>"); - out.println("<link rel=\"icon\" href=\"//i.juick.com/favicon.png\"/>"); - out.println("<link rel=\"apple-touch-icon\" href=\"//i.juick.com/apple-touch-icon.png\"/>"); + out.println("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>"); + out.println("<meta name=\"msapplication-config\" content=\"//i.juick.com/browserconfig.xml\"/>"); + out.println("<meta name=\"msapplication-TileColor\" content=\"#ffffff\"/>"); + out.println("<meta name=\"msapplication-TileImage\" content=\"//i.juick.com/ms-icon-144x144.png\"/>"); + out.println("<meta name=\"theme-color\" content=\"#ffffff\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"//i.juick.com/apple-icon-57x57.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"//i.juick.com/apple-icon-60x60.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"//i.juick.com/apple-icon-72x72.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"//i.juick.com/apple-icon-76x76.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"//i.juick.com/apple-icon-114x114.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"//i.juick.com/apple-icon-120x120.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"//i.juick.com/apple-icon-144x144.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"//i.juick.com/apple-icon-152x152.png\"/>"); + out.println("<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"//i.juick.com/apple-icon-180x180.png\"/>"); + out.println("<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\" href=\"//i.juick.com/android-icon-192x192.png\"/>"); + out.println("<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"//i.juick.com/favicon-32x32.png\"/>"); + out.println("<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"//i.juick.com/favicon-96x96.png\"/>"); + out.println("<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"//i.juick.com/favicon-16x16.png\"/>"); + out.println("<link rel=\"manifest\" href=\"//i.juick.com/manifest.json\"/>"); out.println("<!--[if lt IE 9 & (!IEMobile 7)]>"); out.println("<script src=\"//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js\"></script>"); out.println("<![endif]-->"); diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index 0f6f8dac..420d4e0c 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -1,28 +1,44 @@ <!DOCTYPE html> <html> - <head> - <meta charset="utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge" /> +<head> + <meta charset="utf-8"/> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <script type="text/javascript" src="/{{ beans.webApp.scriptsUrl }}"></script> - <link rel="stylesheet" type="text/css" href="/{{ beans.webApp.styleUrl }}" /> + <link rel="stylesheet" type="text/css" href="/{{ beans.webApp.styleUrl }}"/> {% block headers %} {{ headers | default('') | raw }} {% endblock %} <title>{{ title | default('Juick') }}</title> - <meta name="viewport" content="width=device-width,initial-scale=1" /> - <link rel="icon" href="//i.juick.com/favicon.png" /> - <link rel="apple-touch-icon" href="//i.juick.com/apple-touch-icon.png" /> - </head> - <body id="body"> - {% include "views/partial/navigation" %} - <section id="content"> + <meta name="viewport" content="width=device-width,initial-scale=1"/> + <meta name="msapplication-config" content="//i.juick.com/browserconfig.xml"/> + <meta name="msapplication-TileColor" content="#ffffff"/> + <meta name="msapplication-TileImage" content="//i.juick.com/ms-icon-144x144.png"/> + <meta name="theme-color" content="#ffffff"/> + <link rel="apple-touch-icon" sizes="57x57" href="//i.juick.com/apple-icon-57x57.png"/> + <link rel="apple-touch-icon" sizes="60x60" href="//i.juick.com/apple-icon-60x60.png"/> + <link rel="apple-touch-icon" sizes="72x72" href="//i.juick.com/apple-icon-72x72.png"/> + <link rel="apple-touch-icon" sizes="76x76" href="//i.juick.com/apple-icon-76x76.png"/> + <link rel="apple-touch-icon" sizes="114x114" href="//i.juick.com/apple-icon-114x114.png"/> + <link rel="apple-touch-icon" sizes="120x120" href="//i.juick.com/apple-icon-120x120.png"/> + <link rel="apple-touch-icon" sizes="144x144" href="//i.juick.com/apple-icon-144x144.png"/> + <link rel="apple-touch-icon" sizes="152x152" href="//i.juick.com/apple-icon-152x152.png"/> + <link rel="apple-touch-icon" sizes="180x180" href="//i.juick.com/apple-icon-180x180.png"/> + <link rel="icon" type="image/png" sizes="192x192" href="//i.juick.com/android-icon-192x192.png"/> + <link rel="icon" type="image/png" sizes="32x32" href="//i.juick.com/favicon-32x32.png"/> + <link rel="icon" type="image/png" sizes="96x96" href="//i.juick.com/favicon-96x96.png"/> + <link rel="icon" type="image/png" sizes="16x16" href="//i.juick.com/favicon-16x16.png"/> + <link rel="manifest" href="//i.juick.com/manifest.json"/> +</head> +<body id="body"> +{% include "views/partial/navigation" %} +<section id="content"> {% block content %} {% endblock %} - </section> - <aside id="column"> - {% block column %} - {% endblock %} - </aside> - {% include "views/partial/footer" %} - </body> +</section> +<aside id="column"> + {% block column %} + {% endblock %} +</aside> +{% include "views/partial/footer" %} +</body> </html> |