Layout für Smartphones und sehr kleine Bildschirmgrößen ü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 3deb508..3169c65 100644 (file)
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -3,32 +3,18 @@
  <%@page pageEncoding="UTF-8"%>
  <%@page session="false" %>
  <%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
+<%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
+<s:url var="base" value="/" />
  <html>
    <head>
      <title>juplo - <t:getAsString name="title"/></title>
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <base href="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}/" />
-    <link rel="stylesheet" type="text/css" href="css/base.css" />
-    <style type="text/css">
-      @import 'css/screen.css' screen and (min-width: 960px);
-      @import 'css/phone.css' screen and (max-width: 599px);
-      @import 'css/tiny.css' screen and (max-width: 399px);
-    </style>
-    <script src="js/base.js"></script>
-    <!--[if IE 8]>
-      <script src="js/ie8.js"></script>
-    <![endif]-->
-    <!--[if IE 7]>
-      <script src="js/ie7.js"></script>
-    <![endif]-->
-    <!--[if lt IE 7]>
-      <script src="js/ie6.js"></script>
-    <![endif]-->
+    <t:insertAttribute name="htmlhead"/>
    </head>
    <body onload="prettyPrint()">
-    <div id="page">
+    <div id="page" class="<t:getAsString name="contentclass"/> cf">
        <header id="header">
-        <a href="/" 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>
@@ -37,32 +23,30 @@
          <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="fc <t:getAsString name="contentclass"/>">
-        <div class="content cf">
-          <section id="content" class="main">
-            <h1><t:getAsString name="title"/></h1>
-            <t:insertAttribute name="maincontent"/>
-          </section>
-          <div class="marginal">
-            <nav id="nav">
-              <hr />
-              <a id="navigation"></a>
-              <t:insertAttribute name="navigation"/>
-              <hr />
-            </nav>
-            <t:insertAttribute name="marginalcontent" ignore="true"/>
-          </div>
+      <main class="content cf">
+        <article id="content" class="main">
+          <header><h1><t:getAsString name="title"/></h1></header>
+          <t:insertAttribute name="maincontent"/>
+        </article>
+        <div class="marginal">
+          <nav id="nav">
+            <hr class="n"/>
+            <a id="navigation"></a>
+            <t:insertAttribute name="navigation"/>
+            <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="contact.html">Contact</a></li>
-          <li class="f"><a class="f" href="impressum.html">Impressum</a></li>
+          <li class="f"><a class="f" href="${base}contact.html">Contact</a></li>
+          <li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
          </ul>
        </footer>
      </div>