Merge pull request 'İlginizi çekebilecek yazılar özelliği eklendi' (#18) from ooguz/oyd-web:master into master

Reviewed-on: oyd/oyd-web#18

config.toml

@@ -155,5 +155,24 @@ ignoreFiles = ["\\.Rmd$", "_files$", "_cache$"]
     MathJaxCDN = "//cdn.bootcss.com"
     MathJaxVersion = "2.7.1"
 
+[related]
+  includeNewer = false
+  threshold = 80
+  toLower = false
+
+  [[related.indices]]
+    name = "keywords"
+    weight = 100
+
+
+  [[related.indices]]
+    name = "categories"
+    weight = 100
+
+  [[related.indices]]
+    name = "date"
+    weight = 10
+
 [markup.goldmark.renderer]
 unsafe= true
+

content/en/articles/defense-of-gpg.md

@@ -58,7 +58,7 @@ In every "GPG is dead" cry almost always includes some **killer** new technology
 
 ## Signal
 
-A big hit in secure instant messaging. Signal is build upon proprietary software Textsecure and RedPhone that had been once developed by [Moxie Merlinspike](https://en.wikipedia.org/wiki/Moxie_Marlinspike) and his co-founder Stuart Anderson. Signal Protocol utilizing [double ratchet](https://en.wikipedia.org/wiki/Double_Ratchet_Algorithm) encryption is a game changer for modern connectivity and implemented in [several applications[(https://signal.org/blog/whatsapp-complete/). Signal applications and server code is free software but [their developers and business model is not](https://oyd.org.tr/en/articles/stop-saying-freedom-is-a-private-matter/). It is [yet another walled garden with no federation](#https://matrix.org/blog/2020/01/02/on-privacy-versus-freedom/) and [claiming GPG is dead](https://moxie.org/blog/gpg-and-me/).
+A big hit in secure instant messaging. Signal is build upon proprietary software Textsecure and RedPhone that had been once developed by [Moxie Merlinspike](https://en.wikipedia.org/wiki/Moxie_Marlinspike) and his co-founder Stuart Anderson. Signal Protocol utilizing [double ratchet](https://en.wikipedia.org/wiki/Double_Ratchet_Algorithm) encryption is a game changer for modern connectivity and implemented in [several applications](https://signal.org/blog/whatsapp-complete/). Signal applications and server code is free software but [their developers and business model is not](https://oyd.org.tr/en/articles/stop-saying-freedom-is-a-private-matter/). It is [yet another walled garden with no federation](#https://matrix.org/blog/2020/01/02/on-privacy-versus-freedom/) and [claiming GPG is dead](https://moxie.org/blog/gpg-and-me/).
 
 ## Matrix Protocol
 

content/en/budget.md

@@ -4,9 +4,9 @@ translationKey: butce
 ---
 Özgür Yazılım Derneği affords only with the membership fees and donations from individuals. The budget of our association is very low to be compared with other NGOs. Our statement of financial position is presented to you within transperancy.  
 Commissions applied as 2.29% + 0.25 TRY for ÖzgürKon tickets and 10% for SMS donations; the given values are commission deducted.  
-The amounts are converted to USD with the exchange rate that was valid on May 23, 2020; to see them in TRY (Turkish Lira) please visit the Turkish version.
+The amounts are converted to USD with the exchange rate that was valid on Dec 10, 2020; to see them in TRY (Turkish Lira) please visit the Turkish version.
 
-## 2020 (January 1 - May 24)
+## 2020 (January 1 - December 1)
 
 #### Income
 
@@ -20,25 +20,25 @@ The amounts are converted to USD with the exchange rate that was valid on May 23
   <tbody>
     <tr>
       <td>Membership fees</td>
-      <td>85.13 USD</td>
+      <td>217.58 USD</td>
     </tr>
     <tr>
       <td>ÖzgürKon tickets (Net)</td>
-      <td>281.63 USD</td>
+      <td>245.28 USD</td>
     </tr>
     <tr>
       <td>ÖzgürKon sponsorships</td>
-      <td>73.39 USD</td>
+      <td>63.92 USD</td>
     </tr>
     <tr>
       <td>Donations (Bank)</td>
-      <td>17.55 USD</td>
+      <td>17.98 USD</td>
     </tr>
     <tr>
       <td>SMS donations (Net)</td>
-      <td>87.63 USD</td>
+      <td>187.54 USD</td>
     </tr>
-	<tr class="table-success"><td><strong>Total:</strong></td><td><strong>545.33 USD</strong></td></tr>
+	<tr class="table-success"><td><strong>Total:</strong></td><td><strong>732.30 USD</strong></td></tr>
   </tbody>
 </table>
 
@@ -52,23 +52,31 @@ The amounts are converted to USD with the exchange rate that was valid on May 23
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td>Rent for office (5 months)</td>
+      <td>95.88 USD</td>
+    </tr>
+    <tr>
+      <td>Condo fees</td>
+      <td>17.26 USD</td>
+    </tr>
     <tr>
       <td>General expenses (Servers, domains, printing e.g)</td>
-      <td>44.03 USD</td>
+      <td>38.35 USD</td>
     </tr>
     <tr>
       <td>Event expenses (Wikipedia Editathon e.g)</td>
-      <td>14.24 USD</td>
+      <td>12.40 USD</td>
     </tr>
     <tr>
-      <td>Other expenses (payment agent service fees e.g)</td>
-      <td>29.36 USD</td>
+      <td>Other expenses (payment agent service fees, commissions e.g)</td>
+      <td>73.12 USD</td>
     </tr>
-	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>87.63 USD</strong></td></tr>
+	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>237.01 USD</strong></td></tr>
   </tbody>
 </table>
 
-##### Spread: 457.70 USD
+##### Spread: 495.29 USD
 
 ## 2019 (January 1 - December 31)
 

content/en/contact.md

@@ -4,7 +4,7 @@ translationKey: contact
 ---
 
 Address
-: P.O Box 5, 34710 Kadıköy/İstanbul/Turkey
+: Osmanağa Mh. Söğütlüçeşme Cd. No:92-94/34, 34714 Kadıköy/İstanbul/Turkey
 
 Phone
 : +90 216 706 4 693 (OYD)  

content/tr/butce.md

@@ -6,7 +6,7 @@ translationKey: butce
 ÖzgürKon biletlerinden işlem başı %2.29 + 0,25 TRY, SMS bağışlarından %10 komisyon alınmaktadır, verilen tutarlar bu komisyonların düşülmüş halidir.  
 
 
-## 2020 (1 Ocak - 24 Mayıs)
+## 2020 (1 Ocak - 1 Aralık)
 
 #### Gelirler
 
@@ -19,8 +19,8 @@ translationKey: butce
   </thead>
   <tbody>
     <tr>
-      <td>Üye Aidatları</td>
-      <td>580,00 TL</td>
+      <td>Üyeler tarafından yapılan bağışlar</td>
+      <td>1702,00 TL</td>
     </tr>
     <tr>
       <td>ÖzgürKon bilet bağışları (Net)</td>
@@ -32,13 +32,13 @@ translationKey: butce
     </tr>
     <tr>
       <td>Bağışlar (Banka)</td>
-      <td>119,60 TL</td>
+      <td>140,63 TL</td>
     </tr>
     <tr>
       <td>SMS bağışları (Net)</td>
-      <td>597,00 TL</td>
+      <td>1467,00 TL</td>
     </tr>
-	<tr class="table-success"><td><strong>Toplam:</strong></td><td><strong>3715,33 TL</strong></td></tr>
+	<tr class="table-success"><td><strong>Toplam:</strong></td><td><strong>5728,36 TL</strong></td></tr>
   </tbody>
 </table>
 
@@ -52,23 +52,31 @@ translationKey: butce
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td>Kira (5 aylık)</td>
+      <td>750,00 TL</td>
+    </tr>
+    <tr>
+      <td>İş hanı aidatı</td>
+      <td>135,00 TL</td>
+    </tr>
     <tr>
       <td>Genel giderler (Sunucu, alan adı, matbaa vb.)</td>
       <td>300,00 TL</td>
     </tr>
     <tr>
-      <td>Etkinlik giderleri (Vikimaraton vb.)</td>
+      <td>Etkinlik giderleri (Vikimaraton, CryptoParty vb.)</td>
       <td>97,00 TL</td>
     </tr>
     <tr>
-      <td>Diğer giderler (iyzico hizmet ödemeleri vb.)</td>
-      <td>200,00 TL</td>
+      <td>Diğer giderler (iyzico hizmet ödemeleri, emlak komisyonu vb.)</td>
+      <td>572,00 TL</td>
     </tr>
-	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>597,00 TL</strong></td></tr>
+	<tr class="table-danger"><td><strong>Toplam:</strong></td><td><strong>1854,00 TL</strong></td></tr>
   </tbody>
 </table>
 
-##### Fark: 3118,33 TRY
+##### Fark: 3874,36 TRY
 
 ## 2019
 

content/tr/iletisim.md

@@ -4,7 +4,7 @@ translationKey: contact
 ---
 
 Adres
-: P.K 5, 34710 Kadıköy/İstanbul  
+: Osmanağa Mh. Söğütlüçeşme Cd. Abdullah Uzlar İş Mrk. No:92-94/34, 34714 Kadıköy/İstanbul  
 
 Telefon
 : 0216 706 4 693 (OYD)  

content/tr/yazilar/adres-banka-degisikligi.md

@@ -0,0 +1,30 @@
+---
+title: "Adres ve banka bilgilerimiz değişmiştir"
+summary: >
+  Özgür Yazılım Derneği'nin adres ve banka bilgileri değişti.
+date: 2020-12-01T20:38:03+03:00
+categories:
+- dernek
+photo:
+    url: /oyd_social.png
+    urlband: /images/yazilar/oyd.png
+    author: Özgür Yazılım Derneği
+    alt: Özgür Yazılım Derneği
+---
+
+**Duyuru**
+
+Özgür Yazılım Derneği, 01/12/2020 tarihinde **Osmanağa Mh. Söğütlüçeşme Cd. No:92-94/34 Kadıköy/İstanbul** adresine taşınmıştır. Bu değişiklikle birlikte halihazırda Beyoğlu olan vergi dairemiz Kadıköy olarak güncellenmiştir. Abdullah Uzlar İş Merkezi'nde yer alan ofisimiz yalnızca yasal gereklilik ve dernek demirbaşının barındırılması amacıyla kullanılacak olup ziyarete **kapalıdır**. 
+
+Aynı zamanda zaruri sebeplerden dolayı banka hesabımız T.C Ziraat Bankası'ndan Türkiye İş Bankası'na taşınmıştır, yeni banka bilgilerimiz aşağıdaki gibidir:
+
+Özgür Yazılım Derneği  
+Türkiye İş Bankası Altıyol Şubesi (1077)  
+Hesap no: 1077-0744382  
+IBAN: **TR47 0006 4000 0011 0770 7443 82**  
+
+Bilgilerinize sunarız.
+
+Özgür Yazılım Derneği
+
+

content/tr/yazilar/topluluk-ozgurlugu.md

@@ -7,7 +7,7 @@ author: Neslihan Turan
 categories:
 - ozgurluk
 photo:
-  url: /images/yazilar/
+  url: /images/yazilar/karikatur-zebanison.jpg
   urlband: /images/yazilar/karikatur-instagram.jpg
   author: Armağan Güven | CC BY-SA 4.0
   alt: Bir karikatür

i18n/en.toml

@@ -30,3 +30,6 @@ other = "Source code"
 
 [gorsel]
 other = "Photo: "
+
+[related]
+other = "More articles you may like"

i18n/tr.toml

@@ -29,4 +29,7 @@ other = "Özgür Yazılım Derneği, özgür yazılım hareketini ve tüm insanl
 other = "Kaynak kodu"
 
 [gorsel]
-other = "Görsel: "
+other = "Görsel: "
+
+[related]
+other = "İlginizi çekebilecek diğer yazılar"

layouts/_default/baseof.html

@@ -2,15 +2,16 @@
 <html lang="{{ .Site.Language.Lang }}">
   <head>
     <meta charset="utf-8">
-    <meta name="description" content="{{ i18n "desc_summary" }}" />
+
 <meta name="robots" content="index, follow" />
 <link rel="canonical" href="http://www.oyd.org.tr/" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 {{ if .IsPage }}
+<meta name="description" content="{{ .Page.Summary }}" />
 <meta property="og:title" content="{{ .Page.Title }} - {{ .Site.Title }}" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://www.oyd.org.tr" />
-<meta property="og:description" content="{{ .Description }}" />
+<meta property="og:description" content="{{ .Page.Summary }}" />
 <meta property="og:image" content="/oyd_social.png?v=2" />
 <meta property="og:site_name" content="Özgür Yazılım Derneği" />
 <meta name="twitter:card" content="summary_large_image" />
@@ -20,6 +21,7 @@
 <meta name="twitter:creator" content="@oydorgtr" />
 <meta name="twitter:image" content="https://oyd.org.tr/oyd_social.png?4812354">
 {{ else }}
+<meta name="description" content="{{ i18n "desc_summary" }}" />
 <meta property="og:title" content="{{ .Site.Title }}" />
 <meta property="og:type" content="website" />
 <meta property="og:url" content="https://www.oyd.org.tr" />

layouts/_default/single.html

@@ -12,6 +12,9 @@
       </div>
       {{ end }}
     {{ .Content }}
+    {{ if (or (eq .Section "yazilar") (eq .Section "articles")) }}
+        {{ partial "related" . }}
+    {{ end }}
   </article>
   <aside class="sidebar">
     <h2 class="title">{{ i18n "etkinlikler" }}</h2>

layouts/partials/related.html

@@ -0,0 +1,10 @@
+<hr>
+{{ $related := .Site.RegularPages.Related . | first 5 }}
+{{ with $related }}
+<h3>{{ i18n "related" }}</h3>
+<ul>
+	{{ range . }}
+	<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+	{{ end }}
+</ul>
+{{ end }}

static/css/style.css

@@ -186,6 +186,10 @@ article hr:last-child {
   display: none;
 }
 
+article hr {
+    color: #4c2447;
+}
+
 .list-title {
   font-size: 1.2rem;
 }
@@ -930,3 +934,4 @@ table {
     display: none;
   }
 }
+