Skip to content

Commit

Permalink
FIX: Code Syntax - layout.php
Browse files Browse the repository at this point in the history
  • Loading branch information
@aljawaid
aljawaid committed May 19, 2023
1 parent 26c799a commit 0cc2d84
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions Template/layout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<?= $this->asset->css('assets/css/print.min.css', true, 'print') ?>
<?= $this->asset->customCss() ?>

<?php if (! isset($not_editable)): ?>
<?php if (!isset($not_editable)): ?>
<?= $this->asset->js('assets/js/vendor.min.js') ?>
<?= $this->asset->js('assets/js/app.min.js') ?>
<?php endif ?>
Expand Down Expand Up @@ -54,14 +54,14 @@
<link rel="manifest" href="<?= $this->url->dir() ?>plugins/ApplicationBranding/Assets/img/favicon/site.webmanifest">
<link rel="mask-icon" href="<?= $this->url->dir() ?>plugins/ApplicationBranding/Assets/img/favicon/safari-pinned-tab.svg" color="#5BBAD5">
<?php
if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
$url = "https://";
else
$url = "http://";
// Append the host(domain name, ip) to the URL.
$url.= $_SERVER['HTTP_HOST'];
$url .= $_SERVER['HTTP_HOST'];
// Append the requested resource location to the URL
$url.= $_SERVER['REQUEST_URI'];
$url .= $_SERVER['REQUEST_URI'];
?>
<meta property="og:url" content="<?php echo $url ?>">
<?php // og:image must be min 300x300px with 'https' and absolute url to png file ?>
Expand All @@ -76,7 +76,7 @@
$outgoingAction = $this->app->getRouterAction();
?>

<?php if (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php if (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<meta name="description" content="<?= t('Change your password for this kanban platform.') ?>">
<meta property="og:description" content="<?= t('Change your password for this kanban platform.') ?>">
<?php else: ?>
Expand All @@ -96,7 +96,7 @@
<?php else: ?>
<meta property="og:title" content="<?= $this->text->e($title) ?> | <?= t('My Workspace') ?>">
<?php endif ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<?php if (!empty($this->task->configModel->get('app_rename'))): ?>
<meta property="og:title" content="<?= t('Reset Password') ?> | <?= $this->task->configModel->get('app_rename') ?>">
<?php else: ?>
Expand Down Expand Up @@ -127,7 +127,7 @@
| <?= t('My Workspace') ?>
<?php endif ?>

<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<?php if (!empty($this->task->configModel->get('app_rename'))): ?>
<?= t('Reset Password') ?> | <?= $this->task->configModel->get('app_rename') ?>
<?php else: ?>
Expand Down
24 changes: 12 additions & 12 deletions Template/layout_customizer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
<?= $this->asset->css('assets/css/print.min.css', true, 'print') ?>
<?= $this->asset->customCss() ?>

<?php if (! isset($not_editable)): ?>
<?php if (!isset($not_editable)): ?>
<?= $this->asset->js('assets/js/vendor.min.js') ?>
<?= $this->asset->js('assets/js/app.min.js') ?>
<?php endif ?>

<?= $this->hook->asset('css', 'template:layout:css') ?>
<?= $this->hook->asset('js', 'template:layout:js') ?>

<?php if (null !== $this->task->customizerFileModel->getByType(2)) : ?>
<?php if (null !== $this->task->customizerFileModel->getByType(2)): ?>
<link rel="icon" type="image/png" href="<?= $this->url->href('CustomizerFileController', 'image', array('plugin' => 'customizer', 'file_id' => $this->task->customizerFileModel->getIdByType(2))) ?>">
<link rel="apple-touch-icon" sizes="57x57" href="<?= $this->url->href('CustomizerFileController', 'image', array('plugin' => 'customizer', 'file_id' => $this->task->customizerFileModel->getIdByType(2))) ?>">
<link rel="apple-touch-icon" sizes="60x60" href="<?= $this->url->href('CustomizerFileController', 'image', array('plugin' => 'customizer', 'file_id' => $this->task->customizerFileModel->getIdByType(2))) ?>">
Expand Down Expand Up @@ -82,17 +82,17 @@
<link rel="mask-icon" href="<?= $this->url->dir() ?>plugins/ApplicationBranding/Assets/img/favicon/safari-pinned-tab.svg" color="#5BBAD5">
<?php endif ?>
<?php
if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
$url = "https://";
else
$url = "http://";
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
$url = "https://";
else
$url = "http://";
// Append the host(domain name, ip) to the URL.
$url.= $_SERVER['HTTP_HOST'];
$url. = $_SERVER['HTTP_HOST'];
// Append the requested resource location to the URL
$url.= $_SERVER['REQUEST_URI'];
$url. = $_SERVER['REQUEST_URI'];
?>
<meta property="og:url" content="<?php echo $url ?>">
<?php if (null !== $this->task->customizerFileModel->getByType(2)) : ?>
<?php if (null !== $this->task->customizerFileModel->getByType(2)): ?>
<?php // og:image must be min 300x300px with 'https' and absolute url to png file ?>
<meta property="og:image" content="<?= $this->url->href('CustomizerFileController', 'image', array('plugin' => 'customizer', 'file_id' => $this->task->customizerFileModel->getIdByType(2))) ?>">
<?php else: ?>
Expand All @@ -109,7 +109,7 @@
$outgoingAction = $this->app->getRouterAction();
?>

<?php if (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php if (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<meta name="description" content="<?= t('Change your password for this kanban platform.') ?>">
<meta property="og:description" content="<?= t('Change your password for this kanban platform.') ?>">
<?php else: ?>
Expand All @@ -129,7 +129,7 @@
<?php else: ?>
<meta property="og:title" content="<?= $this->text->e($title) ?> | <?= t('My Workspace') ?>">
<?php endif ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<?php if (!empty($this->task->configModel->get('app_rename'))): ?>
<meta property="og:title" content="<?= t('Reset Password') ?> | <?= $this->task->configModel->get('app_rename') ?>">
<?php else: ?>
Expand Down Expand Up @@ -160,7 +160,7 @@
| <?= t('My Workspace') ?>
<?php endif ?>

<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction =='create')): ?>
<?php elseif (($incomingController == 'PasswordResetController') && ($outgoingAction == 'create')): ?>
<?php if (!empty($this->task->configModel->get('app_rename'))): ?>
<?= t('Reset Password') ?> | <?= $this->task->configModel->get('app_rename') ?>
<?php else: ?>
Expand Down

0 comments on commit 0cc2d84

Please sign in to comment.