Skip to content
Snippets Groups Projects
Commit c472fabe authored by 2deep4real's avatar 2deep4real
Browse files

Merge branch 'master' of 

git@bitbucket.org:FsInformatikDortmund/infoscreen.git

Conflicts:
	ajax/DeparturesComponent.php
parents 0d5ef305 73bfc05e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 84 additions and 434 deletions
ajax/ConfigurationComponent.php 100644 → 100755
+ 58
− 58
View file @ c472fabe
<?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;
}
}
}
<?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;
}
}
}
css/font/NewCicle.ttf
-1 B (0%)
View file @ c472fabe
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/font/time-fat.ttf 100644 → 100755
+0 B (+0%)
View file @ c472fabe
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
css/font/time-medium.ttf 100644 → 100755
+0 B (+0%)
View file @ c472fabe
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/webfontloader.js 100644 → 100755
+ 17
− 17
View file @ c472fabe
This diff is collapsed.
panels/clock/background.png 100644 → 100755
+0 B (+0%)
View file @ c472fabe
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
panels/clock/background.svg 100644 → 100755
+ 0
− 0
View file @ c472fabe
File mode changed from 100644 to 100755
panels/clock/script.js 100644 → 100755
+ 0
− 0
View file @ c472fabe
File mode changed from 100644 to 100755
panels/clock/style.less 100644 → 100755
+ 0
− 0
View file @ c472fabe
File mode changed from 100644 to 100755
panels/clock/template.html 100644 → 100755
+ 0
− 0
View file @ c472fabe
File mode changed from 100644 to 100755
style.php
+ 8
− 2
View file @ c472fabe
......@@ -5,10 +5,16 @@ require "lessc.php";
$less = new lessc();
$style = $_GET["style"];
echo $style;
$less_file = "panels/" . $style . "/style.less";
$less_file = "panels/$style/style.less";
$css_file = "tmp/$style.css";
if (!file_exists($less_file)) {
http_response_code(404);
echo $less_file." not found";
return;
}
if ( !file_exists(filemtime($less_file)) )
if ( !file_exists($css_file))
{
$code =
$less->compile(
......
tmp/.gitignore 0 → 100755
+ 1
− 0
View file @ c472fabe
*
tmp/GameOfLife.css deleted 100644 → 0
+ 0
− 0
View file @ 0d5ef305
tmp/clock.css deleted 100755 → 0
+ 0
− 150
View file @ 0d5ef305
[data-template=clock] [data-clock=right],
[data-template=clock] [data-clock=analog] {
float: left;
height: 100%;
}
[data-template=clock] [data-clock=analog] {
display: block;
}
[data-template=clock] [data-clock=analog] img {
width: 200px;
height: 200px;
position: absolute;
}
[data-template=clock] [data-biber] {
opacity: 0.3;
}
[data-template=clock] [data-clock=digital] {
display: -webkit-box;
-webkit-box-pack: justify;
-webkit-box-align: center;
display: -moz-box;
-moz-box-pack: justify;
-moz-box-align: center;
display: -ms-flexbox;
-ms-flex-pack: justify;
-ms-flex-align: center;
display: box;
box-pack: justify;
box-align: center;
height: 100%;
}
[data-template=clock] [data-clock] {
font-family: lcd;
}
@keyframes clock24 {
[data-template=clock] [data-clock=digital] from {
top: 0%;
}
[data-template=clock] [data-clock=digital] to {
top: -2400%;
}
}
@keyframes clock60 {
[data-template=clock] [data-clock=digital] from {
top: 0%;
}
[data-template=clock] [data-clock=digital] to {
top: -6000%;
}
}
@keyframes clockPulse {
[data-template=clock] [data-clock=digital] 0% {
color: #AA0000;
}
[data-template=clock] [data-clock=digital] 50% {
color: #550000;
}
[data-template=clock] [data-clock=digital] 100% {
color: #AA0000;
}
}
[data-template=clock] [data-clock=digital] [data-clock] {
position: relative;
width: 400px;
height: 200px;
overflow: hidden;
padding: 0px;
text-align: center;
background-color: #000000;
color: #550000;
box-sizing: border-box;
}
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-seperator] {
position: relative;
display: inline-table;
top: -20px;
height: 120px;
font-size: 150px;
line-height: 150px;
margin-top: -20px;
width: 5px;
text-align: center;
margin-left: -20px;
margin-right: -20px;
}
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-number] {
margin-top: -10px;
}
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-number=hour],
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-number=minute] {
position: relative;
display: inline-table;
font-size: 150px;
line-height: 150px;
text-align: center;
overflow: hidden;
}
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-number=second] {
position: relative;
display: inline-table;
margin-left: 5px;
font-size: 75px;
line-height: 150px;
text-align: center;
overflow: hidden;
}
[data-template=clock] [data-clock=digital] [data-clock] [data-clock-number] [data-clock-indicator] {
position: absolute;
color: #AA0000;
text-align: center;
top: 0px;
}
[data-template=clock] [data-clock=digital] [data-clock=css] [data-clock-number=hour] [data-clock-indicator] {
animation: clock24 86400s steps(24) infinite;
}
[data-template=clock] [data-clock=digital] [data-clock=css] [data-clock-number=minute] [data-clock-indicator] {
animation: clock60 3600s steps(60) infinite;
}
[data-template=clock] [data-clock=digital] [data-clock=css] [data-clock-number=second] [data-clock-indicator] {
animation: clock60 60s steps(60) infinite;
}
[data-template=clock] [data-clock=digital] [data-clock=css] [data-clock-seperator] {
animation: clockPulse 1s steps(1) infinite;
}
[data-template=clock] [data-clock=digital] [data-clock-date] {
position: relative;
display: inline-table;
height: 75px;
font-size: 75px;
line-height: 75px;
text-align: center;
margin-top: -60px;
margin-left: -20px;
margin-right: -20px;
}
[data-template=clock] [data-clock=digital] [data-clock-date] [data-clock-date-background] {
position: absolute;
display: inline-table;
text-align: center;
top: 0px;
left: 0px;
}
[data-template=clock] [data-clock=digital] [data-clock-date] [data-clock-date-indicator] {
position: absolute;
display: inline-table;
text-align: center;
top: 0px;
left: 0px;
color: #AA0000;
}
tmp/clock2.css deleted 100644 → 0
+ 0
− 3
View file @ 0d5ef305
[data-template=clock2] [data-analog-clock] {
float: left;
}
tmp/departure.css deleted 100755 → 0
+ 0
− 171
View file @ 0d5ef305
[data-template=departure] [data-departure-view] {
position: relative;
width: 100%;
height: 100%;
background-color: #000000;
border-style: solid;
border-width: 1px;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
overflow: hidden;
font-family: display;
}
[data-template=departure] [data-departure-view] [data-departure] {
position: relative;
width: 100%;
background-color: #0000A0;
color: #FFFFFF;
border-style: solid;
border-width: 1px;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
}
[data-template=departure] [data-departure-view] [data-departure] [data-transport] {
position: relative;
display: inline-table;
width: 100%;
white-space: nowrap;
}
[data-template=departure] [data-departure-view] [data-departure] [data-transport] [data-line] {
position: relative;
display: inline-table;
background-color: #FFFFFF;
color: #0000A0;
width: 10%;
height: 100%;
text-align: right;
padding: 0px 5px;
}
[data-template=departure] [data-departure-view] [data-departure] [data-transport] [data-name] {
position: relative;
display: inline-table;
background-color: #0000A0;
color: #FFFFFF;
height: 100%;
padding: 0px 5px;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] {
position: relative;
display: block;
width: 100%;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] {
position: relative;
display: list-item;
list-style: none;
width: 100%;
margin: 1px 0px 0px 0px;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-time] {
position: relative;
max-width: 7.9%;
height: 100%;
float: left;
overflow: hidden;
padding: 0px 5px 0px 0px;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-name] {
position: relative;
max-width: 54.17%;
height: 100%;
float: left;
overflow: hidden;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-info] {
position: absolute;
width: 37.93%;
height: 100%;
right: 0px;
overflow: hidden;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-info] marquee {
background-color: #FFFFFF;
color: #0000A0;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-info] [data-css-marquee] {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
display: inline-block;
}
[data-template=departure] [data-departure-view] [data-departure] [data-stops] [data-stop] [data-info] [data-css-marquee] [data-css-marquee-text] {
position: absolute;
display: table-cell;
padding: 0px;
white-space: nowrap;
background-color: #FFFFFF;
color: #0000A0;
cursor: default;
}
[data-template=departure] [data-departure-view] [data-information] {
position: relative;
width: 100%;
background-color: #0000A0;
color: #FFFFFF;
border-style: solid;
border-width: 1px;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
white-space: nowrap;
}
[data-template=departure] [data-departure-view] [data-information] [data-head] {
width: 100%;
background-color: #FFFFFF;
color: #0000A0;
text-align: center;
}
[data-template=departure] [data-departure-view] [data-information] [data-message] {
position: relative;
width: 100%;
}
[data-template=departure] [data-departure-view] [data-error] {
position: relative;
width: 100%;
background-color: #0000A0;
color: #FFFFFF;
border-style: solid;
border-width: 1px;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
white-space: nowrap;
display: hidden;
}
[data-template=departure] [data-departure-view] [data-error] [data-head] {
width: 100%;
background-color: #FFFFFF;
color: #0000A0;
text-align: center;
}
[data-template=departure] [data-departure-view] [data-error] [data-message] {
width: 100%;
}
[data-template=departure] [data-departure-view] [data-vrrf-error] {
position: relative;
width: 100%;
background-color: #0000A0;
color: #FFFFFF;
border-style: solid;
border-width: 1px;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
white-space: nowrap;
display: hidden;
}
[data-template=departure] [data-departure-view] [data-vrrf-error] [data-head] {
width: 100%;
background-color: #FFFFFF;
color: #0000A0;
text-align: center;
}
[data-template=departure] [data-departure-view] [data-vrrf-error] [data-stop] {
width: 100%;
}
[data-template=departure] [data-departure-view] [data-vrrf-error] [data-message] {
width: 100%;
}
tmp/departures.css deleted 100755 → 0
+ 0
− 0
View file @ 0d5ef305
tmp/scrollbar.css deleted 100755 → 0
+ 0
− 33
View file @ 0d5ef305
[data-template=scrollbar] [data-scrollbar-view] {
position: relative;
width: 100%;
height: 100%;
background-color: #000000;
border-style: solid;
border-color: #000000;
padding: 0px;
box-sizing: border-box;
overflow: hidden;
font-family: vrr;
}
[data-template=scrollbar] [data-scrollbar-view] marquee {
background-color: #000000;
color: #FFC000;
}
[data-template=scrollbar] [data-scrollbar-view] [data-css-marquee] {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
display: inline-block;
background-color: #000000;
}
[data-template=scrollbar] [data-scrollbar-view] [data-css-marquee] [data-css-marquee-text] {
position: absolute;
display: table-cell;
padding: 0px;
white-space: nowrap;
background-color: #000000;
color: #FFC000;
cursor: default;
}
tmp/siog.css deleted 100755 → 0
+ 0
− 0
View file @ 0d5ef305
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment