mikuli.cz

commit 8184ad8404437bce8e52805d95e62c6b8f1ecf8b
parent 915ca9ca7eb6177ad0abcf68becac2ad472c0277
Author: markseu <mark2011@mayberg.se>
Date:   Fri,  6 Feb 2015 10:42:02 +0100

Core update (Kanelbulle remix)

Diffstat:
M
README.md
 | 
2
+-
M
system/core/core-webinterface.css
 | 
5
+++--
M
system/core/core-webinterface.js
 | 
27
+++++++++++++++++----------
M
system/core/core.php
 | 
2
+-
M
system/themes/default.css
 | 
3
++-

5 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.4.27
+Yellow 0.4.28
 =============
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/markseu/yellowcms) 
 
diff --git a/system/core/core-webinterface.css b/system/core/core-webinterface.css
@@ -1,4 +1,4 @@
-/* Yellow web interface 0.4.2 */
+/* Yellow web interface 0.4.6 */
 
 .yellow-bar { position:relative; overflow:hidden; line-height:2em; margin-bottom:10px; }
 .yellow-bar-left { display:block; float:left; }
@@ -81,6 +81,7 @@
 #yellow-pane-login h1 { margin:0.5em 0.5em; }
 #yellow-pane-login p { margin:0.5em; text-align:right; }
 #yellow-pane-edit { }
-#yellow-pane-edit-page { margin:0; padding:5px; border:1px solid #bbb; resize:none; font-size:0.9em; }
+#yellow-pane-edit-page { margin:0; padding:5px; border:1px solid #bbb; outline:none; resize:none; font-size:0.9em; }
 #yellow-pane-edit-buttons { margin:8px 0; }
+#yellow-pane-edit-buttons input { margin-right:5px; }
 #yellow-pane-user { }
 \ No newline at end of file
diff --git a/system/core/core-webinterface.js b/system/core/core-webinterface.js
@@ -1,10 +1,10 @@
-// Copyright (c) 2013-2014 Datenstrom, http://datenstrom.se
+// Copyright (c) 2013-2015 Datenstrom, http://datenstrom.se
 // This file may be used and distributed under the terms of the public license.
 
 // Yellow main API
 var yellow =
 {
-	version: "0.4.5",
+	version: "0.4.6",
 	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)); },
@@ -63,6 +63,7 @@ yellow.webinterface =
 			case "new":		this.togglePane("yellow-pane-edit", "new"); break;
 			case "user":	this.togglePane("yellow-pane-user"); break;
 			case "send":	this.sendPane(this.paneId, this.paneType); break;
+			case "cancel":	this.hidePane(this.paneId); break;
 			case "logout":	yellow.toolbox.submitForm({"action":"logout"}); break;
 		}
 	},
@@ -122,6 +123,7 @@ yellow.webinterface =
 				"<textarea id=\"yellow-pane-edit-page\" name=\"rawdataedit\"></textarea>"+
 				"<div id=\"yellow-pane-edit-buttons\">"+
 				"<input id=\"yellow-pane-edit-send\" class=\"yellow-btn\" type=\"button\" onclick=\"yellow.action('send'); return false;\" value=\""+this.getText("EditButton")+"\" />"+
+				"<input id=\"yellow-pane-edit-cancel\" class=\"yellow-btn\" type=\"button\" onclick=\"yellow.action('cancel'); return false;\" value=\""+this.getText("CancelButton")+"\" />"+
 				"</div>"+
 				"</form>";
 		} else if(paneId == "yellow-pane-user") {
@@ -145,16 +147,21 @@ yellow.webinterface =
 				var string = paneType=="new" ? yellow.page.rawDataNew : yellow.page.rawDataEdit;
 				document.getElementById("yellow-pane-edit-page").value = string;
 			}
-			var key, className;
-			switch(this.getPaneAction(paneId, paneType))
+			var action = this.getPaneAction(paneId, paneType)
+			if(action)
 			{
-				case "create":	key = "CreateButton"; className = "yellow-btn yellow-btn-green"; break;
-				case "edit":	key = "EditButton"; className = "yellow-btn yellow-btn-yellow"; break;
-				case "delete":	key = "DeleteButton"; className = "yellow-btn yellow-btn-red"; break;
-				default:		key = "CancelButton"; className = "yellow-btn";
+				var key, className;
+				switch(action)
+				{
+					case "create":	key = "CreateButton"; className = "yellow-btn yellow-btn-green"; break;
+					case "edit":	key = "EditButton"; className = "yellow-btn yellow-btn-yellow"; break;
+					case "delete":	key = "DeleteButton"; className = "yellow-btn yellow-btn-red"; break;
+				}
+				document.getElementById("yellow-pane-edit-send").value = this.getText(key);
+				document.getElementById("yellow-pane-edit-send").className = className;
+			} else {
+				document.getElementById("yellow-pane-edit-send").style.display = "none";
 			}
-			document.getElementById("yellow-pane-edit-send").value = this.getText(key);
-			document.getElementById("yellow-pane-edit-send").className = className;
 		}
 	},
 	
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.27";
+	const Version = "0.4.28";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $config;			//configuration
diff --git a/system/themes/default.css b/system/themes/default.css
@@ -1,4 +1,5 @@
-/* Yellow default theme 0.4.5 */
+/* Default theme 0.4.5 */
+/* Author: Mark Seuffert */
 
 html, body, div, form, pre, span, tr, th, td { margin:0; padding:0; border:0; vertical-align:baseline; }
 body {