Layout für Smartphones und sehr kleine Bildschirmgrößen überarbeitet
[website] / src / main / webapp / WEB-INF / templates / html5page.jsp
index 46c4e08..3169c65 100644 (file)
@@ -9,27 +9,12 @@
   <head>
     <title>juplo - <t:getAsString name="title"/></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <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>
         <ol class="b">
           <t:insertAttribute name="breadcrumb"/>
         </ol>
-        <a class="hide" href="#navigation">Jump to navigation</a>
-        <div class="b"></div>
+        <a class="hide" href="#navigation" title="Show navigation menu">Jump to navigation</a>
+        <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 />
+            <hr class="n"/>
             <a id="navigation"></a>
             <t:insertAttribute name="navigation"/>
-            <hr />
+            <hr class="n"/>
           </nav>
           <t:insertAttribute name="marginalcontent" ignore="true"/>
         </div>
-      </div>
+      </main>
       <footer id="footer">
-        <hr />
+        <hr class="f" />
         <ul id="footerlinks">
           <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
           <li class="f"><a class="f" href="${base}contact.html">Contact</a></li>