misc layout

fykosak · Aug 22, 2024 · 53077d6 · 53077d6
1 parent 573fa4f
commit 53077d6
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 19 deletions.
diff --git a/app/Modules/Fykos/Core/styles/results.scss b/app/Modules/Fykos/Core/styles/results.scss
@@ -37,6 +37,13 @@
             left: 50%;
             transform: translate(-50%, -50%);
         }
+
+        &.full-width {
+            flex: 1 0 100%;
+            height: 3rem;
+            font-size: 1.2rem;
+            border-top: 1px solid lightgray;
+        }
     }
 
     .dropdown-menu {
@@ -65,9 +72,9 @@
         padding: 0;
     }
 
-    .dropdown-menu {
-        border: none;
-    }
+    // .dropdown-menu {
+    //     border: none;
+    // }
 
     .accordion-button {
         background-color: white !important;

diff --git a/app/Modules/Fykos/DefaultModule/templates/Problems/default.latte b/app/Modules/Fykos/DefaultModule/templates/Problems/default.latte
@@ -58,7 +58,7 @@
                         </button>
                         <div class="accordion current-year-accordion">
                             <div class="accordion-item">
-                                <h2 class="accordion-header" id="heading{$yearOption}">
+                                <h2 class="accordion-header">
                                     <div class="accordion-button">
                                         {switch $language->value}
                                             {case 'cs'}Ročník {$year}
@@ -70,7 +70,7 @@
                                     <div class="accordion-body">
                                         <div class="series-container">
                                             {foreach $yearsAndSeries[$year] as $seriesOption}
-                                                <a class="series-box btn" href="{plink 'this' 'year'=>$yearOption, 'series'=>$seriesOption}">{$seriesOption}</a>
+                                                <a class="series-box btn" href="{plink 'this' 'year'=>$year, 'series'=>$seriesOption}">{$seriesOption}</a>
                                             {/foreach}
                                         </div>
                                     </div>

diff --git a/app/Modules/Fykos/DefaultModule/templates/Results/default.latte b/app/Modules/Fykos/DefaultModule/templates/Results/default.latte
@@ -10,21 +10,50 @@
 {block main}
 <div class="panel color-auto">
     <section class="inner-container">
-        <h1>
-            {switch $language->value}
-                {case 'cs'}Výsledky {$year}. ročníku FYKOSu
-                {default}Results of FYKOS Year {$year}
-            {/switch}
-        </h1>
+    <div class="row">
+        <div class="col-md-8">
+
+            <h1>
+                {switch $language->value}
+                    {case 'cs'}Výsledky {$year}. ročníku FYKOSu
+                    {default}Results of FYKOS Year {$year}
+                {/switch}
+            </h1>
 
-        <p>
-            {switch $language->value}
-                {case 'cs'}Zde najdete výsledkovou listinu {$year}. ročníku Fyzikálního korespondenčního semináře.
-                {default}Here you can find the results of the year {$year} of the FYKOS correspondence competition.
-            {/switch}
-        </p>
+            <p>
+                {switch $language->value}
+                    {case 'cs'}Zde najdete výsledkovou listinu {$year}. ročníku Fyzikálního korespondenčního semináře.
+                    {default}Here you can find the results of the year {$year} of the FYKOS correspondence competition.
+                {/switch}
+            </p>
+        </div>
+        <div class="col-md-4 pl-md-2">
+            <div class="dropdown year-and-series-select">
+                <button class="btn btn-primary dropdown-toggle year-select-button" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                    {switch $language->value}
+                        {case 'cs'}Vybrat ročník
+                        {default}Select Year
+                    {/switch}
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                    <div class="scrollable-menu">
+                        <div class="series-container">
+                            {for $yearOption = $currentYear; $yearOption >= 1; $yearOption--}
+                                <a class="series-box full-width btn" href="{plink 'this' 'year'=>$yearOption}">
+                                    {switch $language->value}
+                                        {case 'cs'}{$yearOption}. ročník ({$yearOption + 1987}/{($yearOption + 1988) % 100})
+                                        {default}Year {$yearOption}
+                                    {/switch}
+                                </a>                                    
+                            {/for}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
 
-        <div class="mb-3">
+        {* <div class="mb-3">
             <button class="btn btn-primary-inverted button-collapse-header" type="button" data-bs-toggle="collapse"
             data-bs-target="#resultFilters" aria-expanded="false" aria-controls="resultFilters">
                 {switch $language->value}
@@ -52,7 +81,7 @@
                     {/if}
                 {/for}
             </div>
-        </div>
+        </div> *}
 
         <p>
             {switch $language->value}