commit f0b35969fa4dcc296692773465b28e30ff57cee3
parent b009bc4c3ea790c3db961ac10ca22c463bd61404
Author: markseu <mark2011@mayberg.se>
Date: Thu, 5 Dec 2013 23:30:45 +0100
Code cleanup (pepparkaka remix)
Diffstat:
7 files changed, 122 insertions(+), 108 deletions(-)
diff --git a/content/1-home/page.txt b/content/1-home/page.txt
@@ -3,6 +3,6 @@ Title: Home
---
Yes, your Yellow installation works!
You can now [edit this page](@pageedit) or use your favorite text editor.
-Information for web designers are in the [documentation](https://github.com/markseu/yellowcms-extensions/blob/master/documentation/README.md).
+That’s it. For more information see [Yellow documentation](https://github.com/markseu/yellowcms-extensions/blob/master/documentation/README.md).
Have fun making your website.
\ No newline at end of file
diff --git a/media/images/icon.png b/media/images/icon.png
Binary files differ.
diff --git a/system/config/textenglish.ini b/system/config/textenglish.ini
@@ -12,7 +12,6 @@ webinterfaceLoginButton = Login
webinterfaceSaveButton = Save
webinterfaceEdit = Edit
webinterfaceShow = Show
-webinterfaceUser = User
webinterfaceUserLogout = Logout
webinterface424Title = New page
webinterface424Text = Write text here
diff --git a/system/core/core-webinterface.css b/system/core/core-webinterface.css
@@ -1,9 +1,9 @@
-/* Yellow web interface 0.1.3 */
+/* Yellow web interface 0.2.1 */
.yellow-bar { position:relative; overflow:hidden; line-height:2.0em; }
-.yellow-barleft { display:block; float:left; }
-.yellow-barleft a { margin-right:1em; }
-.yellow-barright { display:block; float:right; }
+.yellow-bar-left { display:block; float:left; }
+.yellow-bar-left a { margin-right:1em; }
+.yellow-bar-right { display:block; float:right; }
.yellow-pane {
position:absolute; display:none; z-index:10;
@@ -17,7 +17,7 @@
.yellow-pane p { margin:0.5em; }
.yellow-pane ul { list-style:none; margin:0 0.5em; padding:0; }
.yellow-pane div { overflow:hidden; }
-.yellow-panebubble { }
+.yellow-pane-bubble { }
.yellow-btn {
margin:0; padding:4px 22px;
@@ -40,17 +40,17 @@
}
.yellow-btn-warn:active { box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.3); }
-#yellow-panelogin { }
-#yellow-panelogin h1 { margin:0.5em 0.5em; }
-#yellow-panelogin p { margin:0.5em; text-align:right; }
-#yellow-paneedit { }
-#yellow-paneedit #yellow-edittext { margin:0; padding:5px; border:1px solid #bbb; resize:none; font-size:0.9em }
-#yellow-paneedit #yellow-editinfo { margin:0; padding:5px; border:1px solid #bbb; display:none; }
-#yellow-paneedit #yellow-editbuttons { margin:5px 0; }
-#yellow-paneshow { min-width:20em; overflow:auto; }
-#yellow-paneuser { }
+#yellow-pane-login { }
+#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 #yellow-edit-text { margin:0; padding:5px; border:1px solid #bbb; resize:none; font-size:0.9em }
+#yellow-pane-edit #yellow-edit-info { margin:0; padding:5px; border:1px solid #bbb; display:none; }
+#yellow-pane-edit #yellow-edit-buttons { margin:5px 0; }
+#yellow-pane-show { min-width:20em; overflow:auto; }
+#yellow-pane-user { }
-/* Font icons from Fontawesome */
+.yellow-icon { width:16px; height:16px; display:inline-block; background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAA4UlEQVQoFZWQPQrCQBBGv80qwfyIIoKFhYWl1/EGFl5A7EyhIFgIgnZewpt4A5uAgoWIS0SMiRlJlqzZJtPMtzPvMbAsPqNUGaXoBC4tVJQL9gIsROQj2Kdzc4hqH2Ipsb8LTTge6lvwzo+w4O7AJExBFYI5ohtgwp7Q0hzBeEFsKGelCvEFYk2r2hi8B2cK4SEOMpg6K3yri/YJvIWPD9xxHeTpJKsXaPmAWFHnXYgZBbWKAvA8pMz7qML00glxWOTkRCfwRrpmXHIy6ATDyoTMlLjul3JLXdRd0HFyVlr4AhXBLDxuCuBRAAAAAElFTkSuQmCC); }
@font-face { font-family:'FontAwesome'; font-style:normal; font-weight:normal; src:url('core-fontawesome.woff'); }
[class*="yellow-icon-"] {
diff --git a/system/core/core-webinterface.js b/system/core/core-webinterface.js
@@ -4,11 +4,12 @@
// Yellow main API
var yellow =
{
- version: "0.2.1",
+ version: "0.2.2",
onClick: function(e) { yellow.webinterface.hidePanesOnClick(yellow.toolbox.getEventElement(e)); },
onKeydown: function(e) { yellow.webinterface.hidePanesOnKeydown(yellow.toolbox.getEventKeycode(e)); },
onResize: function() { yellow.webinterface.resizePanes(); },
onShow: function(id) { yellow.webinterface.showPane(id); },
+ onLogout: function() { yellow.toolbox.submitForm({"action":"logout"}); },
webinterface:{}, page:{}, pages:{}, toolbox:{}, config:{}, text:{}
}
@@ -38,15 +39,14 @@ yellow.webinterface =
if(yellow.config.userEmail)
{
yellow.toolbox.insertBefore(this.createBar("yellow-bar"), body.firstChild);
- yellow.toolbox.insertAfter(this.createPane("yellow-paneedit"), body.firstChild);
- yellow.toolbox.insertAfter(this.createPane("yellow-paneshow"), body.firstChild);
- yellow.toolbox.insertAfter(this.createPane("yellow-paneuser"), body.firstChild);
- yellow.toolbox.setText(document.getElementById("yellow-username"), yellow.config.userName);
- yellow.toolbox.setText(document.getElementById("yellow-edittext"), yellow.page.rawData);
+ yellow.toolbox.insertAfter(this.createPane("yellow-pane-edit"), body.firstChild);
+ yellow.toolbox.insertAfter(this.createPane("yellow-pane-show"), body.firstChild);
+ yellow.toolbox.insertAfter(this.createPane("yellow-pane-user"), body.firstChild);
+ yellow.toolbox.setText(document.getElementById("yellow-edit-text"), yellow.page.rawData);
} else {
yellow.toolbox.insertBefore(this.createBar("yellow-bar", true), body.firstChild);
- yellow.toolbox.insertAfter(this.createPane("yellow-panelogin", true), body.firstChild);
- this.showPane("yellow-panelogin");
+ yellow.toolbox.insertAfter(this.createPane("yellow-pane-login", true), body.firstChild);
+ this.showPane("yellow-pane-login");
}
clearInterval(this.intervalId);
}
@@ -63,13 +63,13 @@ yellow.webinterface =
{
var location = yellow.config.serverBase+yellow.config.pluginLocation;
elementBar.innerHTML =
- "<div class=\"yellow-barleft\">"+
- "<a href=\"http://datenstrom.se/yellow/\" target=\"_blank\"><img src=\""+location+"core-webinterface.png\" width=\"16\" height=\"16\"> Yellow</a>"+
- "<a href=\"#\" onclick=\"yellow.onShow('yellow-paneedit'); return false;\">"+this.getText("Edit")+"</a>"+
- "<a href=\"#\" onclick=\"yellow.onShow('yellow-paneshow'); return false;\">"+this.getText("Show")+"</a>"+
+ "<div class=\"yellow-bar-left\">"+
+ "<a href=\"http://datenstrom.se/yellow/\" target=\"_blank\"><i class=\"yellow-icon\"></i> Yellow</a>"+
+ "<a href=\"#\" onclick=\"yellow.onShow('yellow-pane-edit'); return false;\">"+this.getText("Edit")+"</a>"+
+ "<a href=\"#\" onclick=\"yellow.onShow('yellow-pane-show'); return false;\">"+this.getText("Show")+"</a>"+
"</div>"+
- "<div class=\"yellow-barright\">"+
- "<a href=\"#\" onclick=\"yellow.onShow('yellow-paneuser'); return false;\" id=\"yellow-username\">"+this.getText("User")+"</a>"+
+ "<div class=\"yellow-bar-right\">"+
+ "<a href=\"#\" onclick=\"yellow.onShow('yellow-pane-user'); return false;\" id=\"yellow-username\">"+yellow.config.userName+" <i class=\"yellow-icon-caret-down\"></i></a>"+
"</div>";
}
return elementBar;
@@ -80,33 +80,33 @@ yellow.webinterface =
{
if(yellow.debug) console.log("yellow.webinterface.createPane id:"+id);
var elementPane = document.createElement("div");
- elementPane.className = simple ? "yellow-pane" : "yellow-pane yellow-panebubble";
+ elementPane.className = simple ? "yellow-pane" : "yellow-pane yellow-pane-bubble";
elementPane.setAttribute("id", id);
elementPane.style.display = "none";
var elementDiv = document.createElement("div");
- elementDiv.setAttribute("id", id+"content");
- if(id == "yellow-panelogin")
+ elementDiv.setAttribute("id", id+"-content");
+ if(id == "yellow-pane-login")
{
elementDiv.innerHTML =
"<h1>"+this.getText("LoginText")+"</h1>"+
- "<form method=\"post\" name=\"formlogin\">"+
- "<input type=\"hidden\" name=\"action\" value=\"login\"/>"+
+ "<form method=\"post\">"+
+ "<input type=\"hidden\" name=\"action\" value=\"login\" />"+
"<p><label for=\"email\">"+this.getText("LoginEmail")+"</label> <input name=\"email\" id=\"email\" maxlength=\"64\" /></p>"+
"<p><label for=\"password\">"+this.getText("LoginPassword")+"</label> <input type=\"password\" name=\"password\" id=\"password\" maxlength=\"64\" /></p>"+
- "<p><input class=\"yellow-btn\" type=\"submit\" value=\""+this.getText("LoginButton")+"\"/></p>"+
+ "<p><input class=\"yellow-btn\" type=\"submit\" value=\""+this.getText("LoginButton")+"\" /></p>"+
"</form>";
- } else if(id == "yellow-paneedit") {
+ } else if(id == "yellow-pane-edit") {
elementDiv.innerHTML =
"<p>Editing page...</p>"+
- "<form method=\"post\" name=\"formeditor\">"+
- "<input type=\"hidden\" name=\"action\" value=\"edit\"/>"+
- "<textarea id=\"yellow-edittext\" name=\"rawdata\"></textarea>"+
- "<div id=\"yellow-editinfo\"/></div>"+
- "<div id=\"yellow-editbuttons\">"+
- "<input class=\"yellow-btn\" type=\"submit\" value=\""+this.getText("SaveButton")+"\"/>"+
+ "<form method=\"post\">"+
+ "<input type=\"hidden\" name=\"action\" value=\"edit\" />"+
+ "<textarea id=\"yellow-edit-text\" name=\"rawdata\"></textarea>"+
+ "<div id=\"yellow-edit-info\" /></div>"+
+ "<div id=\"yellow-edit-buttons\">"+
+ "<input class=\"yellow-btn\" type=\"submit\" value=\""+this.getText("SaveButton")+"\" />"+
"</div>"+
"</form>";
- } else if(id == "yellow-paneshow") {
+ } else if(id == "yellow-pane-show") {
elementDiv.innerHTML = "<p>Showing files...</p>";
var elementUl = document.createElement("ul");
for(var n in yellow.pages)
@@ -119,13 +119,10 @@ yellow.webinterface =
elementUl.appendChild(elementLi);
}
elementDiv.appendChild(elementUl);
- } else if(id == "yellow-paneuser") {
+ } else if(id == "yellow-pane-user") {
elementDiv.innerHTML =
"<p>"+yellow.config.userEmail+"</p>"+
- "<form method=\"post\" name=\"formlogout\">"+
- "<input type=\"hidden\" name=\"action\" value=\"logout\"/>"+
- "<p><a href=\"javascript:document.formlogout.submit();\">"+this.getText("UserLogout")+"</a></p> "+
- "</form>";
+ "<p><a href=\"#\" onclick=\"yellow.onLogout(); return false;\">"+this.getText("UserLogout")+"</a></p>";
}
elementPane.appendChild(elementDiv);
@@ -196,31 +193,31 @@ yellow.webinterface =
var paneTop = yellow.toolbox.getOuterTop(elementBar) + yellow.toolbox.getOuterHeight(elementBar);
var paneWidth = yellow.toolbox.getOuterWidth(elementBar, true);
var paneHeight = yellow.toolbox.getWindowHeight() - paneTop - yellow.toolbox.getOuterHeight(elementBar);
- if(yellow.toolbox.isVisible(document.getElementById("yellow-panelogin")))
+ if(yellow.toolbox.isVisible(document.getElementById("yellow-pane-login")))
{
- yellow.toolbox.setOuterWidth(document.getElementById("yellow-panelogin"), paneWidth);
+ yellow.toolbox.setOuterWidth(document.getElementById("yellow-pane-login"), paneWidth);
}
- if(yellow.toolbox.isVisible(document.getElementById("yellow-paneedit")))
+ if(yellow.toolbox.isVisible(document.getElementById("yellow-pane-edit")))
{
- yellow.toolbox.setOuterTop(document.getElementById("yellow-paneedit"), paneTop);
- yellow.toolbox.setOuterHeight(document.getElementById("yellow-paneedit"), paneHeight);
- yellow.toolbox.setOuterWidth(document.getElementById("yellow-paneedit"), paneWidth);
- yellow.toolbox.setOuterWidth(document.getElementById("yellow-edittext"), yellow.toolbox.getWidth(document.getElementById("yellow-paneedit")));
- var height1 = yellow.toolbox.getHeight(document.getElementById("yellow-paneedit"));
- var height2 = yellow.toolbox.getOuterHeight(document.getElementById("yellow-paneeditcontent"));
- var height3 = yellow.toolbox.getOuterHeight(document.getElementById("yellow-edittext"));
- yellow.toolbox.setOuterHeight(document.getElementById("yellow-edittext"), height1 - height2 + height3);
+ yellow.toolbox.setOuterTop(document.getElementById("yellow-pane-edit"), paneTop);
+ yellow.toolbox.setOuterHeight(document.getElementById("yellow-pane-edit"), paneHeight);
+ yellow.toolbox.setOuterWidth(document.getElementById("yellow-pane-edit"), paneWidth);
+ yellow.toolbox.setOuterWidth(document.getElementById("yellow-edit-text"), yellow.toolbox.getWidth(document.getElementById("yellow-pane-edit")));
+ var height1 = yellow.toolbox.getHeight(document.getElementById("yellow-pane-edit"));
+ var height2 = yellow.toolbox.getOuterHeight(document.getElementById("yellow-pane-edit-content"));
+ var height3 = yellow.toolbox.getOuterHeight(document.getElementById("yellow-edit-text"));
+ yellow.toolbox.setOuterHeight(document.getElementById("yellow-edit-text"), height1 - height2 + height3);
}
- if(yellow.toolbox.isVisible(document.getElementById("yellow-paneshow")))
+ if(yellow.toolbox.isVisible(document.getElementById("yellow-pane-show")))
{
- yellow.toolbox.setOuterTop(document.getElementById("yellow-paneshow"), paneTop);
- yellow.toolbox.setOuterHeight(document.getElementById("yellow-paneshow"), paneHeight, true);
+ yellow.toolbox.setOuterTop(document.getElementById("yellow-pane-show"), paneTop);
+ yellow.toolbox.setOuterHeight(document.getElementById("yellow-pane-show"), paneHeight, true);
}
- if(yellow.toolbox.isVisible(document.getElementById("yellow-paneuser")))
+ if(yellow.toolbox.isVisible(document.getElementById("yellow-pane-user")))
{
- yellow.toolbox.setOuterTop(document.getElementById("yellow-paneuser"), paneTop);
- yellow.toolbox.setOuterHeight(document.getElementById("yellow-paneuser"), paneHeight, true);
- yellow.toolbox.setOuterLeft(document.getElementById("yellow-paneuser"), paneWidth - yellow.toolbox.getOuterWidth(document.getElementById("yellow-paneuser")), true);
+ yellow.toolbox.setOuterTop(document.getElementById("yellow-pane-user"), paneTop);
+ yellow.toolbox.setOuterHeight(document.getElementById("yellow-pane-user"), paneHeight, true);
+ yellow.toolbox.setOuterLeft(document.getElementById("yellow-pane-user"), paneWidth - yellow.toolbox.getOuterWidth(document.getElementById("yellow-pane-user")), true);
}
if(yellow.debug) console.log("yellow.webinterface.resizePanes bar:"+elementBar.offsetWidth+"/"+elementBar.offsetHeight);
}
@@ -416,6 +413,24 @@ yellow.toolbox =
isVisible: function(element)
{
return element && element.style.display != "none";
+ },
+
+ // Submit form with post method
+ submitForm: function(params)
+ {
+ var elementForm = document.createElement("form");
+ elementForm.setAttribute("method", "post");
+ for(var key in params)
+ {
+ if(!params.hasOwnProperty(key)) continue;
+ var elementInput = document.createElement("input");
+ elementInput.setAttribute("type", "hidden");
+ elementInput.setAttribute("name", key);
+ elementInput.setAttribute("value", params[key]);
+ elementForm.appendChild(elementInput);
+ }
+ document.body.appendChild(elementForm);
+ elementForm.submit();
}
}
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.2.1";
+ const Version = "0.2.2";
var $yellow; //access to API
var $users; //web interface users
var $activeLocation; //web interface location? (boolean)
@@ -105,45 +105,45 @@ class YellowWebinterface
function processRequestAction($serverName, $serverBase, $location, $fileName)
{
$statusCode = 0;
- if($_POST["action"] == "edit")
+ switch($_POST["action"])
{
- if(!empty($_POST["rawdata"]) && $this->checkUserPermissions($location, $fileName))
- {
- $this->rawDataOriginal = $_POST["rawdata"];
- if($this->yellow->toolbox->makeFile($fileName, $_POST["rawdata"]))
- {
- $statusCode = 303;
- $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, $location);
- $this->yellow->sendStatus($statusCode, $locationHeader);
- } else {
- $statusCode = 500;
- $this->yellow->processRequest($serverName, $serverBase, $location, $fileName, false, $statusCode);
- $this->yellow->page->error($statusCode, "Can't write file '$fileName'!");
- }
- }
- } else if($_POST["action"]== "login") {
- $statusCode = 303;
- $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, $location);
- $this->yellow->sendStatus($statusCode, $locationHeader);
- } else if($_POST["action"]== "logout") {
- $this->users->destroyCookie("login");
- $this->activeUserEmail = "";
- $statusCode = 302;
- $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $this->yellow->config->get("serverBase"), $location);
- $this->yellow->sendStatus($statusCode, $locationHeader);
- } else {
- if(!is_readable($fileName))
- {
- if($this->yellow->toolbox->isFileLocation($location) && is_dir($this->yellow->getContentDirectory("$location/")))
- {
- $statusCode = 301;
- $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, "$location/");
- $this->yellow->sendStatus($statusCode, $locationHeader);
- } else {
- $statusCode = $this->checkUserPermissions($location, $fileName) ? 424 : 404;
- $this->yellow->processRequest($serverName, $serverBase, $location, $fileName, false, $statusCode);
- }
- }
+ case "edit": if(!empty($_POST["rawdata"]) && $this->checkUserPermissions($location, $fileName))
+ {
+ $this->rawDataOriginal = $_POST["rawdata"];
+ if($this->yellow->toolbox->makeFile($fileName, $_POST["rawdata"]))
+ {
+ $statusCode = 303;
+ $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, $location);
+ $this->yellow->sendStatus($statusCode, $locationHeader);
+ } else {
+ $statusCode = 500;
+ $this->yellow->processRequest($serverName, $serverBase, $location, $fileName, false, $statusCode);
+ $this->yellow->page->error($statusCode, "Can't write file '$fileName'!");
+ }
+ }
+ break;
+ case "login": $statusCode = 303;
+ $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, $location);
+ $this->yellow->sendStatus($statusCode, $locationHeader);
+ break;
+ case "logout": $this->users->destroyCookie("login");
+ $this->activeUserEmail = "";
+ $statusCode = 302;
+ $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $this->yellow->config->get("serverBase"), $location);
+ $this->yellow->sendStatus($statusCode, $locationHeader);
+ break;
+ default: if(!is_readable($fileName))
+ {
+ if($this->yellow->toolbox->isFileLocation($location) && is_dir($this->yellow->getContentDirectory("$location/")))
+ {
+ $statusCode = 301;
+ $locationHeader = $this->yellow->toolbox->getHttpLocationHeader($serverName, $serverBase, "$location/");
+ $this->yellow->sendStatus($statusCode, $locationHeader);
+ } else {
+ $statusCode = $this->checkUserPermissions($location, $fileName) ? 424 : 404;
+ $this->yellow->processRequest($serverName, $serverBase, $location, $fileName, false, $statusCode);
+ }
+ }
}
return $statusCode;
}
@@ -161,7 +161,7 @@ class YellowWebinterface
{
if($_POST["action"] == "login")
{
- $email = $corPOST["email"];
+ $email = $_POST["email"];
$password = $_POST["password"];
if($this->users->checkUser($email, $password))
{
diff --git a/system/core/core-webinterface.png b/system/core/core-webinterface.png
Binary files differ.
