Basis-Layout im Hinblick auf kleine Bildschirme überarbeitet

[website] / src / main / webapp / WEB-INF / templates / html5page.jsp
diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp

index aff3b5f..2e5cc80 100644 (file)
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -9,28 +9,12 @@
    <head>
      <title>juplo - <t:getAsString name="title"/></title>
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <style type="text/css">
-      @import '${base}css/screen.css' screen and (min-width: 960px);
-      @import '${base}css/phone.css' screen and (max-width: 599px);
-      @import '${base}css/tiny.css' screen and (max-width: 399px);
-    </style>
-    <script src="${base}js/base.js"></script>
-    <!--[if IE 8]>
-      <script src="${base}js/ie8.js"></script>
-    <![endif]-->
-    <!--[if IE 7]>
-      <script src="${base}js/ie7.js"></script>
-    <![endif]-->
-    <!--[if lt IE 7]>
-      <script src="${base}js/ie6.js"></script>
-    <![endif]-->
+    <t:insertAttribute name="htmlhead"/>
    </head>
    <body onload="prettyPrint()">
-    <div id="page" class="<t:getAsString name="contentclass"/>">
+    <div id="page" class="<t:getAsString name="contentclass"/> cf">
        <header id="header">
-        <a href="${base}index.html" title="Home" id="logo">juplo</a>
+        <h1 id="logo"><a href="${base}index.html" title="Home" class="l">juplo</a></h1>
          <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span>
          <hr class="h" />
        </header>
@@ -40,13 +24,13 @@
            <t:insertAttribute name="breadcrumb"/>
          </ol>
          <a class="hide" href="#navigation">Jump to navigation</a>
-        <div class="b"></div>
+        <hr class="b" />
        </div>
-      <div class="content cf">
-        <section id="content" class="main">
-          <h1><t:getAsString name="title"/></h1>
+      <main class="content cf">
+        <article id="content" class="main">
+          <header><h1><t:getAsString name="title"/></h1></header>
            <t:insertAttribute name="maincontent"/>
-        </section>
+        </article>
          <div class="marginal">
            <nav id="nav">
              <hr />
@@ -56,7 +40,7 @@
            </nav>
            <t:insertAttribute name="marginalcontent" ignore="true"/>
          </div>
-      </div>
+      </main>
        <footer id="footer">
          <hr />
          <ul id="footerlinks">