Moar

- ujednolicenie QRZ, maili do flag w authors.yml, dodanie mastodona do obsługiwania (rel=me dla verify też) - Ogarnięcie wyświetlania niezerowych zasług na liście wszystkich - Zmiana layoutu wyświetlania wystąpień i projektów na taki, jak na podstronie z projektami - dummy.jpg - lvl wyzej i zastosowanie do wystapien przy puku i talkach
HackerspaceKRK · Jun 29, 2024 · 652997e · 652997e
1 parent 270b1d0
commit 652997e
Show file tree

Hide file tree

Showing 160 changed files with 442 additions and 252 deletions.
diff --git a/_data/authors.yml b/_data/authors.yml
@@ -8,13 +8,10 @@ sq9wtf:
   speaker         : no
   callsign        : SQ9WTF
   authorpage      :  "/authors/sq9wtf"
-  links:
-    - label: "Email"
-      icon: "fas fa-fw fa-envelope-square"
-      url: "mailto:[email protected]"
-    - label: "QRZ.com"
-      icon: "fas fa-fw fa-book"
-      url: "https://www.qrz.com/db/sq9wtf"
+  email           : "[email protected]"
+  github          : "wprzyb"
+  instagram       : "wprzyb"
+  mastodon        : "https://mastodon.radio/@sq9wtf"
 
 sp6mar:
   name            : "Martyna"
@@ -25,10 +22,7 @@ sp6mar:
   constructor     : no
   speaker         : no
   authorpage      :  "/authors/sp6mar"
-  links:
-    - label: "Email"
-      icon: "fas fa-fw fa-envelope-square"
-      url: "mailto:[email protected]"
+  email           : "[email protected]"
 
 sq9zaq:
   name            : "canis_lupus"
@@ -41,13 +35,7 @@ sq9zaq:
   zjazd_orga      : yes
   constructor     : yes
   speaker         : no
-  links:
-    - label: "Email"
-      icon: "fas fa-fw fa-envelope-square"
-      url: "mailto:[email protected]"
-    - label: "QRZ.com"
-      icon: "fas fa-fw fa-book"
-      url: "https://www.qrz.com/db/sq9zaq"
+  email           : "[email protected]"
 
 sp3htf:
   name            : "Rafał"
@@ -88,10 +76,6 @@ sp9mrn:
   zjazd_orga      : yes
   constructor     : yes
   speaker         : no
-  links:
-    - label: "QRZ.com"
-      icon: "fas fa-fw fa-book"
-      url: "https://www.qrz.com/db/sp9mrn"
 
 sp2fp:
   name            : "Paweł"
@@ -101,10 +85,6 @@ sp2fp:
   zjazd_orga      : no
   constructor     : yes
   speaker         : no
-  links:
-    - label: "QRZ.com"
-      icon: "fas fa-fw fa-book"
-      url: "https://www.qrz.com/db/sp2fp"
 
 sq7hjb:
   name            : "Marek"
@@ -115,10 +95,6 @@ sq7hjb:
   zjazd_orga      : no
   constructor     : yes
   speaker         : no
-  links:
-    - label: "QRZ.com"
-      icon: "fas fa-fw fa-book"
-      url: "https://www.qrz.com/db/sq7hjb"
 
 ekipa:
   name             : "Zjazd Techniczny Krótkofalowców"

diff --git a/_includes/author-profile.html b/_includes/author-profile.html
@@ -37,7 +37,7 @@ <h3 class="author__name p-name" itemprop="name">
       {% endif %}
       {% endif %}
     </div>
-
+    <hr>
     <div class="author__urls-wrapper">
       <button class="btn btn--inverse">{{ site.data.ui-text[site.locale].follow_label | remove: ":" | default: "Follow" }}</button>
       <ul class="author__urls social-icons">
@@ -63,6 +63,13 @@ <h3 class="author__name p-name" itemprop="name">
           </li>
         {% endif %}
 
+        <li>
+          <a href="http://www.qrz.com/db/{{ author.callsign | downcase }}" rel="me" class="u-qrz">
+            <meta itemprop="qrz" content="{{ author.callsign | downcase }}" />
+            <i class="fas fa-fw fa-book" aria-hidden="true"></i><span class="label">{{ site.data.ui-text[site.locale].qrz_label | default: "QRZ" }}</span>
+          </a>
+        </li>
+
         {% if author.email %}
           <li>
             <a href="mailto:{{ author.email }}" rel="me" class="u-email">
@@ -80,6 +87,14 @@ <h3 class="author__name p-name" itemprop="name">
           </li>
         {% endif %}
 
+        {% if author.mastodon %}
+          <li>
+            <a href="{{ author.mastodon }}" itemprop="sameAs" rel="nofollow noopener noreferrer me">
+              <i class="fab fa-fw fa-mastodon" aria-hidden="true"></i><span class="label">Mastodon</span>
+            </a>
+          </li>
+        {% endif %}
+
         {% if author.twitter %}
           <li>
             <a href="https://twitter.com/{{ author.twitter }}" itemprop="sameAs" rel="nofollow noopener noreferrer me">

diff --git a/_includes/author_count.html b/_includes/author_count.html
@@ -8,4 +8,4 @@
   {% endif %}
 {% endfor %}
 
-<span>{{ author_count }}</span>
+{{ author_count }}
diff --git a/_layouts/author.html b/_layouts/author.html
@@ -1,5 +1,6 @@
 ---
 layout: archive
+classes: wide
 ---
 
 {% assign author = site.data.authors[page.author] %}
@@ -9,9 +10,30 @@
       <h2 class="archive__subtitle">Projekty:</h2>
       <div class="entries-list">
 
-        {% for post in posts %}
-          {% include archive-single.html type=entries_layout %}
-        {% endfor %}
+        <div class="project-category-grid">
+          {% for post in posts %}
+            <div class="project-item-half">
+            {% if post.header.overlay_image %}
+              <img src="{{ post.header.overlay_image | relative_url }}" alt="{{ post.title }}" class="project-image">
+            {% endif %}
+            <div class="project-details">
+              <a href="{{ post.url | relative_url }}" class="project-title">{{ post.title }}</a>
+              <div class="project-meta">
+              <span class="project-author">Autor: 
+                {% for author in post.author %}
+                  {% assign author_info = site.data.authors[author] %}
+                  - <a href="{{ author_info.authorpage | relative_url }}">{{ author_info.name }}
+                  {% if author_info.callsign and author_info.callsign != '' %}
+                    ({{ author_info.callsign }})
+                  {% endif %}</a>
+                {% endfor %}
+              </span>
+              Rok {{ post.puk_year }} numer {{post.puk_place}} kategoria {{ post.puk_category}}
+              </div>
+            </div>
+            </div>
+          {% endfor %}
+          </div>
 
       </div>
     </section>
@@ -22,9 +44,30 @@ <h2 class="archive__subtitle">Projekty:</h2>
       <h2 class="archive__subtitle">Wystąpienia:</h2>
       <div class="entries-list">
 
-        {% for post in posts %}
-          {% include archive-single.html type=entries_layout %}
-        {% endfor %}
+        <div class="project-category-grid">
+          {% for post in posts %}
+            <div class="project-item-half">
+            {% if post.header.overlay_image %}
+              <img src="{{ post.header.overlay_image | relative_url }}" alt="{{ post.title }}" class="project-image">
+            {% endif %}
+            <div class="project-details">
+              <a href="{{ post.url | relative_url }}" class="project-title">{{ post.title }}</a>
+              <div class="project-meta">
+                <span class="project-author">Autor: 
+                  {% for author in post.author %}
+                    {% assign author_info = site.data.authors[author] %}
+                    - <a href="{{ author_info.authorpage | relative_url }}">{{ author_info.name }}
+                    {% if author_info.callsign and author_info.callsign != '' %}
+                      ({{ author_info.callsign }})
+                    {% endif %}</a>
+                  {% endfor %}
+                </span>
+                Kiedy: {{ post.starttime }} sala {{post.room}}.
+              </div>
+            </div>
+            </div>
+          {% endfor %}
+          </div>
 
       </div>
     </section>

diff --git a/_pages/authors.html b/_pages/authors.html
@@ -12,7 +12,7 @@
 
 <br>
 <br>
-Warto dodać, że nieobecność kogoś na tej liście nie oznaczy umniejszenia zasług tej osoby - choćby w przypadku <a href="/puk/warsztaty_qrp">osób organizujących Warsztaty QRP</a> - nie ma jeszcze dopisanej obsługi pojedynczych historycznych zjazdów jako odkładająca się na profilu użytkownika i na tej liście "zasługa". 
+Warto dodać, że nieobecność kogoś na tej liście nie oznaczy umniejszenia zasług tej osoby - choćby w przypadku <a href="/warsztaty_qrp">osób organizujących Warsztaty QRP</a> - nie ma jeszcze dopisanej obsługi pojedynczych historycznych zjazdów jako odkładająca się na profilu użytkownika i na tej liście "zasługa". 
 
 <br>
 <br>
@@ -69,14 +69,17 @@ <h2 class="archive__item-title">{{ display_name }}
 			{% include author_count.html current_author=f current_collection='talks'%}
 	  	{% endcapture %}
 
+		{%assign pcount = project_count | strip %}
+		{%assign tcount = talk_count | strip%}
+
 		<p><a href="/authors/{{ f[0] }}" class="page__taxonomy-item p-category">
 			{% if f[1].zjazd_orga %}
-			Organizator, 
+			Organizator.  
 			{% endif %}
-			{% unless project_count == "0" %}
-			Projektów: {{ project_count }},
+			{% unless pcount == "0" %}
+			Projektów: {{ project_count }}.
 			{% endunless %}
-			{% unless talk_count == "0" %} Wystąpień: {{ talk_count }}
+			{% unless tcount == "0" %} Wystąpień: {{ talk_count }}.
 			{% endunless %}</a></p>
 
 	</div>

diff --git a/_pages/projekty.html b/_pages/projekty.html
@@ -55,19 +55,21 @@ <h3>Kategoria {{ category_key | upcase }} - {{ category_name }}</h3>
 			  <div class="project-category-grid">
 				{% assign sorted_projects = category_projects | sort: "puk_place" %}
 				{% for project in sorted_projects %}
-				  <div class="project-item">
+				  <div class="project-item-fourth">
 					{% if project.header.overlay_image %}
 					  <img src="{{ project.header.overlay_image | relative_url }}" alt="{{ project.title }}" class="project-image">
 					{% endif %}
 					<div class="project-details">
 					  <a href="{{ project.url | relative_url }}" class="project-title">{{ project.title }}</a>
 					  <div class="project-meta">
 						<span class="project-author">Autor: 
-						{% assign author_info = site.data.authors[project.author] %}
-						- <a href="{{ author_info.authorpage | relative_url }}">{{ author_info.name }}
-						{% if author_info.callsign and author_info.callsign != '' %}
-						  ({{ author_info.callsign }})
-						{% endif %}</a>
+							{% for author in project.author %}
+							{% assign author_info = site.data.authors[author] %}
+							- <a href="{{ author_info.authorpage | relative_url }}">{{ author_info.name }}
+							{% if author_info.callsign and author_info.callsign != '' %}
+							  ({{ author_info.callsign }})
+							{% endif %}</a>
+						  {% endfor %}
 						</span>
 						<span class="project-place">Projekt nr {{ project.puk_place }}</span>
 					  </div>

diff --git a/_puk/3z6aef_automatyczny_tuner_antenowy_qrp.md b/_puk/3z6aef_automatyczny_tuner_antenowy_qrp.md
@@ -3,7 +3,8 @@ title: Automatyczny tuner antenowy QRP
 puk_category: B
 puk_year: 2011
 puk_place: 2
-author: 3z6aef
+author: 
+  - 3z6aef
 tagline: ""
 layout: puk
 proofread: yes

diff --git a/_puk/3z6aef_zestaw_tłumików_oraz_mostków_pomiarowych.md b/_puk/3z6aef_zestaw_tłumików_oraz_mostków_pomiarowych.md
@@ -3,7 +3,8 @@ title: Zestaw tłumików oraz mostków pomiarowych
 puk_category: C
 puk_year: 2010
 puk_place: 3
-author: 3z6aef
+author: 
+  - 3z6aef
 tagline: ""
 layout: puk
 proofread: yes

diff --git a/_puk/sp2cnw_antena_yagi_na_pasmo_23_cm.md b/_puk/sp2cnw_antena_yagi_na_pasmo_23_cm.md
@@ -3,7 +3,8 @@ title: Antena Yagi na pasmo 23 cm
 puk_category: B
 puk_year: 2019
 puk_place: 4
-author: sp2cnw
+author: 
+  - sp2cnw
 tagline: ""
 layout: puk
 proofread: yes

diff --git a/_puk/sp2fp_hydra.md b/_puk/sp2fp_hydra.md
@@ -3,7 +3,8 @@ title: HYDRA - TRX KF CW/SSB 3,5/7/14 MHz
 puk_category: A
 puk_year: 2019
 puk_place: 1
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 classes: wide

diff --git a/_puk/sp2fp_sterownik_klucza_telegraficznego_wg_dk3lj_ai4sv_kc9on.md b/_puk/sp2fp_sterownik_klucza_telegraficznego_wg_dk3lj_ai4sv_kc9on.md
@@ -3,15 +3,16 @@ title: Sterownik klucza telegraficznego wg DK3LJ/AI4SV/KC9ON
 puk_category: D
 puk_year: 2019
 puk_place: 17
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 proofread: yes
 classes: wide
 header:
-  overlay_image: /assets/images/puk/dummy.jpg
+  overlay_image: /assets/images/dummy.jpg
   overlay_filter: 0.5
-  teaser: /assets/images/puk/dummy.jpg
+  teaser: /assets/images/dummy.jpg
 ---
 
 Odnośniki

diff --git a/_puk/sp2fp_trx_kaefelek.md b/_puk/sp2fp_trx_kaefelek.md
@@ -3,7 +3,8 @@ title: TRX KaeFeLek
 puk_category: A
 puk_year: 2016
 puk_place: 2
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 proofread: yes

diff --git a/_puk/sp2fp_trx_scorpion_80.md b/_puk/sp2fp_trx_scorpion_80.md
@@ -3,7 +3,8 @@ title: TRX SCORPION 80
 puk_category: A
 puk_year: 2016
 puk_place: 1
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 proofread: no

diff --git a/_puk/sp2fp_uniwersalna_synteza_częstotliwości_kf_8_pasm.md b/_puk/sp2fp_uniwersalna_synteza_częstotliwości_kf_8_pasm.md
@@ -3,7 +3,8 @@ title: Uniwersalna synteza częstotliwości KF 8 pasm
 puk_category: D
 puk_year: 2019
 puk_place: 9
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 proofread: no

diff --git a/_puk/sp2fp_uniwersalny_zespół_filtrów_dolnoprzepustowych_nadajnika.md b/_puk/sp2fp_uniwersalny_zespół_filtrów_dolnoprzepustowych_nadajnika.md
@@ -3,15 +3,16 @@ title: Uniwersalny zespół filtrów dolnoprzepustowych nadajnika
 puk_category: D
 puk_year: 2018
 puk_place: 8
-author: sp2fp
+author: 
+  - sp2fp
 tagline: ""
 layout: puk
 proofread: no
 classes: wide
 header:
-  overlay_image: /assets/images/puk/dummy.jpg
+  overlay_image: /assets/images/dummy.jpg
   overlay_filter: 0.5
-  teaser: /assets/images/puk/dummy.jpg
+  teaser: /assets/images/dummy.jpg
 ---
 
 

diff --git a/_puk/sp2gya_analizator_antenowy.md b/_puk/sp2gya_analizator_antenowy.md
@@ -3,7 +3,8 @@ title: Analizator antenowy
 puk_category: C
 puk_year: 2012
 puk_place: 8
-author: sp2gya
+author: 
+  - sp2gya
 tagline: ""
 layout: puk
 proofread: no

diff --git a/_puk/sp2gya_antena_na_wyjazdy_3_5_28_mhz.md b/_puk/sp2gya_antena_na_wyjazdy_3_5_28_mhz.md
@@ -3,15 +3,16 @@ title: Antena na wyjazdy 3,5 – 28 MHz
 puk_category: B
 puk_year: 2017
 puk_place: 6
-author: sp2gya
+author: 
+  - sp2gya
 tagline: ""
 layout: puk
 proofread: no
 classes: wide
 header:
-  overlay_image: /assets/images/puk/dummy.jpg
+  overlay_image: /assets/images/dummy.jpg
   overlay_filter: 0.5
-  teaser: /assets/images/puk/dummy.jpg
+  teaser: /assets/images/dummy.jpg
 ---
 
 ![](assets/img/work-in-progress.jpg)