- - - pubdate; - $UmlautConverter = new UmlautConverter; - $pubdate = $UmlautConverter->convert($pubdate); - echo $pubdate; - ?> - -
- setBreaksEnabled(true) - ->text($post->content); - $UmlautConverter = new UmlautConverter; - $content = $UmlautConverter->convert($content); - echo $content; - ?> -
-- otherlinks->otherlb as $olb){ - ?> - - otherlink; - $UmlautConverter = new UmlautConverter; - $otherlink = $UmlautConverter->convert($otherlink); - echo $otherlink; - ?> - - = 3 && substr($article, -3) == ".md"){ + ArticleGenerator::newArticle("./articles/", $article); + } } - foreach($post->mainlink as $mainlink){ - ?> - - mainlink; - $UmlautConverter = new UmlautConverter; - $mainlink = $UmlautConverter->convert($mainlink); - echo $mainlink; - ?> - - -
- - - - - - -- - - pubdate; - $UmlautConverter = new UmlautConverter; - $pubdate = $UmlautConverter->convert($pubdate); - echo $pubdate; - ?> - -
- setBreaksEnabled(true) - ->text($post->content); - $UmlautConverter = new UmlautConverter; - $content = $UmlautConverter->convert($content); - echo $content; - ?> -
-- otherlinks->otherlb as $olb){ - ?> - - otherlink; - $UmlautConverter = new UmlautConverter; - $otherlink = $UmlautConverter->convert($otherlink); - echo $otherlink; - ?> - - mainlink as $mainlink){ - ?> - - mainlink; - $UmlautConverter = new UmlautConverter; - $mainlink = $UmlautConverter->convert($mainlink); - echo $mainlink; - ?> - - -
-
diff --git a/md/intro.md b/old/intro.md
similarity index 100%
rename from md/intro.md
rename to old/intro.md
diff --git a/xml/posts.xml b/old/posts.xml
similarity index 100%
rename from xml/posts.xml
rename to old/posts.xml
diff --git a/res/blog.css b/res/css/blog.css
similarity index 97%
rename from res/blog.css
rename to res/css/blog.css
index bc4b449..c5191ac 100644
--- a/res/blog.css
+++ b/res/css/blog.css
@@ -54,7 +54,7 @@ img{
right: 0;
float: center;
z-index: 40;
- background: #de3e0b;
+ background: #ff4415;
width: 100%;
box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
-moz-box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
@@ -78,7 +78,7 @@ img{
font-size: 14px;
line-height: 20px;
letter-spacing: 0.01px;
- color: #de3e0b;
+ color: #ff4415;
text-decoration: none;
}
section{
@@ -128,10 +128,10 @@ Usage: YOUR TEXT
height: 40px;
padding: 8px;
color: #FFFFFF;
- background-color: #de3e0b;
+ background-color: #ff4415;
border-width: 1px;
border-style: solid;
- border-color: #de3e0b;
+ border-color: #ff4415;
border-radius: 3px;
margin: 4px;
margin-bottom: 5px;
@@ -184,7 +184,7 @@ code{
}
.texttitle:hover{
- color: #de3e0b;
+ color: #ff4415;
}
.texttitlemono{
diff --git a/res/css/design.scss b/res/css/design.scss
new file mode 100644
index 0000000..b21313d
--- /dev/null
+++ b/res/css/design.scss
@@ -0,0 +1,195 @@
+/*
+The MIT License
+
+Copyright 2015 mmk.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+/*
+ Created on : Jun 10, 2015, 9:57:04 AM
+ Author : mmk2410
+*/
+
+$primary-color: #ff4415;
+$font-family: 'Roboto', sans-serif;
+
+body{
+ margin-right: 15%;
+ margin-left: 15%;
+ margin-bottom: 0px;
+ margin-top: 100px;
+ font-family: $font-family;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.01px;
+ background-color: #ffffff;
+ color: rgba(0, 0, 0, 0.87);
+}
+
+img{
+ max-width: 100%;
+ max-height: 400px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+
+.header{
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ float: center;
+ z-index: 40;
+ background: $primary-color;
+ width: 100%;
+ box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
+ -moz-box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
+ -webkit-box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
+ height: 60px;
+ padding-right: 0px;
+ padding-top: 0px;
+ white-space: nowrap;
+}
+.text{
+ font-family: $font-family;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.01px;
+ background-color: #ffffff;
+ z-index: 10;
+ color: rgba(0, 0, 0, 0.87);
+}
+.text a{
+ font-family: $font-family;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.01px;
+ color: $primary-color;
+ text-decoration: none;
+}
+section{
+ margin-bottom: 50px;
+}
+
+.title{
+ padding-left:15%;
+ height: 60px;
+ line-height: 60px;
+ display:inline-block;
+ text-decoration: none;
+ color: #FFFFFF;
+ vertical-align: middle;
+ font-size: 24px;
+ overflow-x: hidden;
+ max-width: 35%;
+}
+
+.home{
+ float: right;
+ padding-right: 15%;
+ height: 60px;
+ line-height: 60px;
+ vertical-align: middle;
+ color: #fff;
+ overflow-x: hidden;
+ font-size: 20px;
+ display: inline-block;
+ text-decoration: none;
+ max-width: 35%;
+}
+
+code{
+ background-color: #e8e6e6;
+ padding: 5px;
+}
+
+.texttitle{
+ font-family: $font-family;
+ font-weight: 500;
+ font-size: 20px;
+ color: rgb(33, 33, 33);
+ line-height: 24px;
+ letter-spacing: 0.05px;
+ text-decoration: none;
+}
+
+.texttitle:hover{
+ color: $primary-color;
+}
+
+.texttitlemono{
+ font-family: $font-family;
+ font-weight: 500;
+ font-size: 20px;
+ color: rgb(33, 33, 33);
+ line-height: 24px;
+ letter-spacing: 0.05px;
+ text-decoration: none;
+}
+
+.cc{
+ font-family: $font-family;
+ font-size: 12px;
+ line-height: 14px;
+ letter-spacing: 0.01px;
+ text-align: center;
+}
+
+.cc a{
+ font-family: 'Roboto', sans-serif;
+ font-size: 12px;
+ line-height: 14px;
+ letter-spacing: 0.01px;
+ color: rgba(0, 0, 0, 0.87);
+ text-decoration: none;
+}
+
+.cc a:hover{
+ text-decoration: underline;
+}
+
+.socialbar{
+ display: inline-block;
+ height: 68px;
+ margin-top: 10px;
+}
+
+.socialimg{
+ height: 40px;
+ display: inline-block;
+ padding-right: 5px;
+}
+
+@media screen and (max-width: 700px){
+ body {
+ margin-right: 40px;
+ margin-left: 20px;
+ }
+ .title{
+ padding-left: 10px;
+ max-width: 45%;
+ }
+ .home{
+ padding-right: 10px;
+ max-width: 45%;
+ }
+}
+
diff --git a/res/fb.png b/res/img/fb.png
similarity index 100%
rename from res/fb.png
rename to res/img/fb.png
diff --git a/res/gplus.svg b/res/img/gplus.svg
similarity index 100%
rename from res/gplus.svg
rename to res/img/gplus.svg
diff --git a/res/twttr.svg b/res/img/twttr.svg
similarity index 100%
rename from res/twttr.svg
rename to res/img/twttr.svg
diff --git a/res/umlautconverter.php b/res/js/app.js
similarity index 55%
rename from res/umlautconverter.php
rename to res/js/app.js
index 4b435d2..aa81e76 100644
--- a/res/umlautconverter.php
+++ b/res/js/app.js
@@ -1,48 +1,25 @@
-
- */
-class UmlautConverter
-{
- function convert($text)
- {
- $output = str_replace("ä","ä",$text);
- $output = str_replace("Ä","Ä",$output);
- $output = str_replace("ö","ö",$output);
- $output = str_replace("Ö","Ö",$output);
- $output = str_replace("ü","ü",$output);
- $output = str_replace("Ü","Ü",$output);
- $output = str_replace("ß","ß",$output);
- return $output;
- }
-}
\ No newline at end of file
diff --git a/res/php/ArticleGenerator.php b/res/php/ArticleGenerator.php
new file mode 100644
index 0000000..2c433e1
--- /dev/null
+++ b/res/php/ArticleGenerator.php
@@ -0,0 +1,64 @@
+
+ */
+class ArticleGenerator {
+
+ function newArticle($directory, $articlefile)
+ {
+
+ $article = file_get_contents($directory . $articlefile);
+
+ echo "$title
";
+ $article = substr($article, strpos($article, "\n") + 1);
+ }
+
+ if(substr($article, 0, 5) == "%DATE"){
+ $date = substr($article, 7, strpos($article, "\n") - 7);
+ echo "$date";
+ $article = substr($article, strpos($article, "\n") + 1);
+ }
+
+ //TODO Code detection
+
+ echo Parsedown::instance()
+ ->setBreaksEnabled(true)
+ ->text($article);
+
+ echo "
+ 
- 
+ 
- 
+ 