0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Core update (spring remix)

Browse source
This commit is contained in:
markseu 2015-03-17 21:09:56 +01:00
parent 8503e06659
commit 12c9c99785
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,4 +1,4 @@
Yellow 0.5.1
Yellow 0.5.2
============
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/markseu/yellowcms)
@ -10,7 +10,7 @@ How do I install this?
----------------------
1. [Download Yellow](https://github.com/markseu/yellowcms/archive/master.zip) and unzip it.
2. Copy all files to your web hosting.
3. Open your website in a browser.
3. Open your website, that's it.
How do I get started?
---------------------

2
system/config/config.ini
View file

@ -2,9 +2,9 @@
sitename = Yellow
author = Yellow
language = en
theme = default
template = default
language = en
// timeZone = UTC
// serverScheme = http

18
system/core/core.php
View file

@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
const Version = "0.5.1";
const Version = "0.5.2";
var $page; //current page
var $pages; //pages from file system
var $config; //configuration
@ -23,9 +23,9 @@ class Yellow
$this->plugins = new YellowPlugins();
$this->config->setDefault("sitename", "Yellow");
$this->config->setDefault("author", "Yellow");
$this->config->setDefault("language", "en");
$this->config->setDefault("theme", "default");
$this->config->setDefault("template", "default");
$this->config->setDefault("language", "en");
$this->config->setDefault("timeZone", $this->toolbox->getTimeZone());
$this->config->setDefault("serverScheme", $this->toolbox->getServerScheme());
$this->config->setDefault("serverName", $this->toolbox->getServerName());
@ -468,13 +468,13 @@ class YellowPage
$this->set("title", $this->yellow->toolbox->createTextTitle($this->location));
$this->set("sitename", $this->yellow->config->get("sitename"));
$this->set("author", $this->yellow->config->get("author"));
$this->set("language", $this->yellow->toolbox->findLanguageFromFile($this->fileName,
$this->yellow->config->get("contentDir"), $this->yellow->config->get("contentRootDir"),
$this->yellow->config->get("language")));
$this->set("theme", $this->yellow->toolbox->findNameFromFile($this->fileName,
$this->yellow->config->get("themeDir"), $this->yellow->config->get("theme"), ".css"));
$this->set("template", $this->yellow->toolbox->findNameFromFile($this->fileName,
$this->yellow->config->get("templateDir"), $this->yellow->config->get("template"), ".php"));
$this->set("language", $this->yellow->toolbox->findLanguageFromFile($this->fileName,
$this->yellow->config->get("contentDir"), $this->yellow->config->get("contentRootDir"),
$this->yellow->config->get("language")));
$this->set("modified", date("Y-m-d H:i:s", $this->yellow->toolbox->findModifiedFromFile($this->fileName)));
$this->set("parser", $this->yellow->config->get("parser"));
@ -568,14 +568,14 @@ class YellowPage
if(!$this->isHeader("Content-Type")) $this->setHeader("Content-Type", "text/html; charset=utf-8");
if(!$this->isHeader("Content-Modified")) $this->setHeader("Content-Modified", $this->getModified(true));
if(!$this->isHeader("Last-Modified")) $this->setHeader("Last-Modified", $this->getLastModified(true));
if(!is_file($this->yellow->config->get("themeDir").$this->get("theme").".css"))
{
$this->error(500, "Theme '".$this->get("theme")."' does not exist!");
}
if(!$this->yellow->text->isLanguage($this->get("language")))
{
$this->error(500, "Language '".$this->get("language")."' does not exist!");
}
if(!is_file($this->yellow->config->get("themeDir").$this->get("theme").".css"))
{
$this->error(500, "Theme '".$this->get("theme")."' does not exist!");
}
if(!is_object($this->parser))
{
$this->error(500, "Parser '".$this->get("parser")."' does not exist!");

6
system/themes/default.css
View file

@ -1,4 +1,4 @@
/* Default theme 0.4.6 */
/* Default theme 0.5.2 */
/* Designer: Datenstrom Sweden */
html, body, div, form, pre, span, tr, th, td { margin:0; padding:0; border:0; vertical-align:baseline; }
@ -12,6 +12,7 @@ body {
}
h1, h2, h3, h4, h5, h6 { color:#07d; font-weight:normal; }
hr { height:1px; background:#ddd; border:0; }
strong { font-weight:bold; }
code { font-size:1.1em; }
a { color:#07d; }
a:hover { color:#07d; text-decoration:underline; }
@ -23,7 +24,6 @@ a, img { border:none; text-decoration:none; }
.navigation a:hover { color:#07d; }
.navigation ul { margin:0 -0.3em; padding:0; list-style:none; }
.navigation li { display:inline; }
.pagination { margin:1em 0; }
.content h1 a:hover { text-decoration:none; }
.content img { max-width:100%; height:auto; }
.content form { margin:1em 0; }
@ -33,6 +33,7 @@ a, img { border:none; text-decoration:none; }
.content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
.content .flexible iframe { position:absolute; top:0; left:0; width:100%; height:100%; }
.content .toc { margin:0; padding:0; list-style:none; }
.pagination { margin:1em 0; }
.footer { margin-top:1em; }
.footer a { color:#717171; }
.footer a:hover { color:#07d; text-decoration:underline; }
@ -55,5 +56,4 @@ a, img { border:none; text-decoration:none; }
@media print {
body, h1, h2, h3, h4, h5, h6 { background-color:white; color:black; }
.page { border:none !important; }
.navigation, .navigationsub, .navigationtree, .footer { display:none !important; }
}