Skip to content
Snippets Groups Projects
Commit e8f9e947 authored by Tilman Vatteroth's avatar Tilman Vatteroth :robot:
Browse files

Änderungen am Less-Compiler um Datei-Einbindung zu korrieren 

ConfigurationComponent.php entfernt. Warum war die noch da O.o
Stylesheets werden über link geladen anstatt per style-block
parent cb2ebf70
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ajax/ConfigurationComponent.php deleted 100755 → 0
+ 0
− 58
View file @ cb2ebf70
<?php
namespace App\Controller\Component;
use Cake\Controller\Component;
use Cake\Filesystem\File;
class ConfigurationComponent extends Component {
private $session = NULL;
private $folder = null;
public function initialize(array $config) {
$this->session = $this->request->session();
}
public function getConfiguration($session_key, $config_name = '', $config_type = 'panel') {
if (!is_string($session_key)
|| !is_string($config_name)
|| !is_string($config_type)
|| empty($session_key)) {
return FALSE;
}
// load data from session or reload data to session?
/* if ($this->session->check($session_key)) {
// return configuration
return $this->session->read($session_key);
} else {*/
// reload configuration
return $this->getReloadedConfiguration($session_key, $config_name, $config_type);
// }
}
public function getReloadedConfiguration($session_key, $config_name = '', $config_type = 'panel') {
if (!is_string($session_key)
|| !is_string($config_name)
|| !is_string($config_type)
|| (strpos($config_type, ".."))
|| empty($config_name)
|| empty($session_key)) {
return FALSE;
}
// get filename for configuration
$file = new File(ROOT.'/config/'.$config_type.'/'.$config_name.'.json');
// can we get our configuration?
if ($file->exists() && $file->readable()
&& !(($file_content = $file->read()) === false)) {
// decode, save and return configuration
$result = json_decode($file_content,true);
$this->session->write($session_key, $result);
return $result;
} else {
// ERROR!
return FALSE;
}
}
}
config/config.php
+ 1
− 1
View file @ e8f9e947
<?php <?php
const ROOT_DIR="/"; const ROOT_DIR="/infoscreen";
?> ?>
index.html
+ 0
− 1
View file @ e8f9e947
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<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/panelAPI.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/loader.js"></script>
<script type="text/javascript" src="js/starter.js"></script> <script type="text/javascript" src="js/starter.js"></script>
</head> </head>
<body> <body>
......
js/panelAPI.js
+ 21
− 13
View file @ e8f9e947
...@@ -34,11 +34,10 @@ layout.processLayout = function(json, container) { ...@@ -34,11 +34,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 +64,6 @@ layout.insertTemplate = function(name, panel) { ...@@ -65,10 +64,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 +94,27 @@ layout.insertTemplate = function(name, panel) { ...@@ -99,14 +94,27 @@ layout.insertTemplate = function(name, panel) {
layout.error("get fail of template " + n ); layout.error("get fail of template " + n );
}); });
$.get("panels/" + n + "/style.less", 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){
......
less/style.php
+ 1
− 3
View file @ e8f9e947
...@@ -53,7 +53,7 @@ if (!file_exists($cache_file)) { ...@@ -53,7 +53,7 @@ if (!file_exists($cache_file)) {
$parser->parse(" $parser->parse("
[data-template=$panel] { [data-template=$panel] {
@import \"$less_file\"; @import \"$less_file\";
}"); }", "/panels/$panel");
} }
$content = $parser->getCss(); $content = $parser->getCss();
}catch(Exception $e) { }catch(Exception $e) {
...@@ -76,5 +76,3 @@ if ($debug) { ...@@ -76,5 +76,3 @@ if ($debug) {
header("Location: ".ROOT_DIR."/$cache_file"); 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