adaptions and new tag column

inanamm · Aug 6, 2024 · 3daee22 · 3daee22
1 parent b63d16a
commit 3daee22
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 44 deletions.
diff --git a/content/projects/3_projekt-3/project.de.txt b/content/projects/3_projekt-3/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicetwo
 
 ----
 
-Tag: artInstallation
+Tag: research
 
 ----
 

diff --git a/content/projects/4_projekt-4/project.de.txt b/content/projects/4_projekt-4/project.de.txt
@@ -1,12 +1,12 @@
-Title: Basler Münster
+Title: Projekttitel
 
 ----
 
 Categoryb: choicetwo
 
 ----
 
-Tag: building
+Tag: artInstallation
 
 ----
 
@@ -49,7 +49,7 @@ Das Basler Münster ist nicht nur ein Ort der Anbetung, sondern auch ein Ort der
 
 ----
 
-Listtitle: <p>Münster</p>
+Listtitle: <p>Projektname</p>
 
 ----
 

diff --git a/content/projects/5_projekt-5/project.de.txt b/content/projects/5_projekt-5/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicetwo
 
 ----
 
-Tag: building
+Tag: infrastructure
 
 ----
 

diff --git a/content/projects/6_projekt-6/project.de.txt b/content/projects/6_projekt-6/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicefive
 
 ----
 
-Tag: built
+Tag: housing
 
 ----
 

diff --git a/content/projects/7_projekt-7/project.de.txt b/content/projects/7_projekt-7/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicefour
 
 ----
 
-Tag: sportAndCulture
+Tag: serviceAndIndustry
 
 ----
 

diff --git a/content/projects/8_projekt-8/project.de.txt b/content/projects/8_projekt-8/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicethree
 
 ----
 
-Tag: education
+Tag: sportAndCulture
 
 ----
 

diff --git a/content/projects/9_projekt-9/project.de.txt b/content/projects/9_projekt-9/project.de.txt
@@ -1,12 +1,12 @@
-Title: SmartCity Mobility
+Title: Die aufgehängte Turnhalle
 
 ----
 
-Categoryb: choiceone
+Categoryb: choicefour
 
 ----
 
-Tag: notbuilt
+Tag: serviceAndIndustry
 
 ----
 
@@ -27,6 +27,9 @@ Information:
 - 
   projectdetails: timeframe
   value: 2022–2023
+- 
+  projectdetails: competition result
+  value: '<p>1. Platz</p>'
 
 ----
 
@@ -52,7 +55,7 @@ Diese umfassenden Ziele sind die Grundlage unseres Engagements, die Stadt in ein
 
 ----
 
-Listtitle: <p>SmartCity</p>
+Listtitle: <p>Collège de Vidy, Lausanne</p>
 
 ----
 

diff --git a/content/projects/testdingi/project.de.txt b/content/projects/testdingi/project.de.txt
@@ -6,7 +6,7 @@ Categoryb: choicethree
 
 ----
 
-Tag: building
+Tag: housing
 
 ----
 

diff --git a/site/languages/de.php b/site/languages/de.php
@@ -71,6 +71,7 @@
         'research'           => 'Forschung',
         'serviceAndIndustry' => 'Dienstleistung und Gewerbe',
         'sportAndCulture'    => 'Sport und Kultur',
+        'field'              => 'Bereich',
 
         'choiceone'             => 'Recherche',
         'choicetwo'             => 'Anderes',

diff --git a/site/languages/fr.php b/site/languages/fr.php
@@ -59,6 +59,7 @@
         'research'           => 'Recherche',
         'serviceAndIndustry' => 'Services et industrie',
         'sportAndCulture'    => 'Sport et culture',
+        'field'              => 'Domaine',
 
         'choiceone'   => 'Recherche',
         'choicetwo'   => 'Divers',

diff --git a/site/templates/worklist.php b/site/templates/worklist.php
@@ -33,7 +33,7 @@
             <?= $page->title() ?>
         </h1>
 
-        <h2 class="font-sans px-3">
+        <h2 class="px-3 font-sans text-lg">
             <?= t("projects") ?>
         </h2>
 
@@ -45,14 +45,15 @@
                 $projectsPage = $pages->get('projects');
                 $projects = $projectsPage->children();
                 $filteredProjects = $projects->filter(function ($project) {
-                    return $project->categoryB()->value() !== 'choicethree' && $project->categoryB()->value() !== 'choicefour';
+                    return $project->categoryB()->value() !== 'choicethree';
                 })->sortBy('title', 'asc'); ?>
 
-                <div class="font-mono text-xs grid grid-cols-2 lg:grid-cols-12 lg:gap-3 pb-1">
-                    <p class="hidden lg:block lg:col-span-4"><?= t("projecttitle") ?></p>
-                    <p class="row-start-2 lg:row-start-1 lg:col-span-4"><?= t("project") ?></p>
+                <div class="font-mono text-sm grid grid-cols-2 lg:grid-cols-12 lg:gap-1 pb-1">
+                    <p class="lg:col-span-3"><?= t("projecttitle") ?></p>
+                    <p class="hidden lg:block lg:row-start-1 lg:col-span-3"><?= t("project") ?></p>
                     <p class="col-start-2 lg:col-span-2"><?= t("collaboration") ?></p>
-                    <p class="col-start-2 lg:col-span-2 lg:text-right"><?= t("timeframe") ?></p>
+                    <p class="col-start-2 lg:col-span-3"><?= t("field") ?></p>
+                    <p class="col-start-2 lg:col-span-1 lg:text-right"><?= t("timeframe") ?></p>
                 </div>
 
                 <?php foreach ($filteredProjects as $project): ?>
@@ -64,14 +65,14 @@
                     ?>
 
                     <a href=<?= $url ?>
-                        class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border-b lg:gap-3 hover:text-cslightblue group">
+                        class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border-b lg:gap-1 hover:text-cslightblue group">
 
-                        <div class="hidden col-span-1 lg:col-span-4 lg:flex flex-row">
+                        <div class="hidden col-span-1 lg:col-span-3 lg:flex flex-row">
                             <p class="hidden lg:group-hover:block pr-1">↗</p>
                             <?= $name->kt() ?>
                         </div>
 
-                        <div class="col-start-1 col-span-1 lg:col-span-4"><?= $title ?></div>
+                        <div class="col-start-1 col-span-1 lg:col-span-3"><?= $title ?></div>
 
                         <?php
                         $collab = $info->findBy("projectdetails", "collaboration");
@@ -88,7 +89,12 @@ class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border
                             </div>
                         <?php endif ?>
 
-                        <div class="col-start-2 col-span-1 lg:col-span-2 lg:col-end-13 lg:text-right">
+
+                        <div class="col-start-2 col-span-1 lg:col-span-3">
+                            <?= t($project->tag()->value()) ?>
+                        </div>
+
+                        <div class="col-start-2 col-span-1 lg:col-span-1 lg:col-end-13 lg:text-right">
                             <?php foreach ($project->information()->toStructure() as $projectDetail): ?>
                                 <?php if ($projectDetail->projectDetails()->value() == "timeframe"): ?>
                                     <?= $projectDetail->value() ?>
@@ -103,7 +109,7 @@ class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border
         <!-- WETTBEWERBE -->
         <?php if ($pages->get('projects')->children()->filterBy('choicethree' || 'choicefour')->isEmpty()): ?>
 
-            <h2 class="font-sans px-3 pt-6">
+            <h2 class="px-3 pt-6 font-sans text-lg">
                 <?= t("competitions") ?>
             </h2>
             <div class="flex flex-col font-sans text-base pt-2">
@@ -116,11 +122,13 @@ class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border
                         return $project->categoryB()->value() === 'choicethree' || $project->categoryB()->value() === 'choicefour';
                     })->sortBy('title', 'asc'); ?>
 
-                    <div class="font-mono text-xs grid grid-cols-2 lg:grid-cols-12 lg:gap-3 pb-1">
-                        <p class="col-start-1 lg:col-start-1 lg:col-span-4"><?= t("project") ?></p>
-                        <p class="row-start-2 lg:row-start-1 lg:col-start-5 lg:col-span-4"><?= t("competition result") ?></p>
+                    <div class="font-mono text-sm grid grid-cols-2 lg:grid-cols-12 lg:gap-1 pb-1">
+                        <p class="row-start-1 col-start-1 lg:col-start-1 lg:col-span-3"><?= t("projecttitle") ?></p>
+                        <p class="row-start-2 lg:row-start-auto lg:col-span-3"><?= t("competition result") ?>
+                        </p>
                         <p class="col-start-2 lg:col-span-2"><?= t("collaboration") ?></p>
-                        <p class="col-start-2 lg:col-span-2 lg:text-right"><?= t("timeframe") ?></p>
+                        <p class="col-start-2 lg:col-span-3"><?= t("field") ?></p>
+                        <p class="col-start-2 lg:col-span-1 lg:text-right"><?= t("timeframe") ?></p>
                     </div>
 
                     <?php foreach ($filteredProjects as $project): ?>
@@ -132,14 +140,14 @@ class="grid grid-cols-2 lg:grid-cols-12 py-1 border-t border-csblack last:border
                         ?>
 
                         <a href=<?= $url ?>
-                            class="grid grid-rows-2 auto-cols-fr grid-flow-col lg:grid-flow-row lg:grid-rows-1 lg:grid-cols-12 py-1 border-t border-csblack last:border-b lg:gap-3 hover:text-cslightblue group">
+                            class="grid grid-rows-2 auto-cols-fr grid-flow-col lg:grid-flow-row lg:grid-rows-1 lg:grid-cols-12 py-1 border-t border-csblack last:border-b lg:gap-1 hover:text-cslightblue group">
 
-                            <div class="lg:col-span-4 lg:flex">
+                            <div class="lg:col-span-3 lg:flex">
                                 <p class="hidden lg:group-hover:block pr-1">↗</p>
-                                <?= $name->kt() ?>
+                                <?= $title->kt() ?>
                             </div>
 
-                            <div class="lg:col-span-4">
+                            <div class="lg:col-span-3">
                                 <?php $competitionResult = $info->findBy("projectdetails", "competition result") ?>
                                 <?php if ($competitionResult): ?>
                                     <?= $competitionResult->value() ?>
@@ -151,36 +159,32 @@ class="grid grid-rows-2 auto-cols-fr grid-flow-col lg:grid-flow-row lg:grid-rows
                             $architecture2 = $info->findBy("projectdetails", "architecture");
                             ?>
                             <?php if ($collab2): ?>
-                                <div class="col-span-1 lg:col-span-2">
+                                <div class="col-start-2 lg:col-span-2">
                                     <?= $collab2->value()->excerpt(0, true) ?>
                                 </div>
                             <?php endif ?>
                             <?php if (!$collab2 && $architecture2): ?>
-                                <div class="col-span-1 lg:col-span-2">
+                                <div class="col-start-2 lg:col-span-2">
                                     <?= $architecture2->value()->excerpt(0, true) ?>
                                 </div>
                             <?php endif ?>
 
-
-
-                            <!-- <div class="lg:col-span-2 lg:col-end-13 lg:text-right">
-                                <?php $timeframe = $info->findBy("projectdetails", "timeframe") ?>
-                                <?php if ($timeframe): ?>
-                                    <?= $timeframe->value() ?>
-                                <?php endif ?>
-                            </div> -->
+                            <div class="col-start-2 lg:col-span-3">
+                                <?= t($project->tag()->value()) ?>
+                            </div>
 
                             <?php
                             $timeframe = $info->findBy("projectdetails", "timeframe");
                             $planificationperiod = $info->findBy("projectdetails", "planification period");
                             ?>
                             <?php if ($timeframe): ?>
-                                <div class="lg:col-span-2 lg:col-end-13 lg:text-right">
+                                <div class="col-start-2 lg:col-span-1 lg:col-end-13 lg:text-right">
                                     <?= $timeframe->value() ?>
                                 </div>
                             <?php endif ?>
+
                             <?php if (!$timeframe && $planificationperiod): ?>
-                                <div class="lg:col-span-2 lg:col-end-13 lg:text-right">
+                                <div class="col-start-2 lg:col-span-1 lg:col-end-13 lg:text-right">
                                     <?= $planificationperiod->value() ?>
                                 </div>
                             <?php endif ?>