]> juplo.de Git - website/commitdiff
About-Bereich hinzugefügt
authorKai Moritz <kai@juplo.de>
Wed, 22 Jan 2014 17:49:33 +0000 (18:49 +0100)
committerKai Moritz <kai@juplo.de>
Tue, 19 Jan 2016 16:45:41 +0000 (17:45 +0100)
22 files changed:
src/main/webapp/WEB-INF/templates/footer.jsp
src/main/webapp/WEB-INF/templates/navigation.jsp
src/main/webapp/WEB-INF/templates/test/navigation.jsp
src/main/webapp/WEB-INF/views/about.jsp [new file with mode: 0644]
src/main/webapp/WEB-INF/views/about/professions.jsp [new file with mode: 0644]
src/main/webapp/WEB-INF/views/about/references.jsp [new file with mode: 0644]
src/main/webapp/WEB-INF/views/blog.jsp
src/main/webapp/WEB-INF/views/blog/article.jsp
src/main/webapp/WEB-INF/views/blog/comments.jsp
src/main/webapp/WEB-INF/views/contact.jsp
src/main/webapp/WEB-INF/views/projects.jsp
src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
src/main/webapp/WEB-INF/views/projects/html-experimente.jsp
src/main/webapp/WEB-INF/views/projects/typo.jsp
src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü-aber-marginalinhalt.jsp
src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü.jsp
src/main/webapp/less/base/typo.less
src/main/webapp/less/phone/footer.less
src/main/webapp/less/phone/layout.less
src/main/webapp/less/tablet/layout.less

index 25d4ea3a596f9c6bf149639d7dfc2315a39d4caf..7191e62acb9a1977763708e3ad4b3c9b242953ca 100644 (file)
@@ -4,5 +4,5 @@
 <%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
 <s:url var="base" value="/" />
 <li class="f" id="copyright">© <strong>mo</strong> 2013</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>
+<li class="f about"><a class="f" href="${base}about.html">About</a></li>
index 42ad581e2c6b16df15c8fcdd2c4480e5ecd0cbd4..e878bf8944ffe3ecaab26df72fc3d711ec693eb5 100644 (file)
@@ -8,4 +8,5 @@
 <ul id="menu" class="cf">
   <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">Projects</a></li>
+  <li class="m about"><a href="${base}about.html" class="m">About</a></li>
 </ul>
index a21a3fe7a7f5a74fa4207cb9a897bd96ae00c7dc..679a32e23905ba2826ad4e6516b15f8e51977c8e 100644 (file)
@@ -8,6 +8,7 @@
 <ul id="menu" class="cf">
   <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>
+  <li class="m about"><a href="${base}about.html" class="m">About</a></li>
 </ul>
 <h2 class="nav submenu">
   <span class="s">Submenu for section</span>
diff --git a/src/main/webapp/WEB-INF/views/about.jsp b/src/main/webapp/WEB-INF/views/about.jsp
new file mode 100644 (file)
index 0000000..8d72835
--- /dev/null
@@ -0,0 +1,78 @@
+<%@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="About" type="string"/>
+  <t:putAttribute name="breadcrumb">
+    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
+    <li class="b"><strong class="b">About</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" class="s active cf">
+      <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">Projects</a></li>
+      <li class="m about"><strong class="m">About</strong></li>
+    </ul>
+    <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">About</strong></h2>
+    <ul id="submenu">
+      <li class="s sub"><a href="${base}about/professions.html" class="s">Professions</a></li>
+      <li class="s sub"><a href="${base}about/references.html" class="s">References</a></li>
+      <li class="s "><a href="${base}about/contact.html" class="s">Contact</a></li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="maincontent" type="string">
+    <p>
+      <span class="logo">juplo</span> is the place, where I collect and share
+      my more or less private projects.
+      It is a lab for experiments, that help me to do my job as a freelancer
+      at the desired level of quality.
+      Here, I can play with all the fancy new stuff, that might be a little
+      bit to much bleeding edge, to be used on a production site of a paying
+      client.
+    </p>
+    <p>
+      I decided to share all this stuff, because I am always learning a lot
+      from the internet-community.
+      I wanted to give back a little and try to help and teach others, as I
+      was helped and teached.
+      Also, this is a good oportunity, to show what I am doing and to do a 
+      little self-publicity...
+    </p>
+    <p>
+      <span class="logo">juplo</span> mainly consists of two parts:
+    </p>
+    <ul>
+      <li>
+        In the <a href="${base}blog.html">Blog</a>, I summarize, how I solved
+        some every-day problems, other people might stumble across too.
+        I am introducing new projects there and announcing new versions and/or
+        bugfixes to older projects.
+      </li>
+      <li>
+        The other part of the site is the
+        <a href="${base}projects.html">Projects</a>-section.
+        This is where I am hosting all projects, that I have made publicy
+        available.
+      </li>
+    </ul>
+    <p>
+      If you want to hire me, you can find out more on the
+      <a href="${base}contact.html">Contact</a>-page.
+      If you are not yet sure, if you want to hire me, you might be
+      interessted in
+      <a href="${base}professions.html">what I can do for you</a>, or 
+      <a href="${base}references.html">what I have already done for others</a>.
+    </p>
+  </t:putAttribute>
+  <t:putAttribute name="marginalcontent" type="string" value=""/>
+  <t:putAttribute name="footer" type="string">
+    <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
+    <li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
+    <li class="f about"><strong class="f">About</strong></li>
+  </t:putAttribute>
+</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/about/professions.jsp b/src/main/webapp/WEB-INF/views/about/professions.jsp
new file mode 100644 (file)
index 0000000..7a419d5
--- /dev/null
@@ -0,0 +1,45 @@
+<%@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="Professions" 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>
+    <li class="b"><strong class="b">Professions</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" class="s active cf">
+      <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">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
+    </ul>
+    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
+    <ul id="submenu">
+      <li class="s sub">
+        <strong class="s">Professions</strong>
+        <ul class="s active">
+          <li class="s"><a href="${base}about/web-engineering.html" class="s">Web-Engineering</a></li>
+          <li class="s"><a href="${base}about/spring-framework.html" class="s">Spring Framework</a></li>
+          <li class="s"><a href="${base}about/.html" class="s"></a></li>
+          <li class="s"><a href="${base}about/responsive-web-design.html" class="s">Responsive Webdesign</a></li>
+          <li class="s"><a href="${base}about/web-ui-esign.html" class="s">WEB-UI-Design</a></li>
+          <li class="s"><a href="${base}about/seo.html" class="s">SEO</a></li>
+        </ul>
+      </li>
+      <li class="s sub off"><a href="${base}about/references.html" class="s">References</a></li>
+      <li class="s off"><a href="${base}about/contact.html" class="s">Contact</a></li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="maincontent" type="string">
+    <p>
+      <em>TODO</em>
+    </p>
+  </t:putAttribute>
+  <t:putAttribute name="marginalcontent" type="string" value=""/>
+</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/about/references.jsp b/src/main/webapp/WEB-INF/views/about/references.jsp
new file mode 100644 (file)
index 0000000..e495abb
--- /dev/null
@@ -0,0 +1,43 @@
+<%@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="References" 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>
+    <li class="b"><strong class="b">References</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" class="s active cf">
+      <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">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
+    </ul>
+    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
+    <ul id="submenu">
+      <li class="s sub off"><a href="${base}about/professions.html" class="s">Professions</a></li>
+      <li class="s sub">
+        <strong class="s">References</strong>
+        <ul class="s active">
+          <li class="s sub"><a href="${base}about/references/coolibri.html" class="s">coolibri.de</a></li>
+          <li class="s"><a href="${base}about/references/hibernate4-maven-plugin.html" class="s">hibernate4-maven-plugin</a></li>
+          <li class="s sub"><a href="${base}about/.html" class="s"></a></li>
+          <li class="s sub"><a href="${base}about/.html" class="s"></a></li>
+        </ul>
+      </li>
+      <li class="s off"><a href="${base}about/contact.html" class="s">Contact</a></li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="maincontent" type="string">
+    <p>
+      <em>TODO</em>
+    </p>
+  </t:putAttribute>
+  <t:putAttribute name="marginalcontent" type="string" value=""/>
+</t:insertDefinition>
index 3cb963a6856c598be39f07053bfa6c3cd0697f8b..1aa6c605928dbf6abbb0954af37bd934efe73ad7 100644 (file)
@@ -16,6 +16,7 @@
     <ul id="menu" class="cf">
       <li class="m blog"><strong class="m">Blog</strong></li>
       <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
   </t:putAttribute>
   <t:putAttribute name="maincontent" type="string">
index 66927f74238b40c0951f9299c7e05f3b09347a11..55058fe56e5770694617bcb8e8ba60168ffd96c3 100644 (file)
@@ -16,6 +16,7 @@
     <ul id="menu" class="cf">
       <li class="m blog"><strong class="m">Blog</strong></li>
       <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
   </t:putAttribute>
   <t:putAttribute name="maincontent" type="string">
index aab1e618fcda781505238788c379f820e74da403..1871c3a17ace14ab6350f99fd6210062bafcccce 100644 (file)
@@ -16,6 +16,7 @@
     <ul id="menu" class="cf">
       <li class="m blog"><strong class="m">Blog</strong></li>
       <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
   </t:putAttribute>
   <t:putAttribute name="maincontent" type="string">
index c9d72f56cd9b8f3ee827794504997f5b0da9ebfb..39d19fd2fa94c0c57722a1f82c4eb5fe113cb138 100644 (file)
@@ -4,12 +4,32 @@
 <%@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="ONECOLUMN">
+<t:insertDefinition name="BASEPAGE">
   <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>
     <li class="b"><strong class="b">Contact</strong></li>
   </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" value="TODO..."/>
+  <t:putAttribute name="navigation" type="string">
+    <h1 class="nav">Navigation</h1>
+    <h2 class="nav menu">Section-Menu</h2>
+    <ul id="menu" class="s active cf">
+      <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">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
+    </ul>
+    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
+    <ul id="submenu">
+      <li class="s sub"><a href="${base}professions.html" class="s">Professions</a></li>
+      <li class="s sub"><a href="${base}references.html" class="s">References</a></li>
+      <li class="s "><strong class="s">Contact</strong></li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="maincontent" type="string">
+    <p>
+      <em>TODO</em>
+    </p>
+  </t:putAttribute>
   <t:putAttribute name="marginalcontent" type="string" value=""/>
 </t:insertDefinition>
index 97244c0f55f12636b6eb664e519efb449a57f023..d04d2e7b649fc7e7ac98ac5b5d2e3f0715765df7 100644 (file)
@@ -16,6 +16,7 @@
     <ul id="menu" class="s active cf">
       <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
       <li class="m projects"><strong class="m">Projects</strong></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">Projects</strong></h2>
     <ul id="submenu">
index aa1fc3c1d71af37469a1705199f53dca948d973b..aaee718e3c12e5680ceb0ac90547ac608b2ccf67 100644 (file)
@@ -17,6 +17,7 @@
     <ul id="menu" class="cf">
       <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>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
index c46f813d903221ff307b7793b02ffda7aa892dd7..d3400be3492537efc7be7e59b9637de4f5dcadec 100644 (file)
@@ -18,6 +18,7 @@
     <ul id="menu" class="cf">
       <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>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
index d4490e8bab4e541d91ad418da8ae644f846faaf4..5ceca69efbd3eb41c4ea6104aa6e05971d18450c 100644 (file)
@@ -18,6 +18,7 @@
     <ul id="menu" class="cf">
       <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>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
index 58d43d2eb4c396cc3abd6fb02b7ce2c32bfb94fe..ecce5832f81ff72056d67ca3dd758e50488a4beb 100644 (file)
@@ -17,6 +17,7 @@
     <ul id="menu" class="cf">
       <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>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
index b9092a6d21225b7523aab2abfe8294b66aae200a..48bf69aa96875fd97ce1fa3b876179336c750cf2 100644 (file)
@@ -17,6 +17,7 @@
     <ul id="menu" class="cf">
       <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>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
index c3605f5c3351e20c1fc4a0ceeaaf1fa14d0025f1..b164cd3f0d01b00c8cd34421e0a726d357148859 100644 (file)
@@ -13,6 +13,7 @@
     <ul id="menu" class="cf">
       <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">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
   </t:putAttribute>
   <t:putAttribute name="maincontent" type="string">
index dcfc3857d45d10df3a4a38983834e80d66c2249f..64fb1d198d5158f874f75c51b4feb92a744b9ea7 100644 (file)
@@ -13,6 +13,7 @@
     <ul id="menu" class="cf">
       <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">Projects</a></li>
+      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
     </ul>
   </t:putAttribute>
   <t:putAttribute name="maincontent" type="string">
index 4516a9c5594fad240b9c6d5256ffc9448045e9a9..48ffdc78a90cca17e0e03818b47a5b90b37a1bec 100644 (file)
@@ -130,3 +130,8 @@ a:visited
   border-bottom: 1px dotted @nochdunkler;
 }
 
+.logo
+{
+  .bpreplay;
+  color: @normal;
+}
index 16d43ed96e45b7370209d5058beeb20a031d6554..01a021a8fc2123b48072b369053f82951b0b88d8 100644 (file)
@@ -3,6 +3,10 @@
   position: static;
   border-style: none;
 }
+#footer > #footerlinks > li.about
+{
+  display: none;
+}
 #footer > #footerlinks > li.f
 {
   color: @hintergrund;
@@ -22,7 +26,7 @@
   width: auto;
   font-size: 137.5%;
   margin: 0;
-  @media (max-width: 250px)
+  @media (max-width: 229px)
   {
     color: @schrift;
     flow: none;
index bedb016e9e5534ba6879897a9d6e50c02ee2b2e1..405aa5ff6783e3e44217ece800381bb0bd8ef8cb 100644 (file)
@@ -60,6 +60,10 @@ body
 #menu > li.m
 {
   float: left;
+  @media (max-width: 359px)
+  {
+    float: none;
+  }
   list-style-type: none;
   padding: .25em 1em 0 0;
 }
index 57cb233d4e3447e26420a4cf49230b6becc33a67..3d9787fa5aa5d27c9d80fb019ae43cfff0c2bf14 100644 (file)
@@ -116,6 +116,10 @@ body.nomenu
   @media (max-width: @maxsmallertablet)
   {
     margin-left: 17.5em;
+    #menu > li.about
+    {
+      display: inline-block;
+    }
   }
   width: auto;
 }
@@ -136,6 +140,10 @@ body.nomenu
     right: 1em;
   }
 }
+#menu > li.about
+{
+  display: none;
+}
 #menu > li.m
 {
   @media (max-width: @maxsmalltablet)