diff --git a/config.toml b/config.toml index 28a16f8..66fe7c8 100644 --- a/config.toml +++ b/config.toml @@ -156,3 +156,6 @@ ignoreFiles = ["\\.Rmd$", "_files$", "_cache$"] MathJaxCDN = "//cdn.bootcss.com" MathJaxVersion = "2.7.1" + +[markup.goldmark.renderer] +unsafe= true diff --git a/content/en/budget.md b/content/en/budget.md new file mode 100644 index 0000000..daf1184 --- /dev/null +++ b/content/en/budget.md @@ -0,0 +1,129 @@ +--- +title: Budget +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. + +## 2020 (January 1 - May 24) + +#### Income + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StatementAmount
Membership fees85.13 USD
ÖzgürKon tickets (Net)281.63 USD
ÖzgürKon sponsorships73.39 USD
Donations (Bank)17.55 USD
SMS donations (Net)87.63 USD
Total:545.33 USD
+ +#### Expenses + + + + + + + + + + + + + + + + + + + + + + + +
StatementAmount
General expenses (Servers, domains, printing e.g)44.03 USD
Event expenses (Wikipedia Editathon e.g)14.24 USD
Other expenses (payment agent service fees e.g)29.36 USD
Toplam:87.63 USD
+ +##### Spread: 457.70 USD + +## 2019 (January 1 - December 31) + +#### Income + + + + + + + + + + + + + + + + + + + + + + + +
StatementAmount
Membership fees35.23 USD
Donations from members305.30 USD
SMS donations (Net)7.63 USD
Total:348.16 USD
+ +#### Expenses + + + + + + + + + + + + + + + + + + + + + + + +
StatementAmount
General expenses (Servers, domains, printing e.g)289.39 USD
Event expenses (CryptoParty Istanbul e.g)58.60 USD
Other expenses0.17 USD
Total:348.16 USD
+ +##### Spread: 0.00 USD + +_**Statement of 2019**: Our server payment of December 2019 was exceeding our till, thus the deficient amount was afforded by our members in order not to make any confusion in our accounting._ diff --git a/content/tr/butce.md b/content/tr/butce.md new file mode 100644 index 0000000..2dc717e --- /dev/null +++ b/content/tr/butce.md @@ -0,0 +1,129 @@ +--- +title: Bütçe +translationKey: butce +--- +Özgür Yazılım Derneği, üyelerden toplanan aidatlar ve yapılan bağışlar ile hayatta kalmaktadır. Derneğimizin bütçesi, diğer kitle örgütleriyle kıyaslandığında hayli düşüktür, tüm gelir gider tablomuz bütün şeffaflığıyla bilgilerinize sunulmuştur. +Ö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) + +#### Gelirler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AçıklamaTutar
Üye Aidatları580,00 TL
ÖzgürKon bilet bağışları (Net)1918,73 TL
ÖzgürKon kurumsal destekler500,00 TL
Bağışlar (Banka)119,60 TL
SMS bağışları (Net)597,00 TL
Toplam:3715,33 TL
+ +#### Giderler + + + + + + + + + + + + + + + + + + + + + + + +
AçıklamaTutar
Genel giderler (Sunucu, alan adı, matbaa vb.)300,00 TL
Etkinlik giderleri (Vikimaraton vb.)97,00 TL
Diğer giderler (iyzico hizmet ödemeleri vb.)200,00 TL
Toplam:597,00 TL
+ +##### Fark: 3118,33 TRY + +## 2019 + +#### Gelirler + + + + + + + + + + + + + + + + + + + + + + + +
AçıklamaTutar
Üye Aidatları240,00 TL
Üyeler tarafından yapılan bağışlar2080,00 TL
Dışarıdan gelen bağışlar52,00 TL
Toplam:2372,00 TL
+ +#### Giderler + + + + + + + + + + + + + + + + + + + + + + + +
AçıklamaTutar
Genel giderler (Sunucu, alan adı, matbaa vb.)1971,59 TL
Etkinlik giderleri (CryptoParty Istanbul vb.)399,24 TL
Diğer giderler1,17 TL
Toplam:2372,00 TL
+ +##### Fark: 0,00 TL + +_**2019 için açıklama**: Derneğimizin 2019 Aralık ayı sunucu ödemesi kasadaki tutarın üzerinde çıkmış, muhasebede karışıklık olmaması adına kasa sıfırlanıp eksik kalan tutar üyelerimiz tarafından karşılanmıştır._ diff --git a/layouts/index.en.html b/layouts/index.en.html index e5df542..b992f7c 100644 --- a/layouts/index.en.html +++ b/layouts/index.en.html @@ -11,6 +11,8 @@

Free Software Association is a community of people defending the free software movement and the freedom of all people in the modern world. Starting with the software freedom, Free Software Association advocates the freedom of people in connection with hardware freedom, Internet freedom, document freedom and freedom of information.

+

You can reach our detailed budget and statement of financial position from the button below.

+Budget diff --git a/layouts/index.html b/layouts/index.html index 70ab2b5..bef40be 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -11,8 +11,10 @@

Özgür Yazılım Derneği, özgür yazılım hareketini ve hali ile tüm insanların modern dünyadaki özgürlüklerini savunan insanların oluşturduğu bir topluluktur. Özgür Yazılım Derneği insanların özgürlüğünü, yazılımların özgürlüğünden başlamak üzere, donanımların, İnternet’in ve hizmetlerin özgürlüğü ile bağlantılı olarak savunur.

+

Derneğimizin ayrıntılı gelir-gider tablolarına aşağıdaki linkten ulaşabilirsiniz.

Özgür Yazılım Derneği olarak, üç ayda bir yayımlayacağımız bültenlerin ilk sayısını çıkardık, aşağıdaki bağlantıdan okuyabilirsiniz.

-Bülten +Bülten +Bütçe diff --git a/static/css/style.css b/static/css/style.css index 4b2aee8..08a992e 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -539,4 +539,294 @@ body > footer { .article-header .photoCredit { font-size: 12px; text-align: right; - margin: 5px 0 12px 0; } \ No newline at end of file + margin: 5px 0 12px 0; } + +table { + border-collapse: collapse; +} + +.table { + width: 100%; + margin-bottom: 1rem; + color: #212529; +} + +.table th, +.table td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; +} + +.table thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; +} + +.table tbody + tbody { + border-top: 2px solid #dee2e6; +} + +.table-sm th, +.table-sm td { + padding: 0.3rem; +} + +.table-bordered { + border: 1px solid #dee2e6; +} + +.table-bordered th, +.table-bordered td { + border: 1px solid #dee2e6; +} + +.table-bordered thead th, +.table-bordered thead td { + border-bottom-width: 2px; +} + +.table-borderless th, +.table-borderless td, +.table-borderless thead th, +.table-borderless tbody + tbody { + border: 0; +} + +.table-striped tbody tr:nth-of-type(odd) { + background-color: rgba(0, 0, 0, 0.05); +} + +.table-hover tbody tr:hover { + color: #212529; + background-color: rgba(0, 0, 0, 0.075); +} + +.table-primary, +.table-primary > th, +.table-primary > td { + background-color: #b8daff; +} + +.table-primary th, +.table-primary td, +.table-primary thead th, +.table-primary tbody + tbody { + border-color: #7abaff; +} + +.table-hover .table-primary:hover { + background-color: #9fcdff; +} + +.table-hover .table-primary:hover > td, +.table-hover .table-primary:hover > th { + background-color: #9fcdff; +} + +.table-secondary, +.table-secondary > th, +.table-secondary > td { + background-color: #d6d8db; +} + +.table-secondary th, +.table-secondary td, +.table-secondary thead th, +.table-secondary tbody + tbody { + border-color: #b3b7bb; +} + +.table-hover .table-secondary:hover { + background-color: #c8cbcf; +} + +.table-hover .table-secondary:hover > td, +.table-hover .table-secondary:hover > th { + background-color: #c8cbcf; +} + +.table-success, +.table-success > th, +.table-success > td { + background-color: #c3e6cb; +} + +.table-success th, +.table-success td, +.table-success thead th, +.table-success tbody + tbody { + border-color: #8fd19e; +} + +.table-hover .table-success:hover { + background-color: #b1dfbb; +} + +.table-hover .table-success:hover > td, +.table-hover .table-success:hover > th { + background-color: #b1dfbb; +} + +.table-info, +.table-info > th, +.table-info > td { + background-color: #bee5eb; +} + +.table-info th, +.table-info td, +.table-info thead th, +.table-info tbody + tbody { + border-color: #86cfda; +} + +.table-hover .table-info:hover { + background-color: #abdde5; +} + +.table-hover .table-info:hover > td, +.table-hover .table-info:hover > th { + background-color: #abdde5; +} + +.table-warning, +.table-warning > th, +.table-warning > td { + background-color: #ffeeba; +} + +.table-warning th, +.table-warning td, +.table-warning thead th, +.table-warning tbody + tbody { + border-color: #ffdf7e; +} + +.table-hover .table-warning:hover { + background-color: #ffe8a1; +} + +.table-hover .table-warning:hover > td, +.table-hover .table-warning:hover > th { + background-color: #ffe8a1; +} + +.table-danger, +.table-danger > th, +.table-danger > td { + background-color: #f5c6cb; +} + +.table-danger th, +.table-danger td, +.table-danger thead th, +.table-danger tbody + tbody { + border-color: #ed969e; +} + +.table-hover .table-danger:hover { + background-color: #f1b0b7; +} + +.table-hover .table-danger:hover > td, +.table-hover .table-danger:hover > th { + background-color: #f1b0b7; +} + +.table-light, +.table-light > th, +.table-light > td { + background-color: #fdfdfe; +} + +.table-light th, +.table-light td, +.table-light thead th, +.table-light tbody + tbody { + border-color: #fbfcfc; +} + +.table-hover .table-light:hover { + background-color: #ececf6; +} + +.table-hover .table-light:hover > td, +.table-hover .table-light:hover > th { + background-color: #ececf6; +} + +.table-dark, +.table-dark > th, +.table-dark > td { + background-color: #c6c8ca; +} + +.table-dark th, +.table-dark td, +.table-dark thead th, +.table-dark tbody + tbody { + border-color: #95999c; +} + +.table-hover .table-dark:hover { + background-color: #b9bbbe; +} + +.table-hover .table-dark:hover > td, +.table-hover .table-dark:hover > th { + background-color: #b9bbbe; +} + +.table-active, +.table-active > th, +.table-active > td { + background-color: rgba(0, 0, 0, 0.075); +} + +.table-hover .table-active:hover { + background-color: rgba(0, 0, 0, 0.075); +} + +.table-hover .table-active:hover > td, +.table-hover .table-active:hover > th { + background-color: rgba(0, 0, 0, 0.075); +} + +.table .thead-dark th { + color: #fff; + background-color: #343a40; + border-color: #454d55; +} + +.table .thead-light th { + color: #495057; + background-color: #e9ecef; + border-color: #dee2e6; +} + +.table-dark { + color: #fff; + background-color: #343a40; +} + +.table-dark th, +.table-dark td, +.table-dark thead th { + border-color: #454d55; +} + +.table-dark.table-bordered { + border: 0; +} + +.table-dark.table-striped tbody tr:nth-of-type(odd) { + background-color: rgba(255, 255, 255, 0.05); +} + +.table-dark.table-hover tbody tr:hover { + color: #fff; + background-color: rgba(255, 255, 255, 0.075); +} + + diff --git a/static/media.png b/static/media.png new file mode 100644 index 0000000..0ec06fc Binary files /dev/null and b/static/media.png differ diff --git a/static/oyd_logo.png b/static/oyd_logo.png new file mode 100644 index 0000000..5e663ad Binary files /dev/null and b/static/oyd_logo.png differ