Layout, index page and other stuff

diff --git a/themes/fosdem/layouts/index.html b/themes/fosdem/layouts/index.html
index b0219409301b4d3b8d7195b0e2ee221e93789c7a..498ab230d2671f228b0e95b8d6381de8681a51fd 100644 (file)
--- a/themes/fosdem/layouts/index.html
+++ b/themes/fosdem/layouts/index.html
@@ -15,14 +15,26 @@
     <div class="row">
         <div class="col-sm-12 fosdem-jumbotron">
             <h2>Welcome to the FOSDEM 2021 Stands website!</h2>
-            <p></p>
+            <p class="fosdem-leader">
+                FOSDEM 2021 is our first fully online edition, and FOSDEM would not be FOSDEM without stands; so welcome to our fully online stands display website!
+            </p>
+            <p>
+                Online stands may seem a bit different from physical stands, but not a lot has changed. We have a little over 50 stands, organised per <a href="/themes/">theme</a>.
+                Normally, we would also split them per building, but this year we decided not to do so ;-)
+            </p>
+            <p>
+                Each stand has its own page (or group of pages), with all the information and topics they wish to show you. We've also created a special chat room for each stand, where you can discuss with the team behind the project (a bit like the hallways - though less crowded). Some stands also recorded video's, demoing their product or showing their <i>new hot thing</i>.
+            </p>
+            <p>
+                You can browse the stands per theme <a href="/themes/">here</a> (or below) or visit all the stands <a href="/stands/">here</a>. You can also return to the main conference floor at <a href="https://fosdem.org/2021">fosdem.org</a>.
+            </p>
         </div>
     </div>
     <div class="row mt-4 fosdem-themes">
         {{ range .Site.Taxonomies.themes }}
         <div class="col-sm-3">
             <div class="card mb-3 border-0" style="width: 18rem;">
-                <img src="{{ .Page.Params.Logo | relURL }}" class="card-img" alt="{{ .Page.Title }} logo" />
+                <!--<img src="{{ .Page.Params.Logo | relURL }}" class="card-img" alt="{{ .Page.Title }} logo" />-->
                 <div class="card-body">
                     <h5 class="card-title h6"><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h5>
                     <p class="card-text text-justify">{{ .Page.Params.Description }}</p>

diff --git a/themes/fosdem/layouts/partials/header.html b/themes/fosdem/layouts/partials/header.html
index 0cbdd8b928144cd71cd809449732b1c8755e0144..d2500c807a55f8c3bedcf33436400fbc2f4a1c12 100644 (file)
--- a/themes/fosdem/layouts/partials/header.html
+++ b/themes/fosdem/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row mb-4 px-4 py-4" id="header">
         <div class="col-2">
-            <img src="{{ "fosdem21.png" | relURL }}" alt="FOSDEM 21 logo"/>
+            <a href="/"><img src="{{ "fosdem21.png" | relURL }}" alt="FOSDEM 21 logo"/></a>
         </div>
         <div class="col text-center">
             <ul class="list-inline">

diff --git a/themes/fosdem/layouts/stands/list.html b/themes/fosdem/layouts/stands/list.html
index b9c2dd289684e21f1c8616df7c329d301b2e476c..66d92b3b4cff9d15f81ef337ce60dbbfa9af8d43 100644 (file)
--- a/themes/fosdem/layouts/stands/list.html
+++ b/themes/fosdem/layouts/stands/list.html
@@ -1,28 +1,37 @@
 {{ define "main" }}
 <div class="container">
-{{ range .Pages }}
-{{ if .Params.show_on_overview }}
-<div class="row">
-    <div class="col">
-        <div class="card mb-3 border-0">
-            <div class="row no-gutters">
-                <div class="col-md-2">
-                    <img src="{{ .Params.logo | relURL }}" class="card-img border-0" alt="{{ .Params.title }} logo" />
-                </div>
-                <div class="col-md-10">
-                    <div class="card-body">
-                        <h5 class="card-title"><a href="{{ .Permalink }}">{{ .Params.title }}</a></h5>
-                        <p class="card-text">{{ .Params.description }}</p>
-                        {{ range (.GetTerms "themes") }}
-                        <p class="card-text"><small class="text-muted"><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></small></p>
-                        {{ end }}
-                    </div>
+    <div class="row mt-3 fosdem-description">
+        <div class="col">
+            <p>
+                All stands at FOSDEM 2021. If you want to see them per theme, you can go to <a href="/themes/">the themes page</a>.
+            </p>
+        </div>
+    </div>
+    <div class="row mt-4 fosdem-stands">
+        {{ range .Pages }}
+        {{ if .Params.show_on_overview }}
+        <div class="col-sm-3">
+            <div class="card mb-3 border-0">
+                {{ if (fileExists (path.Join "/static/" .Params.logo)) -}}
+                    <a href="{{ .Permalink }}"><img src="{{ .Params.logo | relURL }}" class="card-img border-0" alt="{{ .Params.title }} logo" /></a>
+                {{ else }}
+                    <a href="{{ .Permalink }}"><img src="/img/empty_stand_logo.jpg" class="card-img border-0" alt="{{ .Params.title }} logo" /></a>
+                {{- end }}
+                <div class="card-body">
+                    <h5 class="card-title"><a href="{{ .Permalink }}">{{ .Params.title }}</a></h5>
+                    {{ if .Params.overview }}
+                    <p class="card-text">{{ .Params.overview | truncate 200 "..." | plainify }}</p>
+                    {{ else }}
+                    <p class="card-text">{{ .Params.description | truncate 200 "..." | plainify }}</p>
+                    {{ end }}
+                    {{ range (.GetTerms "themes") }}
+                    <p class="card-text"><small class="text-muted"><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></small></p>
+                    {{ end }}
                 </div>
             </div>
         </div>
+        {{ end }}
+    {{ end }}
     </div>
 </div>
-{{ end }}
-{{ end }}
-</div>
 {{ end }}
\ No newline at end of file

diff --git a/themes/fosdem/layouts/stands/single.html b/themes/fosdem/layouts/stands/single.html
index 4e9c76f2b227f51dc6ed454ad13ec6a41e8c89bd..516878b647ab43fcd36abb908dc2565634e1e7bc 100644 (file)
--- a/themes/fosdem/layouts/stands/single.html
+++ b/themes/fosdem/layouts/stands/single.html
@@ -10,7 +10,7 @@
     <div class="row">
         <div class="col">
             <nav aria-label="breadcrumb">
-                <ol class="breadcrumb">
+                <ol class="breadcrumb fosdem-breadcrumb">
                     {{ range (.Parent.GetTerms "themes") }}
                         <li class="breadcrumb-item"><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
                     {{ end }}

diff --git a/themes/fosdem/layouts/stands/stand.html b/themes/fosdem/layouts/stands/stand.html
index 61b79dddff1fdf4a27697f80069d48a9afc97c98..739a37f3e177b428afa778f44af16ba5307c73a9 100644 (file)
--- a/themes/fosdem/layouts/stands/stand.html
+++ b/themes/fosdem/layouts/stands/stand.html
@@ -9,7 +9,7 @@
     <div class="row">
         <div class="col">
             <nav aria-label="breadcrumb">
-                <ol class="breadcrumb">
+                <ol class="breadcrumb fosdem-breadcrumb">
                     {{ range (.GetTerms "themes") }}
                         <li class="breadcrumb-item"><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
                     {{ end }}

diff --git a/themes/fosdem/layouts/themes/taxonomy.html b/themes/fosdem/layouts/themes/taxonomy.html
index 6f8b3007009b79c1988afeecf00b393441e493f0..4143d8558f60234d92ec1265e27206588ae44a91 100644 (file)
--- a/themes/fosdem/layouts/themes/taxonomy.html
+++ b/themes/fosdem/layouts/themes/taxonomy.html
@@ -1,28 +1,37 @@
 {{ define "main" }}
 <div class="container">
     <div class="row">
-        <div class="col-md-12 text-center">
+        <div class="col-md-12 text-center fosdem-jumbotron">
             <h4>Welcome to the {{ .Title }} corner!</h4>
         </div>
     </div>
-    <div class="row mb-4 mt-3">
+    <div class="row mb-4 mt-3 fosdem-description">
         <div class="col">
             <p>{{ .Params.Description }}</p>
         </div>
     </div>
-    <div class="row">
-    {{ range .Pages }}
-    {{ if .Params.show_on_overview }}
-        <div class="col">
-            <div class="card mb-3 border-0" style="width: 18rem;">
-                <img src="{{ .Params.Logo | relURL }}" class="card-img border-0" alt="{{ .Params.Title }} logo" />
+    
+    <div class="row mt-4 fosdem-stands">
+        {{ range .Pages }}
+        {{ if .Params.show_on_overview }}
+        <div class="col-sm-3">
+            <div class="card mb-3 border-0">
+                {{ if (fileExists (path.Join "/static/" .Params.logo)) -}}
+                    <a href="{{ .Permalink }}"><img src="{{ .Params.logo | relURL }}" class="card-img border-0" alt="{{ .Params.title }} logo" /></a>
+                {{ else }}
+                    <a href="{{ .Permalink }}"><img src="/img/empty_stand_logo.jpg" class="card-img border-0" alt="{{ .Params.title }} logo" /></a>
+                {{- end }}
                 <div class="card-body">
-                    <h5 class="card-title h6"><a href="{{ .Permalink }}">{{ .Params.Title }}</a></h5>
-                    <p class="card-text text-justify">{{ .Params.Description }}</p>
+                    <h5 class="card-title"><a href="{{ .Permalink }}">{{ .Params.title }}</a></h5>
+                    {{ if .Params.overview }}
+                    <p class="card-text">{{ .Params.overview | truncate 200 "..." | plainify }}</p>
+                    {{ else }}
+                    <p class="card-text">{{ .Params.description | truncate 200 "..." | plainify }}</p>
+                    {{ end }}
                 </div>
             </div>
         </div>
-    {{ end }}
+        {{ end }}
     {{ end }}
     </div>
 </div>

diff --git a/themes/fosdem/layouts/themes/terms.html b/themes/fosdem/layouts/themes/terms.html
index 68fc1f635a5574b38da3a090187be1d6fe49062b..8da2d0aaa66ba96e5e87c1056731c7ee3a0788b6 100644 (file)
--- a/themes/fosdem/layouts/themes/terms.html
+++ b/themes/fosdem/layouts/themes/terms.html
@@ -1,9 +1,9 @@
 {{ define "main" }}
 <div class="container">
     <div class="row">
-        <div class="col"><h4>Welcome to our themes page!</h4></div>
+        <div class="col fosdem-jumbotron"><h4>Welcome to our themes page!</h4></div>
     </div>
-    <div class="row mt-3">
+    <div class="row mt-3 fosdem-description">
         <div class="col">
             <p>There are over 50 stands at FOSDEM, and it is not always easy to find what you are looking for. To ease your search, we have organised all stands per theme, so related projects are closer together.</p>
             <p>Not only can you find your favourite stand easier and faster, but it also allows related projects to talk to each other and maybe collaborate on common issues. We encourage fraternizing!</p>
@@ -13,7 +13,7 @@
         {{ range .Site.Taxonomies.themes }}
         <div class="col-sm-3">
             <div class="card mb-3 border-0" style="width: 18rem;">
-                <img src="{{ .Page.Params.Logo | relURL }}" class="card-img" alt="{{ .Page.Title }} logo" />
+                <!--<img src="{{ .Page.Params.Logo | relURL }}" class="card-img" alt="{{ .Page.Title }} logo" />-->
                 <div class="card-body">
                     <h5 class="card-title h6"><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h5>
                     <p class="card-text text-justify">{{ .Page.Params.Description }}</p>

diff --git a/themes/fosdem/static/css/fosdem.css b/themes/fosdem/static/css/fosdem.css
index 68ab34ad834b0876616a44ba47ce1718e87eb945..a08a1458b9d62c6fd02078d67b0bed5f63b0661f 100644 (file)
--- a/themes/fosdem/static/css/fosdem.css
+++ b/themes/fosdem/static/css/fosdem.css
@@ -178,9 +178,15 @@ body {
 }
 
 .fosdem-jumbotron {
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+    font-size: 13px;
+    line-height: 15px;
+}
+
+.fosdem-leader {
     font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
-    font-size: 20px;
-    line-height: 26px;
+    font-size: 16px;
+    line-height: 18px;
 }
 
 .fosdem-jumbotron h2 {
@@ -190,4 +196,48 @@ body {
 
 .fosdem-themes {
     font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+.fosdem-stands {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+.fosdem-description {
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    line-height: 16px;
+}
+
+.fosdem-breadcrumb {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    line-height: 16px;
+}
+
+.fosdem-breadcrumb a {
+    color: #a3238e;
+}
+
+h1 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+h2 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+h3 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+h4 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+h5 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+h6 {
+    font-family: Signika, "DejaVu Sans", Arial, Helvetica, sans-serif;
 }
\ No newline at end of file

diff --git a/themes/fosdem/static/img/empty_stand_logo.jpg b/themes/fosdem/static/img/empty_stand_logo.jpg
new file mode 100644 (file)
index 0000000..ac92bcc
Binary files /dev/null and b/themes/fosdem/static/img/empty_stand_logo.jpg differ