Improve author types icons operating

Extract icon class type associations as parameters, reduces maintenance costs and the number of lines of code.
openfisca · Jan 27, 2023 · aadaa8b · aadaa8b
1 parent f5936ca
commit aadaa8b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/config/_default/params.yaml b/config/_default/params.yaml
@@ -8,3 +8,15 @@ homepage_featured:
   - revenu_de_base
   - rapu_ture
   - nsw_legislation_explorer
+showcase:
+  author:
+    types:
+      icons:
+        default: user
+        individual: user
+        collective: users
+        ngo: globe
+        research_center: graduation-ap
+        business: factory
+        local_government: building
+        national_government: landmark
diff --git a/themes/OpenFisca-2022/layouts/_default/showcase.html b/themes/OpenFisca-2022/layouts/_default/showcase.html
@@ -7,7 +7,7 @@
             <div class="cards">
             {{ range $.Site.Data.showcase }}
                 {{ $description := index .description $.Site.Language.Lang }}
-                {{ partial "card.html" (dict "title" .title "description" $description "country" .country "website" .website "author" .author) . }}
+                {{ partial "card.html" (dict "title" .title "description" $description "country" .country "website" .website "author" .author "Site" $.Site) }}
             {{ end }}
             </div>
         </div>

diff --git a/themes/OpenFisca-2022/layouts/_default/styleguide.html b/themes/OpenFisca-2022/layouts/_default/styleguide.html
@@ -45,7 +45,7 @@ <h2 class="grid_col-12 text-center">Built with OpenFisca</h2>
             <div class="cards">
                  {{ range $.Site.Data.showcase }}
                     {{ $description := index .description $.Site.Language.Lang }}
-                    {{ partial "card.html" (dict "title" .title "description" $description "country" .country "website" .website "author" .author) . }}
+                    {{ partial "card.html" (dict "title" .title "description" $description "country" .country "website" .website "author" .author "Site" $.Site) }}
                 {{ end }}
                 {{ partial "card.html" (dict "title" "Laboris nisi ut aliquip" "description" "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." "country" "FR" "website" "https://www.openfisca.org" "tags" $tags) . }}
             </div>

diff --git a/themes/OpenFisca-2022/layouts/index.html b/themes/OpenFisca-2022/layouts/index.html
@@ -11,7 +11,7 @@ <h2 class="grid_col-12 text-center">{{ .Params.build_with.title }}</h2>
                {{ range $slug := .Param "homepage_featured" }}
                   {{ $showcase := index $.Site.Data.showcase $slug }}
                   {{ $description := index $showcase.description $.Site.Language.Lang }}
-                  {{ partial "card.html" (dict "title" $showcase.title "description" $description "country" $showcase.country "website" $showcase.website "author" $showcase.author) . }}
+                  {{ partial "card.html" (dict "title" $showcase.title "description" $description "country" $showcase.country "website" $showcase.website "author" $showcase.author "Site" $.Site) }}
                {{ end }}
             </div>
             <div class="grid_col-12 text-center mt-xl2">

diff --git a/themes/OpenFisca-2022/layouts/partials/card.html b/themes/OpenFisca-2022/layouts/partials/card.html
@@ -5,6 +5,10 @@
 	{{ $imageSrc = $newImageSrc}}
 {{ end }}
 
+{{ $authorType := .Site.Params.showcase.author.types.icons.default }}
+{{ with .author }}{{ with .type }}{{ $authorType = . }}{{ end }}{{ end }}
+{{ $authorTypeIcon := index .Site.Params.showcase.author.types.icons $authorType }}
+
 <div class="card {{ if .website }}card-hasLink{{ end }}">
 	<div class="card_image">
 		<img class="screenshot" src="{{ $imageSrc }}" alt="{{ .title }}" />
@@ -26,21 +30,14 @@ <h3 class="card_title">{{ .title }}</h3>
 		</div>
 	{{ end }}
 	<a class="card_link" target="_blank" href="{{ .website | safeURL }}">{{ .website | safeURL }}</a>
-	{{ with .author }}
+	{{ with .author }}{{ with .name }}
 		<div class="card_author">
-			<div class="card_author_icon iconWrapper iconWrapper-rounded">
-					{{ $iconClass := "user" }}
-					{{ with (eq $.author.type "collective") }} {{ $iconClass = "users" }} {{ end }}
-					{{ with (eq $.author.type "ngo") }} {{ $iconClass = "globe" }} {{ end }}
-					{{ with (eq $.author.type "research_center") }} {{ $iconClass = "graduation-cap" }} {{ end }}
-					{{ with (eq $.author.type "business") }} {{ $iconClass = "factory" }} {{ end }}
-					{{ with (eq $.author.type "local_government") }} {{ $iconClass = "building" }} {{ end }}
-					{{ with (eq $.author.type "national_government") }} {{ $iconClass = "landmark" }} {{ end }}
-					<i icon-name="{{ $iconClass }}"></i>
-			</div>
-			<div class="card_author_name">
-				{{ with $.author.name }}{{ . }}{{ end }}
-			</div>
+				<div class="card_author_icon iconWrapper iconWrapper-rounded">
+					<i icon-name="{{ $authorTypeIcon }}"></i>
+				</div>			
+				<div class="card_author_name">
+					{{ . }}
+				</div>		
 		</div>
-	{{ end }}
+	{{ end }}{{ end }}
 </div>