X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2FWEB-INF%2Fviews%2Ftest%2Ftablet.jsp;h=901cb4bb78b761c43903daae9c81050afd5ae1a2;hp=0970810b3679a9fe5cc016338e4223b4b8c25f53;hb=7e49305c9248231d4dcaa1dbe31158b554a74ab6;hpb=e61de31e9c4b39cef10eb4a0d5e8aa01c4a0e38d

diff --git a/src/main/webapp/WEB-INF/views/test/tablet.jsp b/src/main/webapp/WEB-INF/views/test/tablet.jsp
index 0970810b..901cb4bb 100644
--- a/src/main/webapp/WEB-INF/views/test/tablet.jsp
+++ b/src/main/webapp/WEB-INF/views/test/tablet.jsp
@@ -2,58 +2,21 @@
 <%@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="/" />
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Layout für Tablets" type="string"/>
+<t:insertDefinition name="test">
+  <t:putAttribute name="title" value="Layout für Tablets" type="string" cascade="true"/>
   <t:putAttribute name="htmlhead" type="string">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="${base}css/screen.css" />
     <link rel="stylesheet" type="text/css" href="${base}css/tablet.css" />
   </t:putAttribute>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><strong class="b">HTML-Experimente</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s active">
-      <li class="s sub"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="${base}projects/fix-swf.html" class="s">fix-swf</a></li>
-      <li class="s"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s"><strong class="s">HTML-Experimente</strong></li>
-      <li class="s sub"><a href="#" class="s">accelerator</a></li>
-      <li class="s"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string">
+  <t:putAttribute name="maincontent" type="string" cascade="true">
     <p>
       Diese Seite bindet alle Styles ein, die für Tablets eingebunden
-      werden (<code>/css/base.css</code>, <code>/css/screen.css</code> und
-      <code>/css/tablet.css</code>).
+      werden (<code>/css/base.css</code> und <code>/css/tablet.css</code>).
     </p>
-    <h2>Layout-Variationen</h2>
-    <ul>
-      <li><a href="${base}test/basis-layout.html">Basis-Layout</a></li>
-      <li><a href="${base}test/tiny.html">Layout für sehr kleine Bildschirmgrößen</a></li>
-      <li><a href="${base}test/phone.html">Layout für Smartphones</a></li>
-      <li><strong>Layout für Tablets</strong></li>
-    </ul>
-    <h2>Testseiten für einzelne Seiten-Bestandteile</h2>
-    <ul>
-      <li><a href="${base}test/seitenaufteilung.html">Nur das Basis-Layout und die Seitenaufteilung</a></li>
-      <li><a href="${base}test/seitenkopf.html">Nur das Basis-Layout und der Seitenkopf</a></li>
-    </ul>
+    <section>
+      <h1>Weitere Experimente</h1>
+      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
+    </section>
   </t:putAttribute>
 </t:insertDefinition>