Base Directory Fix #2

This commit is contained in:
JonatanRek 2019-10-11 16:38:20 +02:00
parent a82cf90d12
commit 8a20f32baf
16 changed files with 35 additions and 19 deletions

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE; ?></title>
@ -24,13 +25,13 @@
<?php foreach ($DASHBOARD as $dashboardItemId => $dashboardItemData) {
$partialDeviceButton = new Partial('dashboardButton');
$partialDeviceButton->prepare('dashboardItemData', $dashboardItemData);
$partialDeviceButton->render();
} ?>
</div>
</div>
</div>
<div class="modal-container modal-container-hiden" id="modal">
<div class="modal">
<div class="close">
@ -50,12 +51,12 @@
</form>
</div>
</div>
<?php
if (isset($_POST['deviceId'])) {
$partial = new Partial('deviceEdit');
$partial->prepare('DEVICEDATA', $DEVICEDATA);
$partial->render();
}
$partial = new Partial('footer');

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>
@ -30,16 +31,16 @@
<input type="submit" class="button" name="selectFile" value="<?php $LANGMNG->echo('b_select');?>"/>
</div>
</form>
<?php
if (isset($_POST['LogFile'])) {
$file_lines = file('./app/logs/' . $_POST['LogFile']);
echo '<pre style="overflow: auto;">';
foreach ($file_lines as $line) {
echo $line;
}
echo '</pre>';
<?php
if (isset($_POST['LogFile'])) {
$file_lines = file('./app/logs/' . $_POST['LogFile']);
echo '<pre style="overflow: auto;">';
foreach ($file_lines as $line) {
echo $line;
}
?>
echo '</pre>';
}
?>
</div>
</div>

View File

@ -7,13 +7,13 @@
<meta name="theme-color" content="#182239">
<meta name="msapplication-navbutton-color" content="#182239">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="msapplication-starturl" content="/vasek/home/">
<meta name="msapplication-starturl" content="<?php echo $BASEDIR; ?>">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="icon" sizes="192x192" href="/vasek/home/app/templates/images/icon-192x192.png">
<link rel="apple-touch-icon" sizes="192x192" href="/vasek/home/app/templates/images/icon-192x192.png">
<link rel="icon" sizes="512x512" href="/vasek/home/app/templates/images/icon-512x512.png">
<link rel="apple-touch-icon" sizes="512x512" href="/vasek/home/app/templates/images/icon-512x512.png">
<link rel="icon" sizes="192x192" href="<?php echo $BASEDIR; ?>app/templates/images/icon-192x192.png">
<link rel="apple-touch-icon" sizes="192x192" href="<?php echo $BASEDIR; ?>app/templates/images/icon-192x192.png">
<link rel="icon" sizes="512x512" href="<?php echo $BASEDIR; ?>app/templates/images/icon-512x512.png">
<link rel="apple-touch-icon" sizes="512x512" href="<?php echo $BASEDIR; ?>app/templates/images/icon-512x512.png">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>

View File

@ -3,6 +3,7 @@
<head>
<?php
$partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR);
$partial->render();
?>
<title><?php echo $TITLE ?></title>

View File

@ -51,6 +51,7 @@ class Automation extends Template
}
$template = new Template('automation');
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Automation');
$template->prepare('langMng', $langMng);
$template->prepare('automations', $automations);

View File

@ -80,6 +80,7 @@ class Dashboard extends Template
$template->prepare('deviceData', $device);
}
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Nástěnka');
$template->prepare('langMng', $langMng);
$template->prepare('dashboard', $dashboard);

View File

@ -169,8 +169,9 @@ class Home extends Template
}
$rooms = RoomManager::getAllRooms();
$template->prepare('rooms', $rooms);
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Home');
$template->prepare('rooms', $rooms);
$template->prepare('langMng', $langMng);
$template->prepare('data', $roomsItems);

View File

@ -25,6 +25,8 @@ class Log extends Template
}
}
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Logy');
$template->prepare('logsFiles', $result);
$template->prepare('langMng', $langMng);

View File

@ -11,6 +11,7 @@ class Login extends Template
}
$template = new Template('login');
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Home');
$template->prepare('lang', $lang);

View File

@ -14,6 +14,7 @@ class Rooms extends Template
$template = new Template('rooms');
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Rooms');
$template->prepare('lang', $lang);

View File

@ -11,6 +11,7 @@ class Scene extends Template
}
$template = new Template('scene');
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Scény');
$template->prepare('langMng', $langMng);

View File

@ -22,6 +22,7 @@ class Setting extends Template
}
$template = new Template('setting');
$template->prepare('baseDir', BASEDIR);
$template->prepare('title', 'Automation');
$template->prepare('langMng', $langMng);
$template->prepare('automations', $automations);