X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2FWEB-INF%2Ftemplates%2Fhtml5page.jsp;h=b98eda1be8326bf9f4ff98fc0fed95b98c67ac7e;hp=0cbbdb4664a4051100e10846c0d7660bb21e64f2;hb=d53a4e6b1196f66f6f1768c013a4d9759be70dd2;hpb=358f986158204ef096084f6c459f3ea769e79d50

diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
index 0cbbdb46..b98eda1b 100644
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -16,34 +16,24 @@
       <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span>
       <hr />
     </header>
-    <div class="content cols_2 cf">
+    <div class="content <t:getAsString name="contentclass"/> cf">
       <section id="content" class="main">
-        <t:insertAttribute name="content"/>
+        <h1><t:getAsString name="title"/></h1>
+        <t:insertAttribute name="maincontent"/>
       </section>
       <div class="marginal">
         <nav id="nav">
           <a id="navigation"></a>
           <t:insertAttribute name="navigation"/>
         </nav>
-        <div>
-          <h1>Other nasty but marginal stuff</h1>
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-            aliquip ex ea commodo consequat. Duis aute irure dolor in
-            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-            culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
+        <t:insertAttribute name="marginalcontent" ignore="true"/>
       </div>
     </div>
     <footer id="footer">
       <ul id="footerlinks">
         <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-        <li class="f"><a class="f" href="#f">Contact</a></li>
-        <li class="f"><a class="f" href="#f">Impressum</a></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>
       </ul>
     </footer>
   </body>