Sammelseite für HTML-Experimente eingebaut

diff --git a/src/main/webapp/WEB-INF/templates/maincontent.jsp b/src/main/webapp/WEB-INF/templates/maincontent.jsp
index c710ebb63955022d4bdf98509375084c8d30dc13..b8f6e3524f4574d5f8499febae02905f39b794fe 100644 (file)
--- a/src/main/webapp/WEB-INF/templates/maincontent.jsp
+++ b/src/main/webapp/WEB-INF/templates/maincontent.jsp
@@ -6,7 +6,7 @@
 <p>
   <strong>Lorem ipsum</strong> dolor <a href="${base}projects/typo.html">sit amet</a>, consectetur adipisicing elit, sed do
   eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-  ad minim veniam, quis nostrud <a href="#dort">exercitation</a> ullamco laboris nisi ut
+  ad minim veniam, quis nostrud <a href="${base}projects/html-experimente.html">exercitation</a> 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

diff --git a/src/main/webapp/WEB-INF/views/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp
index 98fbdb4f975f6df984deecc567534e14b38f1b6f..2161e9d4d0a89b43c8d95b90342f50c139b3426a 100644 (file)
--- a/src/main/webapp/WEB-INF/views/projects.jsp
+++ b/src/main/webapp/WEB-INF/views/projects.jsp
@@ -22,7 +22,7 @@
       <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"><a href="#" class="s">halbekunst</a></li>
+      <li class="s"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></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>

diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
index ac7cc06b862c38957c29c38be9cfbcca0a54984c..bcd68e89f5dacd591db8f770e84ed616d0190e99 100644 (file)
--- a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
@@ -34,9 +34,10 @@
         </ul>
       </li>
       <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="#" class="s">halbekunst</a></li>
+      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
       <li class="s sub off"><a href="#" class="s">accelerator</a></li>
       <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
     </ul>
   </t:putAttribute>
+  <t:putAttribute name="maincontent" value="Nearly empty" type="string"/>
 </t:insertDefinition>

diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
index 830abc1d1aaa2993c5a2978297c2be59eec851e1..a74f2426b097a77f747b480913224f9e3111a4d4 100644 (file)
--- a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
@@ -35,7 +35,7 @@
         </ul>
       </li>
       <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="#" class="s">halbekunst</a></li>
+      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
       <li class="s sub off"><a href="#" class="s">accelerator</a></li>
       <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
     </ul>

diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
index 682be34828f5a0e02b72a954b73484a1cdedcb66..84c9473602f12c189443a9626ae8a13e75c74745 100644 (file)
--- a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
@@ -35,7 +35,7 @@
         </ul>
       </li>
       <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="#" class="s">halbekunst</a></li>
+      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
       <li class="s sub off"><a href="#" class="s">accelerator</a></li>
       <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
     </ul>

diff --git a/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp b/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp
new file mode 100644 (file)
index 0000000..a273fb6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp
@@ -0,0 +1,40 @@
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@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="HTML-Experimente" type="string"/>
+  <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">
+    <ul>
+      <li>bla</li>
+      <li>blub</li>
+    </ul>
+  </t:putAttribute>
+</t:insertDefinition>

diff --git a/src/main/webapp/WEB-INF/views/projects/typo.jsp b/src/main/webapp/WEB-INF/views/projects/typo.jsp
index 789cb016e79b9e063e73548bc17120db6309cd26..a42ff91c06b96222805194e9c42f4b17df82f185 100644 (file)
--- a/src/main/webapp/WEB-INF/views/projects/typo.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/typo.jsp
@@ -26,7 +26,7 @@
       <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"><a href="#" class="s">halbekunst</a></li>
+      <li class="s"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
       <li class="s sub"><a href="#" class="s">accelerator</a></li>
       <li class="s"><strong class="s">Typography</strong></li>
     </ul>

diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index ceffeab46e452f206b2c3f01e9240bad3135d773..4ef2bbe54f285d34806a89d83ee6593781299386 100644 (file)
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -8,6 +8,7 @@ body
 .content
 {
   position: relative;
+  height: 100%;
   padding-bottom: 7.1875em; /** 115px (gemessene Gesamthöhe des Footers - mit Abstand und Margin) */
 }
 .cols_2 > .content