diff options
m--------- | inc | 0 | ||||
-rw-r--r-- | template/docs.html.j2 | 34 | ||||
-rw-r--r-- | template/rss.xml.j2 | 48 | ||||
-rw-r--r-- | www.yml | 17 |
4 files changed, 47 insertions, 52 deletions
diff --git a/inc b/inc -Subproject 543f91c2566e547d5c50d8e519ab57b10e8dd65 +Subproject 99649d50f26737d3a038e2052d0007a61226c32 diff --git a/template/docs.html.j2 b/template/docs.html.j2 index d60acc40..e19dddac 100644 --- a/template/docs.html.j2 +++ b/template/docs.html.j2 @@ -1,6 +1,5 @@ {% extends "common/base.j2" %} {% block body_content %} -{% for siteconfitem in siteconf %} <div class="container"> <div class="row"> <div class="col"> @@ -33,51 +32,51 @@ <div class="row"> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-manual.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-merchant-manual.html"> <img src="{{ url('icons/icon-backend.svg') }}" height=60> <h3>{{ _("Merchant Backend Administration")}}</h3> </a> - {% trans docshost=siteconfitem['docshost'] %} + {% trans docshost=siteconf['docshost'] %} Tutorial and manual for operating a merchant. Also available as <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>. {% endtrans %} </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-api-tutorial.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-merchant-api-tutorial.html"> <img src="{{ url('icons/icon-market.svg') }}" height=60> <h3>{{ _("Merchant API Tutorial") }}</h3> </a> {% trans %} Tutorial for processing Taler payments using the merchant backend API. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/taler-merchant-api-tutorial.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-merchant-api-tutorial.pdf") }} </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-exchange-manual.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-exchange-manual.html"> <img src="{{ url('icons/icon-exchange.svg') }}" height=60> <h3>{{ _("Exchange")}}</h3> </a> {% trans %} Operator's manual for the GNU Taler exchange. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/taler-exchange-manual.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-exchange-manual.pdf") }} </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-bank-manual.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-bank-manual.html"> <img src="{{ url('icons/icon-bank.svg') }}" height=60> <h3>{{ _("Bank Integration") }}</h3> </a> {% trans %} Manual for tightly integrating Taler with banking applications. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/taler-bank-manual.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-bank-manual.pdf") }} </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-wallet.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-wallet.html"> <img src="{{ url('icons/icon-wallet.svg') }}" height=60> <h3>{{ _("Wallet") }}</h3> </a> @@ -89,25 +88,25 @@ </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-backoffice-manual.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-backoffice-manual.html"> <img src="{{ url('icons/icon-backoffice.svg') }}" height=60> <h3>{{ _("Back office") }}</h3> </a> {% trans %} Manual to run the back-office Web application. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/taler-backoffice-manual.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-backoffice-manual.pdf") }} </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-pos-terminal.html"> + <a href="https://{{ siteconf['docshost'] }}/taler-merchant-pos-terminal.html"> <img src="{{ url('icons/icon-market.svg') }}" height=60> <h3>{{ _("Merchant POS Terminal") }}</h3> </a> {% trans %} Manual for configuring and using the point of sale app. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/taler-merchant-pos-terminal.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-merchant-pos-terminal.pdf") }} </div> <div class="col-lg-4"> @@ -137,7 +136,7 @@ <div class="row"> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/core/index.html"> + <a href="https://{{ siteconf['docshost'] }}/core/index.html"> <img src="{{ url('icons/icon-api.svg') }}" height=60> <h3>{{ _("HTTP API")}}</h3> </a> @@ -147,14 +146,14 @@ </div> <div class="col-lg-4"> - <a href="https://{{ siteconfitem['docshost'] }}/developers-manual.html"> + <a href="https://{{ siteconf['docshost'] }}/developers-manual.html"> <img src="{{ url('icons/icon-developers.svg') }}" height=60> <h3>{{ _("Onboarding")}}</h3> </a> {% trans %} Description of our taler.net setup and how to contribute. {% endtrans %} - {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconfitem['docshost'] + "/pdf/developers-manual.pdf") }} + {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/developers-manual.pdf") }} </div> </div> @@ -238,5 +237,4 @@ </div> </div> -{% endfor %} {% endblock body_content %} diff --git a/template/rss.xml.j2 b/template/rss.xml.j2 index b9a29f70..872e5513 100644 --- a/template/rss.xml.j2 +++ b/template/rss.xml.j2 @@ -20,29 +20,27 @@ #} <?xml version="1.0" encoding="UTF-8"?> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> - {% for siteconfitem in siteconf %} - <channel> - <atom:link href="https://{{ siteconfitem['baseurl'] }}/{{ lang }}/rss.xml" rel="self" type="application/rss+xml" /> - <title>{{ siteconfitem['rsstitle'] }}</title> - <language>{{ lang }}</language> - <description>{{ siteconfitem['rssdescr']|e }}</description> - <link>https://{{ siteconfitem['baseurl'] }}/</link> - <lastBuildDate>{{ now }}</lastBuildDate> - {% for newspostitem in newsposts %} - <item> - <guid>https://{{ siteconfitem['baseurl'] }}/{{ lang }}{{ siteconfitem['newsloc'] }}{{ newspostitem['page'] }}</guid> - <link>https://{{ siteconfitem['baseurl'] }}/{{ lang }}{{ siteconfitem['newsloc'] }}{{ newspostitem['page'] }}</link> - <pubDate>{{ conv_date_rfc822(newspostitem["date"]) }}</pubDate> - <title>{{ newspostitem['title']|e }}</title> - <description> - <![CDATA[ - <article> - {{ newspostitem['content'] }} - </article> - ]]> - </description> - </item> - {% endfor %} - </channel> - {% endfor %} + <channel> + <atom:link href="https://{{ siteconf['baseurl'] }}/{{ lang }}/rss.xml" rel="self" type="application/rss+xml" /> + <title>{{ siteconf['rsstitle'] }}</title> + <language>{{ lang }}</language> + <description>{{ siteconf['rssdescr']|e }}</description> + <link>https://{{ siteconf['baseurl'] }}/</link> + <lastBuildDate>{{ now }}</lastBuildDate> + {% for newspostitem in newsposts %} + <item> + <guid>https://{{ siteconf['baseurl'] }}/{{ lang }}{{ siteconf['newsloc'] }}{{ newspostitem['page'] }}</guid> + <link>https://{{ siteconf['baseurl'] }}/{{ lang }}{{ siteconf['newsloc'] }}{{ newspostitem['page'] }}</link> + <pubDate>{{ conv_date_rfc822(newspostitem["date"]) }}</pubDate> + <title>{{ newspostitem['title']|e }}</title> + <description> + <![CDATA[ + <article> + {{ newspostitem['content'] }} + </article> + ]]> + </description> + </item> + {% endfor %} + </channel> </rss> @@ -1,13 +1,12 @@ siteconf: - - baseurl: https://taler.net/ - newsloc: /news/ - newsdir: news - rsstitle: Taler.net - rssdescr: "News posts published by Taler about changes related to Taler, releases and events" - rssloc: - rsslink: - rsslang: - docshost: docs.taler.net + baseurl: https://taler.net/ + newsloc: /news/ + rsstitle: Taler.net + rssdescr: "News posts published by Taler about changes related to Taler, releases and events" + rssloc: + rsslink: + rsslang: + docshost: docs.taler.net langs_full: &langs en: English ar: Arabic |