2 files changed, 36 insertions, 41 deletions
diff --git a/src/main/resources/templates/layouts/content.html b/src/main/resources/templates/layouts/content.html
deleted file mode 100644
index d2d29c4e..00000000
--- a/src/main/resources/templates/layouts/content.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html prefix="og: http://ogp.me/ns#">
-<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 }}"/>
-    {% block headers %}
-    {{ headers | default('') | raw }}
-    {% endblock %}
-    <title>{{ title | default('Juick') }}</title>
-    <meta property="og:type" content="{{ ogtype | default('website') }}" />
-    <meta property="fb:app_id" content="130568668304" />
-    <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"/>
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <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="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" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}>
-{% block body %}
-{% endblock %}
-</body>
-</html>
diff --git a/src/main/resources/templates/layouts/default.html b/src/main/resources/templates/layouts/default.html
index 343885c4..575e7707 100644
--- a/src/main/resources/templates/layouts/default.html
+++ b/src/main/resources/templates/layouts/default.html
@@ -1,5 +1,37 @@
-{% extends "layouts/content" %}
-{% block body %}
+<!DOCTYPE html>
+<html prefix="og: http://ogp.me/ns#">
+<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 }}"/>
+    {% block headers %}
+    {{ headers | default('') | raw }}
+    {% endblock %}
+    <title>{{ title | default('Juick') }}</title>
+    <meta property="og:type" content="{{ ogtype | default('website') }}" />
+    <meta property="fb:app_id" content="130568668304" />
+    <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"/>
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <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="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" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}>
 {% include "views/partial/navigation" %}
 <div id="wrapper">
     <section id="content"
@@ -13,4 +45,5 @@
     </aside>
 </div>
 {% include "views/partial/footer" %}
-{% endblock %}
-\ No newline at end of file
+</body>
+</html>
+\ No newline at end of file