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

fykosak · Nov 22, 2023 · 268b6dc · 268b6dc
2 parents 5331f6c + 86c65b7
commit 268b6dc
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 165 deletions.
diff --git a/app/Modules/Fof/DefaultModule/templates/AboutTheCompetition/organizers.latte b/app/Modules/Fof/DefaultModule/templates/AboutTheCompetition/organizers.latte
diff --git a/app/Modules/Fof/DefaultModule/templates/Rules/complete.cs.latte b/app/Modules/Fof/DefaultModule/templates/Rules/complete.cs.latte
@@ -9,7 +9,7 @@ https://drive.google.com/drive/folders/1HMqu1aoHX8rjcM4oO-ms-1r0N1xnv4MG
     <div class="panel color-auto">
         <section class="inner-container">
             <h1>{include title}</h1>
-            <a href="{$basePath}/download/2023/Pravidla%20Fyziklání%20(2022-09-23).pdf" class="btn btn-primary">
+            <a href="{$basePath}/download/2024/Pravidla%20Fyziklání%20(2023-09-19).pdf" class="btn btn-primary">
                 Verze v PDF
             </a>
             <ul class="mt-5">

diff --git a/app/Modules/Fof/DefaultModule/templates/Rules/complete.en.latte b/app/Modules/Fof/DefaultModule/templates/Rules/complete.en.latte
@@ -9,7 +9,7 @@ https://drive.google.com/drive/folders/1HMqu1aoHX8rjcM4oO-ms-1r0N1xnv4MG
     <div class="panel color-auto">
         <section class="inner-container">
             <h1>{include title}</h1>
-            <a href="{$basePath}/download/2023/Competition%20Rules%20of%20Fyziklani%20(2022-09-23).pdf" class="btn btn-primary">
+            <a href="{$basePath}/download/2024/Competition%20Rules%20of%20Fyziklani%20(2023-09-19).pdf" class="btn btn-primary">
                 PDF version
             </a>
             <ul class="mt-5">

diff --git a/tests/PresentersTests/PageDisplay/Fof/ArchiveModule.phpt b/tests/PresentersTests/PageDisplay/Fof/ArchiveModule.phpt
@@ -25,8 +25,8 @@ class ArchiveModule extends AbstractPageDisplayTestCase
         return self::getPageLangVariants([
             ['Archive:Default', 'default'],
             ['Archive:DetailedResults', 'default'],
-            ['Archive:Erasmus', 'default'],
-            ['Archive:Erasmus', 'report'],
+            //['Archive:Erasmus', 'default'],
+            //['Archive:Erasmus', 'report'],
             //['Archive:Reports', 'default'],
             ['Archive:Results', 'default'],
             ['Archive:Teams', 'default'],

diff --git a/www/fof/download/2024/CZ - Pravidla Fyziklání (2023-09-19).pdf b/www/fof/download/2024/CZ - Pravidla Fyziklání (2023-09-19).pdf
diff --git a/www/fof/download/2024/Competition Rules of Fyziklani (2023-09-19).pdf b/www/fof/download/2024/Competition Rules of Fyziklani (2023-09-19).pdf
diff --git a/www/fof/download/2024/Pravidla Fyziklání (2023-09-19).pdf b/www/fof/download/2024/Pravidla Fyziklání (2023-09-19).pdf