From cffd2c46efe5875ad1eb86a566a9b41bdb461861 Mon Sep 17 00:00:00 2001 From: Fibinger Ádám <adam.fibinger@wup.hu> Date: Thu, 09 Jan 2020 16:31:43 +0100 Subject: [PATCH] Kali, Wamai és egyéb módosítások --- common/base.php | 5 +---- templates/overlays/start-soon.twig | 9 +++++---- form.php | 4 ++++ EOG/Models/Stripe.php | 2 +- create.php | 4 +++- templates/overlays/stripe.twig | 3 +++ 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/EOG/Models/Stripe.php b/EOG/Models/Stripe.php index a3bd134..2a84d3a 100644 --- a/EOG/Models/Stripe.php +++ b/EOG/Models/Stripe.php @@ -15,7 +15,7 @@ 'glaz', 'goyo', 'gridlock', 'hibana', 'iq', 'jackal', 'jager', 'kaid', 'kapkan', 'lesion', 'lion', 'maestro', 'maverick', 'mira', 'montagne', 'mozzie', 'mute', 'nokk', 'nomad', 'pulse', 'rook', 'sledge', 'smoke', 'tachanka', 'thatcher', 'thermite', 'twitch', - 'valkyrie', 'vigil', 'warden', 'ying', 'zofia']; + 'valkyrie', 'vigil', 'warden', 'ying', 'zofia', 'wamai', 'kali']; protected $state = [ 'stripe' => [ 'class' => 'team', diff --git a/common/base.php b/common/base.php index 0071d85..ba1197d 100644 --- a/common/base.php +++ b/common/base.php @@ -7,10 +7,7 @@ define('IS_DEV', true); define('SITE_ROOT', dirname(__DIR__)); -define('OVERLAY_DIR', dirname(SITE_ROOT) . '/overlays/'); +define('TARGET_DIR', dirname(SITE_ROOT) . '/overlays/'); -define('STRIPE_JSON', OVERLAY_DIR . 'last.json'); -define('TEAMS_JSON', OVERLAY_DIR . 'teams.json'); -define('HISTORY_JSON', OVERLAY_DIR . 'history.json'); $twig = \EOG\Utils\TwigFactory::getEnvironment(SITE_ROOT . '/templates/'); \ No newline at end of file diff --git a/create.php b/create.php index 41388a1..32f379b 100644 --- a/create.php +++ b/create.php @@ -2,5 +2,7 @@ include_once "common/base.php"; $html_content = $twig->render('overlays/start-soon.twig'); +file_put_contents('../esl-overlay/overlays/start-soon.html', $html_content); -file_put_contents('../esl-overlay/overlays/start-soon.html', $html_content); \ No newline at end of file +$html_content = $twig->render('overlays/interrogacion.twig'); +file_put_contents('../esl-overlay/overlays/interview.html', $html_content); \ No newline at end of file diff --git a/form.php b/form.php index f2bf36e..cf227fe 100644 --- a/form.php +++ b/form.php @@ -22,6 +22,10 @@ $html_content = $twig->render('overlays/stripe.twig', ['stripe' => $s]); file_put_contents(OVERLAY_DIR . 'team-ban.html', $html_content); + $s->setClass('team-ban'); + $html_content = $twig->render('overlays/stripe.twig', ['stripe' => $s, 'autorefresh' => 30]); + file_put_contents(OVERLAY_DIR . 'team-ban-refresh.html', $html_content); + } else { if (file_exists(STRIPE_JSON)) { $raw_json = file_get_contents(STRIPE_JSON); diff --git a/templates/overlays/start-soon.twig b/templates/overlays/start-soon.twig index d235a2c..fed5749 100644 --- a/templates/overlays/start-soon.twig +++ b/templates/overlays/start-soon.twig @@ -1,7 +1,8 @@ {% extends "overlays/html-base.twig" %} +{% block head %} + {{ parent() }} + <link rel="stylesheet" href="/assets/operators-color.css"> +{% endblock %} {% block body %} - <div id="main" class="soon"> - <div class="placeholder"> </div> - <div class="text">Hamarosan kezdünk!</div> - </div> + <div id="main-text" class="soon">Hamarosan kezdünk!</div> {% endblock %} \ No newline at end of file diff --git a/templates/overlays/stripe.twig b/templates/overlays/stripe.twig index 5a2fc7f..9c43e6a 100644 --- a/templates/overlays/stripe.twig +++ b/templates/overlays/stripe.twig @@ -2,6 +2,9 @@ {% block head %} {{ parent() }} <link rel="stylesheet" href="/assets/operators-color.css"> + {% if autorefresh %} + <meta http-equiv="refresh" content="{{ autorefresh }}"> + {% endif %} {% endblock %} {% block body %} {% block stripe %} -- Gitblit v1.8.0