Skip to content
Snippets Groups Projects
Commit bb94a9e7 authored by Rico van Endern's avatar Rico van Endern
Browse files

Merged in dev (pull request #16)

parents 7b81761b afcf30c7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1370 additions and 46 deletions
css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-bg_highlight-soft_75_cccccc_1x100.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_222222_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_228ef1_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_2e83ff_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_454545_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_888888_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_cd0a0a_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_ef8c08_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_ffd27a_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/images/ui-icons_ffffff_256x240.png 0 → 100644
NaN GiB (NaN%)
View file @ bb94a9e7
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/jquery.ui.css 0 → 100644
+ 1225
− 0
View file @ bb94a9e7
This diff is collapsed.
css/marquee.css → css/marquee.less
+ 0
− 0
View file @ bb94a9e7
File moved
index.html
+ 15
− 28
View file @ bb94a9e7
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Infoboard</title> <title>Infoboard</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="favicon.png" type="image/x-icon" rel="icon"> <link href="favicon.png" type="image/x-icon" rel="icon"/>
<link rel="stylesheet" href="css/font.css"> <link rel="stylesheet" href="css/font.css"/>
<link rel="stylesheet" href="css/design.css"> <link rel="stylesheet" href="css/design.less"/>
<link rel="stylesheet" href="css/marquee.css"> <link rel="stylesheet" href="css/marquee.less"/>
<link rel="stylesheet" href="css/jquery.ui.css"/>
<script type="text/javascript" src="js/jquery-2.1.4.min.js"></script> <script type="text/javascript" src="js/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="js/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/jquery.jcookie.min.js"></script>
<script type="text/javascript" src="js/marquee.js"></script> <script type="text/javascript" src="js/marquee.js"></script>
<script type="text/javascript" src="js/panelAPI.js"></script> <script type="text/javascript" src="js/layoutloader.js"></script>
<script type="text/javascript" src="js/webfontloader.js"></script> <script type="text/javascript" src="js/webfontloader.js"></script>
<script type="text/javascript" src="js/starter.js"></script>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
window.fontsReady = false;
WebFont.load( {
custom : {
families : ['time-medium', 'time-fat', 'vrr'],
urls : ['css/font.css']
},
active : function() {
window.fontsReady = true;
}
});
var layoutname=$.jCookie("layout");
layoutname=(typeof(layoutname)=="undefined" ? "default" : layoutname);
layout.loadLayout(layoutname);
});
//]]>
</script>
</head> </head>
<body> <body>
<div data-container="main"> <div data-container="main">
<noscript>
<div data-container="panel" style="
color: white;
text-shadow: black 10px 0px 0px;
font-size: 40pt;
">Diese Seite benötigt JavaScript!</div>
</noscript>
</div> </div>
</body> </body>
</html> </html>
js/fontloader.js 0 → 100644
+ 6
− 0
View file @ bb94a9e7
/**
* Created by tilman on 02.10.15.
*/
fontloader = {};
fontloader
\ No newline at end of file
js/jquery.jcookie.min.js deleted 100755 → 0
+ 0
− 2
View file @ 7b81761b
/** https://github.com/martinkr/jCookie - Copyright (c) 2008-2011 Martin Krause - Dual licensed under the MIT and GPL licenses. */
jQuery.jCookie=function(i,b,l,j){if(!navigator.cookieEnabled){return false}var j=j||{};if(typeof(arguments[0])!=="string"&&arguments.length===1){j=arguments[0];i=j.name;b=j.value;l=j.expires}i=encodeURI(i);if(b&&(typeof(b)!=="number"&&typeof(b)!=="string"&&b!==null)){return false}var e=j.path?"; path="+j.path:"";var f=j.domain?"; domain="+j.domain:"";var d=j.secure?"; secure":"";var g="";if(b||(b===null&&arguments.length==2)){l=(l===null||(b===null&&arguments.length==2))?-1:l;if(typeof(l)==="number"&&l!="session"&&l!==undefined){var k=new Date();k.setTime(k.getTime()+(l*24*60*60*1000));g=["; expires=",k.toGMTString()].join("")}document.cookie=[i,"=",encodeURI(b),g,f,e,d].join("");return true}if(!b&&typeof(arguments[0])==="string"&&arguments.length==1&&document.cookie&&document.cookie.length){var a=document.cookie.split(";");var h=a.length;while(h--){var c=a[h].split("=");if(jQuery.trim(c[0])===i){return decodeURI(c[1])}}return undefined}if(!document.cookie||!document.cookie.length){return undefined}return false};
\ No newline at end of file
js/panelAPI.js → js/layoutloader.js
+ 28
− 16
View file @ bb94a9e7
...@@ -15,6 +15,11 @@ layout.processLayout = function(json, container) { ...@@ -15,6 +15,11 @@ layout.processLayout = function(json, container) {
layout.processLayout(json.right, cont).css("width",(100.0-json.cut)+"%"); layout.processLayout(json.right, cont).css("width",(100.0-json.cut)+"%");
return cont; return cont;
case "panel": case "panel":
if (json.name == "") {
layout.error(json);
}
var p = $("<div>") var p = $("<div>")
.attr("data-container","panel") .attr("data-container","panel")
.attr("data-template",json.name) .attr("data-template",json.name)
...@@ -22,9 +27,8 @@ layout.processLayout = function(json, container) { ...@@ -22,9 +27,8 @@ layout.processLayout = function(json, container) {
var cont = $("<div>").attr("data-container","panelContainer").append(p); var cont = $("<div>").attr("data-container","panelContainer").append(p);
$(container).append(cont); $(container).append(cont);
if (json.name != "") {
layout.insertTemplate(json.name,p); layout.insertTemplate(json.name,p);
}
return cont; return cont;
default: default:
...@@ -34,11 +38,10 @@ layout.processLayout = function(json, container) { ...@@ -34,11 +38,10 @@ layout.processLayout = function(json, container) {
} }
layout.insertTemplate = function(name, panel) { layout.insertTemplate = function(name, panel) {
var tmp = null; for (var tmp in layout.templates) {
for (ti in layout.templates) { if (layout.templates[tmp].name == name)
if (layout.templates[ti].name == name)
{ {
layout.templates[ti].panels.push(panel); layout.templates[tmp].panels.push(panel);
return; return;
} }
...@@ -65,10 +68,6 @@ layout.insertTemplate = function(name, panel) { ...@@ -65,10 +68,6 @@ layout.insertTemplate = function(name, panel) {
doStuff = null; doStuff = null;
} }
if (e.css!=null) {
t.css = $("<style>").attr("type","text/css").attr("data-template",t.name).text(e.css);
$("body").append(t.css);
}
t.template = $.parseHTML(e.template); t.template = $.parseHTML(e.template);
for (p in t.panels) { for (p in t.panels) {
...@@ -99,14 +98,27 @@ layout.insertTemplate = function(name, panel) { ...@@ -99,14 +98,27 @@ layout.insertTemplate = function(name, panel) {
layout.error("get fail of template " + n ); layout.error("get fail of template " + n );
}); });
$.get("style.php?style=" + n, function(k) {
console.log("get success of style " + n) t.css = $("<link>").attr("rel","stylesheet").attr("href", "panels/" + n + "/style.less").attr("data-template",t.name);
t.css.on("load",function() {
console.log("get success of style " + n);
e.css= t.css;
doMore();
});
/*.fail(function() {
layout.error("get fail of style " + n);
});*/
$("head").append(t.css);
/*$.get("panels/" + n + "/style.less", function(k) {
e.css=k; e.css=k;
doMore(); doMore();
},"text") },"text")
.fail(function() { */
layout.error("get fail of style " + n);
});
$.get("panels/" + n + "/script.js", function(k){ $.get("panels/" + n + "/script.js", function(k){
...@@ -146,4 +158,4 @@ layout.error = function(e) { ...@@ -146,4 +158,4 @@ layout.error = function(e) {
console.log("Layout: Error " + e); console.log("Layout: Error " + e);
}, },
layout.templates = []; layout.templates = [];
\ No newline at end of file
js/starter.js 0 → 100644
+ 18
− 0
View file @ bb94a9e7
$(document).ready(function(){
window.fontsReady = false;
WebFont.load( {
custom : {
families : ['time-medium', 'time-fat', 'vrr'],
},
active : function() {
window.fontsReady = true;
}
});
var params = location.search.replace('?','').split('&').reduce(function(s,c){var t=c.split('=');s[t[0]]=t[1];return s;},{});
var layoutname = (typeof(params.layout)=="undefined" ? "default" : params.layout);
layout.loadLayout(layoutname);
});/**
* Created by tilman on 30.09.15.
*/
less/font.php 0 → 100644
+ 78
− 0
View file @ bb94a9e7
<?php
$tmp_dir = "tmp";
chdir("..");
if (!isset($_GET["name"])) {
http_response_code(404);
echo "no valid file given";
return;
}
$less_file = $_GET["name"]; //"panels/departure/style.less";
$debug=isset($_GET["debug"]);
include "config/config.php";
echo ROOT_DIR;
$panel = null;
if ($debug)
header("content-type:text/plain;charset=utf8");
if (!file_exists($less_file)) {
http_response_code(404);
echo $less_file . " not found";
return;
}
if (preg_match_all ('/'.'panels\\/((?:[a-z][a-z]+))\\/style\\.less'.'/is', $less_file, $matches))
{
$panel=$matches[1][0];
}
if ($debug && isset($panel))
echo "panel:" . $panel."\n";
$cache_name = "lesscache_".md5($less_file."_".filemtime($less_file)).".css";
$cache_file = $tmp_dir."/".$cache_name;
if (!file_exists($cache_file)) {
require("less/Less.php");
$options = array( 'compress'=>true );
$parser = new Less_Parser($options);
$parser->parseFile("css/colors.less");
try {
if (!isset($panel)) {
$parser->parseFile($less_file);
} else {
$parser->parse("
[data-template=$panel] {
@import \"$less_file\";
}", "/panels/$panel");
}
$content = $parser->getCss();
}catch(Exception $e) {
http_response_code(500);
header("content-type:text/plain;charset=utf8");
echo $e->getMessage();
return;
}
file_put_contents($cache_file,$content);;
}
if ($debug) {
echo "cache-name: " . $cache_file . "\n";
echo "content:\n";
if (!isset($content))
echo file_get_contents($cache_file)."\n";
else
echo $content;
} else {
header("Location: ".ROOT_DIR."/$cache_file");
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment