From: Kai Moritz <kai@juplo.de>
Date: Tue, 11 Mar 2014 17:24:47 +0000 (+0100)
Subject: Kontakt-Seite überarbeitet
X-Git-Tag: thymeroot-2.0.0~101
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=8a8d3ae6b95417129d6a2559b9b0d9cdca617c91;p=website

Kontakt-Seite überarbeitet
---

diff --git a/src/main/webapp/WEB-INF/views/contact.jsp b/src/main/webapp/WEB-INF/views/contact.jsp
index d1c686cb..3f8675fe 100644
--- a/src/main/webapp/WEB-INF/views/contact.jsp
+++ b/src/main/webapp/WEB-INF/views/contact.jsp
@@ -3,7 +3,7 @@
 <%@page session="false" %>
 <%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
 <t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Contact" type="string" cascade="true"/>
+  <t:putAttribute name="title" value="Contact" 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}about.html">About</a></li>
@@ -24,11 +24,34 @@
       <li class="s"><strong class="s">Contact</strong></li>
     </ul>
   </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <h2>About Me</h2>
-    <h2>Address</h2>
-    <h2>Social Media</h2>
-    <h2><em>Übersetzung?!?</em> Jobportale</h2>
+  <t:putAttribute name="contentcontainer" type="string">
+    <div id="content" class="main pack cf">
+      <div class="p left">
+        <img class="p" src="${base}img/kai-moritz.jpg" alt="Portrait"/>
+      </div>
+      <article class="p right">
+        <header><h1><t:getAsString name="title"/></h1></header>
+        <h2>Address</h2>
+        <p>
+          Kai Moritz<br />
+          Zumsandestr. 29a<br />
+          48145 Münster
+        </p>
+        <h2>Email</h2>
+        <p><a href="mailto:kai@juplo.de">kai@juplo.de</a></p>
+        <h2>Phone</h2>
+        <p>+49 (0) 176 20 50 47 47</p>
+        <h2>Networking</h2>
+        <ul>
+          <li><a href="https://www.google.com/+KaiMoritz" title="Google+">www.google.com/+KaiMoritz</a></li>
+          <li><a href="https://www.xing.com/profile/Kai_Moritz" title="Xing">www.xing.com/profile/Kai_Moritz</a></li>
+        </ul>
+        <!--
+        <h2>About Me</h2>
+        <h2><em>Übersetzung?!?</em> Jobportale</h2>
+        -->
+      </article>
+    </div>
   </t:putAttribute>
   <t:putAttribute name="marginalcontent" type="string" value=""/>
 </t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index 0db9604d..6e84c619 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -12,12 +12,12 @@
   </t:putAttribute>
   <t:putAttribute name="contentcontainer" type="string">
     <div id="content" class="main">
-      <div class="pack cf">
-        <div class="left">
+      <div class="pack bg cf">
+        <div class="p left">
           <h2>hibernate4-maven-plugin</h2>
           <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="${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 culpa qui officia deserunt mollit anim id est laborum.</p>
         </div>
-        <div class="right">
+        <div class="p right">
           <h2>fix-swf</h2>
           <p>
             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
@@ -36,8 +36,8 @@
           culpa qui officia deserunt mollit anim id est laborum.
         </p>
       </div>
-      <div class="pack cf">
-        <div class="right">
+      <div class="pack bg cf">
+        <div class="p right">
           <h2>jquery.openx</h2>
           <p>
             Duis aute irure dolor in
@@ -46,7 +46,7 @@
             culpa qui officia deserunt mollit anim id est laborum.
           </p>
         </div>
-        <div class="left">
+        <div class="p left">
           <h2>Regex-Lab</h2>
           <p>
             Excepteur sint occaecat cupidatat non proident, sunt in
@@ -55,7 +55,7 @@
         </div>
       </div>
       <div class="pack cf">
-        <div class="left">
+        <div class="p left">
           <h2>jquery.openx</h2>
           <p>
             Duis aute irure dolor in
@@ -64,7 +64,7 @@
             culpa qui officia deserunt mollit anim id est laborum.
           </p>
         </div>
-        <div class="right">
+        <div class="p right">
           <h2>Regex-Lab</h2>
           <p>
             Excepteur sint occaecat cupidatat non proident, sunt in
diff --git a/src/main/webapp/img/kai-moritz.jpg b/src/main/webapp/img/kai-moritz.jpg
new file mode 100644
index 00000000..c1815a1b
Binary files /dev/null and b/src/main/webapp/img/kai-moritz.jpg differ
diff --git a/src/main/webapp/less/base/packs.less b/src/main/webapp/less/base/packs.less
index 30cceacd..0936a2ff 100644
--- a/src/main/webapp/less/base/packs.less
+++ b/src/main/webapp/less/base/packs.less
@@ -2,25 +2,39 @@
 {
   overflow: hidden;
 }
-.pack > .left,
-.pack > .right
+.pack > .p.left,
+.pack > .p.right
 {
-  width: 42%;
-  padding: 0 3% 999em 3%;
+  width: 48%;
+  padding: 0 0 999em 0;
   margin: 0 0 -999em 0;
+}
+.pack.bg > .p.left,
+.pack.bg > .p.right
+{
+  width: 42%;
+  padding-left: 3%;
+  padding-right: 3%;
   background-color: @sehrhell;
 }
-.pack > .left
+.pack > .p.left
 {
   float: left;
 }
-.pack > .right
+.pack > .p.right
 {
   float: right;
 }
+.pack > .p img.p
+{
+  width: 91.9118%;
+}
 .single
 {
   padding: 3%;
   margin: 3% 0;
+}
+.single.bg
+{
   background-color: @sehrhell;
 }