mikuli.cz

commit be76890d5397365d67178c600011457a97e6e03b
parent 6c0a6ce6c8d4de738a3f5973b42f0dae8f4f768f
Author: markseu <mark2011@mayberg.se>
Date:   Thu, 17 Oct 2013 23:17:22 +0200

Core update (urban life remix)

Diffstat:
M
media/styles/default.css
 | 
4
++--
M
system/core/core.php
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media/styles/default.css b/media/styles/default.css
@@ -30,7 +30,7 @@ a:hover { color:#07d; }
 .content img { max-width:100%; height:auto; }
 .content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
 .content .flexible iframe { position:absolute; top:0; left:0; width:100%; height:100%; }
-.footer { margin-top:1em; padding-top:0.5em; border-top:1px solid #ddd; }
+.footer { margin-top:1em; border-top:1px solid #ddd; line-height:2em; }
 .left { float:left; margin:0 1em 0 0; }
 .center { display:block; margin:0 auto; }
 .right { float:right; margin:0 0 0 1em; }
@@ -45,7 +45,7 @@ a:hover { color:#07d; }
 }
 @media screen and (max-width:30em) { 
 	body { margin:0.5em; font-size:0.9em; }
-	.header h1, h1, h2 { font-size:1.3em;  }
+	.header h1, h1, h2 { font-size:1.3em; }
 	.header h1, .header, .navigation, .footer, .page { margin:0; padding:0; }
 }
 @media print {
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.1.19";
+	const Version = "0.1.20";
 	var $page;				//current page data
 	var $pages;				//current page tree from file system
 	var $toolbox;			//toolbox with helpers
@@ -446,7 +446,7 @@ class Yellow_Page
 				$this->parser = $this->yellow->plugins->plugins[$this->get("parser")]["obj"];
 				$this->parser->parse($this->getContent(true));
 				$location = $this->yellow->toolbox->getDirectoryLocation($this->getLocation());
-				$this->parser->textHtml = preg_replace("#<a(.*?)href=\"([^\/\"]+)\"(.*?)>#",
+				$this->parser->textHtml = preg_replace("#<a(.*?)href=\"(?!javascript:)([^\/\"]+)\"(.*?)>#",
 													   "<a$1href=\"$location$2\"$3>", $this->parser->textHtml);
 			}
 			foreach($this->yellow->plugins->plugins as $key=>$value)