commit 5a26f4258ea74c07de440df8b07e31a7b716bd54
parent 6cfa2f5e80547e9ab223423701d441851d2db8bd
Author: markseu <mark2011@mayberg.se>
Date: Mon, 9 Mar 2015 15:57:40 +0100
Core update (Yellow remix)
Diffstat:
13 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Yellow 0.4.28
-=============
+Yellow 0.5.1
+============
[](https://gitter.im/markseu/yellowcms)
[](http://datenstrom.se/yellow)
diff --git a/content/2-about/page.txt b/content/2-about/page.txt
@@ -1,6 +1,6 @@
---
Title: About
----
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna pizza. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
+---
+A new website.
+
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna pizza. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/media/downloads/yellow.pdf b/media/downloads/yellow.pdf
Binary files differ.
diff --git a/media/images/icon.png b/media/images/icon.png
Binary files differ.
diff --git a/system/config/config.ini b/system/config/config.ini
@@ -6,10 +6,10 @@ theme = default
template = default
language = en
+// timeZone = UTC
// serverScheme = http
// serverName = your.domain.name
// serverBase =
-// timeZone = UTC
imageLocation = /media/images/
pluginLocation = /media/plugins/
diff --git a/system/core/core-commandline.php b/system/core/core-commandline.php
@@ -5,7 +5,7 @@
// Command line core plugin
class YellowCommandline
{
- const Version = "0.4.5";
+ const Version = "0.5.1";
var $yellow; //access to API
var $content; //number of content pages
var $media; //number of media files
diff --git a/system/core/core-webinterface.css b/system/core/core-webinterface.css
@@ -1,4 +1,4 @@
-/* Yellow web interface 0.4.10 */
+/* Yellow web interface 0.5.1 */
.yellow-bar { position:relative; overflow:hidden; line-height:2em; margin-bottom:10px; }
.yellow-bar-left { display:block; float:left; }
@@ -44,9 +44,9 @@
margin:0; padding:4px 22px; min-width:7em;
display:inline-block;
background-color:#eaeaea; color:#333333;
- background-image:linear-gradient(to bottom, #ffffff, #e1e1e1);
+ background-image:linear-gradient(to bottom, #f8f8f8, #e1e1e1);
border:1px solid #bbb;
- border-color:#d1d1d1 #d1d1d1 #aaaaaa;
+ border-color:#c1c1c1 #c1c1c1 #aaaaaa;
border-radius:4px;
outline-offset:-2px;
font-size:0.9em; font-family:inherit; font-weight:normal; line-height:1;
diff --git a/system/core/core-webinterface.js b/system/core/core-webinterface.js
@@ -4,7 +4,7 @@
// Yellow main API
var yellow =
{
- version: "0.4.10",
+ version: "0.5.1",
action: function(text) { yellow.webinterface.action(text); },
onClick: function(e) { yellow.webinterface.hidePanesOnClick(yellow.toolbox.getEventElement(e)); },
onKeydown: function(e) { yellow.webinterface.hidePanesOnKeydown(yellow.toolbox.getEventKeycode(e)); },
@@ -311,7 +311,7 @@ yellow.webinterface =
var string = document.getElementById("yellow-pane-edit-page").value;
if(yellow.page.statusCode==424 || paneType=="new")
{
- action = string ? "create" : "";
+ action = "create";
} else {
action = string ? "edit" : "delete";
}
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.4.10";
+ const Version = "0.5.1";
var $yellow; //access to API
var $active; //web interface is active? (boolean)
var $userLoginFailed; //web interface login failed? (boolean)
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
- const Version = "0.4.28";
+ const Version = "0.5.1";
var $page; //current page
var $pages; //pages from file system
var $config; //configuration
@@ -26,10 +26,10 @@ class Yellow
$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());
$this->config->setDefault("serverBase", $this->toolbox->getServerBase());
- $this->config->setDefault("timeZone", $this->toolbox->getTimeZone());
$this->config->setDefault("imageLocation", "/media/images/");
$this->config->setDefault("pluginLocation", "/media/plugins/");
$this->config->setDefault("themeLocation", "/media/themes/");
diff --git a/system/plugins/markdownextra.php b/system/plugins/markdownextra.php
@@ -5,8 +5,8 @@
// Markdown extra plugin
class YellowMarkdownExtra
{
- const Version = "0.4.4";
- var $yellow; //access to API
+ const Version = "0.1.6";
+ var $yellow; //access to API
// Handle plugin initialisation
function onLoad($yellow)
@@ -25,9 +25,9 @@ class YellowMarkdownExtra
// Markdown extra parser
class YellowMarkdownExtraParser extends MarkdownExtraParser
{
- var $yellow; //access to API
- var $page; //access to page
- var $idAttributes; //id attributes
+ var $yellow; //access to API
+ var $page; //access to page
+ var $idAttributes; //id attributes
function __construct($yellow, $page)
{
diff --git a/system/snippets/sitename.php b/system/snippets/sitename.php
@@ -1,2 +1,2 @@
-<div class="sitename"><h1><a href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a></h1></div>
+<div class="sitename"><h1><a href="<?php echo $yellow->page->base."/" ?>"><i class="sitename-logo"></i><?php echo $yellow->page->getHtml("sitename") ?></a></h1></div>
<div class="sitename-banner"></div>
diff --git a/system/themes/default.css b/system/themes/default.css
@@ -1,5 +1,5 @@
-/* Default theme 0.4.5 */
-/* Author: Mark Seuffert */
+/* Default theme 0.4.6 */
+/* Designer: Datenstrom Sweden */
html, body, div, form, pre, span, tr, th, td { margin:0; padding:0; border:0; vertical-align:baseline; }
body {
@@ -18,12 +18,10 @@ a:hover { color:#07d; text-decoration:underline; }
a, img { border:none; text-decoration:none; }
.sitename h1 { margin-top:0.5em; margin-bottom:0em; font-size:2.2em; font-weight:500; }
.sitename h1 a { color:#111; text-decoration:none; }
-.navigation { margin-top:-0.5em; margin-bottom:1em; line-height:2em; }
-.navigation a { color:#717171; padding:0 0.3em; display:inline-block; }
+.navigation { margin-bottom:1em; line-height:2em; }
+.navigation a { color:#111; padding:0 0.3em; display:inline-block; }
.navigation a:hover { color:#07d; }
.navigation ul { margin:0 -0.3em; padding:0; list-style:none; }
-.navigation li a.active { color:#111; }
-.navigation li a.active:hover { color:#07d; }
.navigation li { display:inline; }
.pagination { margin:1em 0; }
.content h1 a:hover { text-decoration:none; }
@@ -35,7 +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; }
-.footer { margin-top:2em; }
+.footer { margin-top:1em; }
.footer a { color:#717171; }
.footer a:hover { color:#07d; text-decoration:underline; }
.left { float:left; margin:0 1em 0 0; }
