mikuli.cz

commit 409d4ae2d9e2e489bf83f0f05645cb2b2e04c639
parent 8911feeac3d73ad514c217607f4eadcb6884d5d8
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 15 Jun 2016 15:27:01 +0200

System update (theme remix)

Diffstat:
M
system/config/config.ini
 | 
2
++
M
system/plugins/core.php
 | 
12
+++++++-----
R
system/themes/icon.png -> system/themes/assets/icon.png
 | 
0

3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/system/config/config.ini b/system/config/config.ini
@@ -14,10 +14,12 @@ Theme: flatsite
 ImageLocation: /media/images/
 PluginLocation: /media/plugins/
 ThemeLocation: /media/themes/
+AssetLocation: /media/themes/assets/
 SystemDir: system/
 ConfigDir: system/config/
 PluginDir: system/plugins/
 ThemeDir: system/themes/
+AssetDir: system/themes/assets/
 SnippetDir: system/themes/snippets/
 TemplateDir: system/themes/templates/
 MediaDir: media/
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -39,10 +39,12 @@ class YellowCore
 		$this->config->setDefault("imageLocation", "/media/images/");
 		$this->config->setDefault("pluginLocation", "/media/plugins/");
 		$this->config->setDefault("themeLocation", "/media/themes/");
+		$this->config->setDefault("assetLocation", "/media/themes/assets/");
 		$this->config->setDefault("systemDir", "system/");
 		$this->config->setDefault("configDir", "system/config/");
 		$this->config->setDefault("pluginDir", "system/plugins/");
 		$this->config->setDefault("themeDir", "system/themes/");
+		$this->config->setDefault("assetDir", "system/themes/assets/");
 		$this->config->setDefault("snippetDir", "system/themes/snippets/");
 		$this->config->setDefault("templateDir", "system/themes/templates/");
 		$this->config->setDefault("mediaDir", "media/");
@@ -286,7 +288,7 @@ class YellowCore
 			} else if($location == "/".$this->config->get("robotsFile")) {
 				$fileName = $this->config->get("configDir").$this->config->get("robotsFile");
 			} else if($location == "/".$this->config->get("faviconFile")) {
-				$fileName = $this->config->get("themeDir").$this->config->get("siteicon").".png";
+				$fileName = $this->config->get("assetDir").$this->config->get("siteicon").".png";
 			}
 		}
 		if(empty($fileName)) $fileName = $this->lookup->findFileFromLocation($location);
@@ -795,16 +797,16 @@ class YellowPage
 					$this->yellow->config->get("themeLocation").$this->get("theme").".css";
 				$output .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"".htmlspecialchars($location)."\" />\n";
 			}
-			if(is_file($this->yellow->config->get("themeDir").$this->get("theme").".js"))
+			if(is_file($this->yellow->config->get("assetDir").$this->get("theme").".js"))
 			{
 				$location = $this->yellow->config->get("serverBase").
-					$this->yellow->config->get("themeLocation").$this->get("theme").".js";
+					$this->yellow->config->get("assetLocation").$this->get("theme").".js";
 				$output .= "<script type=\"text/javascript\" src=\"".htmlspecialchars($location)."\"></script>\n";
 			}
-			if(is_file($this->yellow->config->get("themeDir").$this->get("siteicon").".png"))
+			if(is_file($this->yellow->config->get("assetDir").$this->get("siteicon").".png"))
 			{
 				$location = $this->yellow->config->get("serverBase").
-					$this->yellow->config->get("themeLocation").$this->get("siteicon").".png";
+					$this->yellow->config->get("assetLocation").$this->get("siteicon").".png";
 				$contentType = $this->yellow->toolbox->getMimeContentType($location);
 				$output .= "<link rel=\"icon\" type=\"$contentType\" href=\"".htmlspecialchars($location)."\" />\n";
 				$output .= "<link rel=\"apple-touch-icon\" type=\"$contentType\" href=\"".htmlspecialchars($location)."\" />\n";
diff --git a/system/themes/icon.png b/system/themes/assets/icon.png
Binary files differ.