Merge branch 'master' of github.com:fykosak/webs

fykosak · Nov 23, 2024 · ad87e32 · ad87e32
2 parents e1d1973 + cf7a030
commit ad87e32
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/app/Components/ResultsPanel/panel.latte b/app/Components/ResultsPanel/panel.latte
@@ -17,14 +17,27 @@
 
             {*<div style="color:black;background:#ffd700;max-width: 50rem; margin: 1rem auto; padding: 1rem;">We apologize for duration with sending certificates for participation. Due to teams, which cheated, the ranking will change slightly. Because of this, all is a little bit late.</div>*}
         {/switch}
+        {if $event->eventId == 189}
+        <p>
+        <strong>
+        {switch $lang->value}
+        {case 'cs'}
+            Výsledky ještě nejsou finální.
+        {default}
+            Results are not final yet.
+        {/switch}
+        </strong>
+        </p>
+        {/if}
         <div
-                id="results-panel"
-                data-url="{link apiResults:results!}"
-                data-lang="{$lang->value}"
-                class="results-panel"
-                data-teams="{control apiResults:teamsData}"
-                data-results="{control apiResults:resultsData}"
-        ></div>
+             id="results-panel"
+             data-url="{link apiResults:results!}"
+             data-lang="{$lang->value}"
+             class="results-panel"
+             data-teams="{control apiResults:teamsData}"
+             data-results="{control apiResults:resultsData}"
+        >
+        </div>
         <script src="{asset 'assets/results.js'}"></script>
     </section>
 </div>
diff --git a/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte b/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte
@@ -262,10 +262,10 @@
             {switch $language->value}
                 {case 'cs'}
                 <h1>Jak zaplatit za ubytování a raut?</h1>
-                <p>Při placení postupujte podle pokynů uvedených na <a href="http://db.fykos.local/shop/schedule191/create">této stránce</a>.</p>
+                <p>Při placení postupujte podle pokynů uvedených na <a href="https://db.fykos.cz/shop/schedule191/create">této stránce</a>.</p>
             {default}
                 <h1>How to pay for accommodation and buffet?</h1>
-                <p>When making a payment, please follow the instructions provided on <a href="http://db.fykos.local/shop/schedule191/create">this page</a>.</p>
+                <p>When making a payment, please follow the instructions provided on <a href="https://db.fykos.cz/shop/schedule191/create">this page</a>.</p>
             {/switch}
         </section>
     </div>

diff --git a/app/Modules/Fof/DefaultModule/templates/Default/default.latte b/app/Modules/Fof/DefaultModule/templates/Default/default.latte
@@ -31,8 +31,8 @@
                         {/switch}
                     {elseif $newestEvent->getRegistrationPeriod()->isOnGoing()}
                         {switch $language->value}
-                            {case 'cs'}<p>Registace pro rok 2024 je otevřena!<br>Loni se nás sešlo téměř 1200 z více než 20 zemí světa; pojďte si s námi užít tento svátek fyziky i letos!</p>
-                            {default}<p>Registration for the year 2024 is open!<br>Last year, almost 1200 of us gathered from more than 20 countries around the world. Come and enjoy this physics feast with us again this year!</p>
+                            {case 'cs'}<p>Registace pro rok 2025 je otevřena!<br>Loni se nás sešlo téměř 1200 z více než 20 zemí světa; pojďte si s námi užít tento svátek fyziky i letos!</p>
+                            {default}<p>Registration for the year 2025 is open!<br>Last year, almost 1200 of us gathered from more than 20 countries around the world. Come and enjoy this physics feast with us again this year!</p>
                         {/switch}
                     {elseif $newestEvent->getRegistrationPeriod()->isBefore()}
                         {switch $language->value}

diff --git a/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte b/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte
@@ -92,24 +92,12 @@
             </div>
             <h1>Městská hra</h1>
             <p>Městská hra probíhá průběžně celý týden.</p>
-            <button
-                class="my-2 btn btn-primary"
-                onclick="alert('Městská hra skutečně probíhá průběžně celý týden.')"
-            >
-                Detail
-            </button>
             {default}
             <div class="subheader">
                 February 12, 2025 - February 16, 2025
             </div>
             <h1>City rally</h1>
             <p>The city rally runs continuously throughout the week.</p>
-            <button
-                class="my-2 btn btn-primary"
-                onclick="alert('The city rally does indeed run continuously throughout the week.')"
-            >
-                Detail
-            </button>
             {/switch}
             {var $key = null}
             {* {dump $groups} *}

diff --git a/app/Modules/Fol/DefaultModule/templates/Default/default.latte b/app/Modules/Fol/DefaultModule/templates/Default/default.latte
@@ -75,11 +75,11 @@
             </div>
         </div>
         <div class="col-md-6 right-block topic-panel">
-            {* {if $newestEvent->getRegistrationPeriod()->is(Fykosak\Utils\DateTime\Phase::before)}
+            {if $newestEvent->getRegistrationPeriod()->is(Fykosak\Utils\DateTime\Phase::before)}
             {control upperHomeBeforeRegistration}
             {elseif true}
             {control upperHomeMap}
-            {/if} *}
+            {/if}
         </div>
     </div>
 </div>
@@ -100,9 +100,6 @@
             Pro zachování férovosti soutěže proto rušíme veškeré bodové
             penalizace za chybné odpovědi odevzdané před <strong>18:11 CET</strong>.
         </p>
-        <p>
-            Výsledky ještě nejsou finální.
-        </p>
         <p>
             Děkujeme za pochopení a vaši účast v soutěži!
         </p>
@@ -121,9 +118,6 @@
             To address this issue fairly, we will cancel any penalties for incorrect
             answers to this problem until <strong>18:11 CET</strong>.
         </p>
-        <p>
-            Results are not final yet.
-        </p>
         <p>
             Thank you for your understanding and for competing!
         </p>