commit 4b5ef43f7f09250221ada2151fa8347953c07dc8
parent 433ea20b1bea5fb9f7cecc5d83e653542a5c0b7f
Author: markseu <mark2011@mayberg.se>
Date: Mon, 4 May 2015 13:11:33 +0200
Core update (espresso remix)
Diffstat:
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.5.5
+Yellow 0.5.6
============
[](http://datenstrom.se/yellow)
diff --git a/system/core/core-webinterface.php b/system/core/core-webinterface.php
@@ -5,7 +5,7 @@
// Web interface core plugin
class YellowWebinterface
{
- const Version = "0.5.4";
+ const Version = "0.5.6";
var $yellow; //access to API
var $active; //web interface is active? (boolean)
var $userLoginFailed; //web interface login failed? (boolean)
@@ -73,10 +73,10 @@ class YellowWebinterface
}
// Handle page extra HTML data
- function onExtra()
+ function onExtra($name)
{
$output = "";
- if($this->isActive())
+ if($this->isActive() && $name=="header")
{
$location = $this->yellow->config->getHtml("serverBase").$this->yellow->config->getHtml("pluginLocation");
$output .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$location}core-webinterface.css\" />\n";
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
- const Version = "0.5.5";
+ const Version = "0.5.6";
var $page; //current page
var $pages; //pages from file system
var $files; //files from file system
@@ -712,12 +712,13 @@ class YellowPage
}
// Return page extra HTML data
- function getExtra()
+ function getExtra($name = "")
{
$output = "";
+ if(empty($name)) list($name) = $this->yellow->getSnippetArgs();
foreach($this->yellow->plugins->plugins as $key=>$value)
{
- if(method_exists($value["obj"], "onExtra")) $output .= $value["obj"]->onExtra();
+ if(method_exists($value["obj"], "onExtra")) $output .= $value["obj"]->onExtra($name);
}
return $output;
}
diff --git a/system/themes/snippets/footer.php b/system/themes/snippets/footer.php
@@ -3,5 +3,6 @@
<a href="http://datenstrom.se/yellow">Made with Yellow</a>.
</div>
</div>
+<?php echo $yellow->page->getExtra("footer") ?>
</body>
</html>
\ No newline at end of file
diff --git a/system/themes/snippets/header.php b/system/themes/snippets/header.php
@@ -11,7 +11,7 @@
<title><?php echo $yellow->page->getHtml("titleHeader") ?></title>
<link rel="shortcut icon" href="<?php echo $yellow->config->get("serverBase").$yellow->config->get("imageLocation")."icon.png" ?>" />
<link rel="stylesheet" type="text/css" media="all" href="<?php echo $yellow->config->get("serverBase").$yellow->config->get("themeLocation").$yellow->page->get("theme").".css" ?>" />
-<?php echo $yellow->page->getExtra() ?>
+<?php echo $yellow->page->getExtra("header") ?>
</head>
<body>
<div class="page">
