Commit 4c438e4e authored by Hans-Christoph Steiner's avatar Hans-Christoph Steiner

Merge branch 'master' into 'master'

add app donation options to developer page and rework package page sidebar

Closes #193, #194, and jekyll-fdroid#25

See merge request !196
parents a9400633 1dfcd918
Pipeline #18090828 passed with stage
in 15 minutes and 32 seconds
GIT
remote: https://gitlab.com/fdroid/jekyll-fdroid.git
revision: bba0c7587eee6ad4d214bc512d07ed23b705c785
revision: ee3d611efadcad62ba573c6256b67989ab748af6
branch: master
specs:
jekyll-fdroid (1.0.1)
jekyll-fdroid (1.1)
jekyll-include-cache
jekyll-paginate-v2 (<= 1.7.3)
json (>= 1.8.5)
......
......@@ -52,6 +52,7 @@
"flattr_alt": "Donate via Flattr",
"liberapay_alt": "Donate via Liberapay",
"bitcoin_alt": "Donate via Bitcoin",
"litecoin_alt": "Donate via Litecoin",
"via_bank_transfer": "Bank Transfer",
"bank_transfer_name": "Name"
},
......
{% if site.active_lang == "" or site.active_lang == nil %}
<html lang="en">
{% else %}
{% if site.active_lang == "ar" or site.active_lang == "fa" or site.active_lang == "he" %}
<html lang="{{site.active_lang}}" dir="rtl">
{% else %}
<html lang="{{site.active_lang}}">
{% endif %}
{% endif %}
......@@ -7,8 +7,8 @@
{: .donate-options}
* {:.donate-option .misc} [![{{ strings.paypal_alt }}]({{ site.baseurl }}/assets/paypal_donate_button.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=E2FCXCT6837GL)
* {:.donate-option .liberapay} [![{{ strings.liberapay_alt }}]({{ site.baseurl }}/assets/liberapay_donate_button.svg)](https://liberapay.com/F-Droid-Data/donate)
* {:.donate-option .flattr} [![{{ strings.flattr_alt }}]({{ site.baseurl }}/assets/flattr-badge-large.png)](https://flattr.com/thing/343053/F-Droid-Repository)
* {:.donate-option .liberapayID} [![{{ strings.liberapay_alt }}]({{ site.baseurl }}/assets/liberapay_donate_button.svg)](https://liberapay.com/F-Droid-Data/donate)
* {:.donate-option .flattrID} [![{{ strings.flattr_alt }}]({{ site.baseurl }}/assets/flattr-badge-large.png)](https://flattr.com/thing/343053/F-Droid-Repository)
* {:.donate-option .bitcoin-blockchain-info} [![{{ strings.bitcoin_alt }}]({{ site.baseurl }}/assets/bitcoin.png)](https://blockchain.info/address/15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18)
* {:.donate-option .bitcoin-url} [`15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18`](bitcoin:15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18)
* {:.donate-option .bank-transfer} {{ strings.via_bank_transfer }}
......
<!DOCTYPE html>
<html>
{% include html-tag.html %}
{% include head.html %}
......
<!DOCTYPE html>
{% include html-tag.html %}
{% include head.html %}
<body>
<div class="site-wrapper">
{% include header.html %}
<div class="main-content with-sidebar">
{% if site.active_lang == "ar" or site.active_lang == "fa" or site.active_lang == "he" %}
<div class="article-area" dir="auto">
{% else %}
<div class="article-area">
{% endif %}
{{ content }}
</div>
<div class="sidebar">
<div class="sidebar-widget language">
{% include sidebar-lang.html %}
</div>
<div class="sidebar-widget">
{% include_cached sidebar-search.html %}
</div>
<div class="sidebar-widget">
{% include_cached sidebar-lastupdated-packages.html %}
</div>
<div class="sidebar-widget">
{% include_cached sidebar-latest-packages.html %}
</div>
</div>
</div>
{% include footer.html %}
</div>
</body>
</html>
<!DOCTYPE html>
{% if site.active_lang == "" or site.active_lang == nil %}
<html lang="en">
{% else %}
{% if site.active_lang == "ar" or site.active_lang == "fa" or site.active_lang == "he" %}
<html lang="{{site.active_lang}}" dir="rtl">
{% else %}
<html lang="{{site.active_lang}}">
{% endif %}
{% endif %}
{% include html-tag.html %}
{% include head.html %}
......@@ -42,15 +34,15 @@
</div>
<div class="sidebar-widget">
{% include_cached sidebar-lastupdated-packages.html %}
{% include sidebar-news.html %}
</div>
<div class="sidebar-widget">
{% include_cached sidebar-latest-packages.html %}
{% include_cached sidebar-lastupdated-packages.html %}
</div>
<div class="sidebar-widget">
{% include sidebar-news.html %}
{% include_cached sidebar-latest-packages.html %}
</div>
</div>
......
---
layout: default
layout: default-package-sidebar
---
{% assign strings = site.data.strings.package %}
......@@ -66,28 +66,48 @@ layout: default
<a href="{{ page.changelog }}">{{ strings.changelog }}</a>
</li>
{% endif %}
{% if page.donate != "" and page.donate != nil %}
<li class="package-link">
<a href="https://gitlab.com/fdroid/fdroiddata/tree/master/metadata/{{ page.package_name }}.txt">{{ strings.build_metadata }}</a>
</li>
<li class="package-link">
<a href="https://f-droid.org/wiki/page/{{page.package_name}}">{{ strings.technical_info }}</a>
</li>
</ul>
{% if page.liberapayID != nil or page.flattrID != nil or page.bitcoin != nil or page.litecoin != nil or page.donate != nil %}
<h3>{{ strings.donate }}</h3>
<ul class="package-links donate-options">
{% if page.liberapayID != "" and page.liberapayID != nil %}
<li class="package-link">
<a href="{{ page.donate }}">{{ strings.donate }}</a>
<a href="https://liberapay.com/~{{ page.liberapayID }}"><img src="{{ site.baseurl }}/assets/liberapay_donate_button.svg" alt="{{ strings.liberapay_alt }}"/></a>
</li>
{% endif %}
{% if page.flattr != "" and page.flattr != nil %}
{% if page.flattrID != "" and page.flattrID != nil %}
<li class="package-link">
<a href="https://flattr.com/thing/{{ page.flattr }}">{{ strings.flattr }}</a>
<a href="https://flattr.com/thing/{{ page.flattrID }}"><img src="{{ site.baseurl }}/assets/flattr-badge-large.png" alt="{{ strings.flattr_alt }}"/></a>
</li>
{% endif %}
{% if page.liberapay != "" and page.liberapay != nil %}
{% if page.bitcoin != "" and page.bitcoin != nil %}
<li class="package-link">
<a href="https://liberapay.com/~{{ page.liberapay }}">{{ strings.liberapay }}</a>
<a href="https://live.blockcypher.com/btc/address/{{ page.bitcoin }}" title="{{ page.bitcoin }}" alt="{{ strings.bitcoin_alt }}"><img src="{{ site.baseurl }}/assets/bitcoin.png"/></a>
</li>
{% endif %}
{% if page.litecoin != "" and page.litecoin != nil %}
<li class="package-link">
<a href="https://live.blockcypher.com/ltc/address/{{ page.litecoin }}" title="{{ page.litecoin }}" alt="{{ strings.litecoin_alt }}"><img src="{{ site.baseurl }}/assets/litecoin.png"/></a>
</li>
{% endif %}
{% if page.donate != "" and page.donate != nil %}
<li class="package-link">
{% if page.donate contains "paypal.com" %}
<a href="{{ page.donate }}"><img src="{{ site.baseurl }}/assets/paypal_donate_button.gif" alt="{{ strings.paypal_alt }}"/></a>
{% else %}
<a href="{{ page.donate }}">{{ strings.donate }}: {{ page.donate }}</a>
{% endif %}
</li>
{% endif %}
<li class="package-link">
<a href="https://gitlab.com/fdroid/fdroiddata/tree/master/metadata/{{ page.package_name }}.txt">{{ strings.build_metadata }}</a>
</li>
<li class="package-link">
<a href="https://f-droid.org/wiki/page/{{page.package_name}}">{{ strings.technical_info }}</a>
</li>
</ul>
{% endif %}
{% if page.phone_screenshots %}
<div id="screenshots" class="js_slides screenshots">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment