Changed templates to support taxonomy list and taxonomy term pages
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
parent
aaee830519
commit
ef3f0dde62
GPG key ID:
C622E5563CAC205D
7 changed files with 56 additions and 125 deletions
10
content/faq/index.md
Normal file
10
content/faq/index.md
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
title: "F.A.Q."
|
||||
description: "Frequently asked questions for Organic Maps application"
|
||||
weight: 1000
|
||||
|
||||
extra:
|
||||
menu_title: F.A.Q.
|
||||
---
|
||||
|
||||
### This page is replaced with taxonomy "faq" from templates/faq/list.html template
|
||||
|
|
@ -1,7 +1,19 @@
|
|||
{%- if page %}
|
||||
{%- set resource = page %}
|
||||
{%- set resource_title = resource.title %}
|
||||
{%- set resource_path = resource.path %}
|
||||
{%- elif section %}
|
||||
{%- set resource = section %}
|
||||
{%- set resource_title = resource.title %}
|
||||
{%- set resource_path = resource.path %}
|
||||
{%- elif taxonomy %}
|
||||
{%- set resource = taxonomy %}{# taxonomy has only 'name' and 'slug' properties #}
|
||||
{%- set resource_path = '/' ~ resource.name ~ '/' %}
|
||||
{%- set resource_title = resource.name %}
|
||||
{%- elif term %}
|
||||
{%- set resource = term %}{# taxonomy term has only 'name', 'slug' and 'path' properties #}
|
||||
{%- set resource_path = resource.path %}
|
||||
{%- set resource_title = resource.name %}
|
||||
{%- endif %}
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
|
@ -21,7 +33,7 @@
|
|||
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ get_url(path="rss.xml", trailing_slash=false) }}">
|
||||
{% endblock %}
|
||||
|
||||
<link rel="canonical" href="{{ config.base_url | safe }}{{ resource.path | safe }}">
|
||||
<link rel="canonical" href="{{ config.base_url | safe }}{{ resource_path | safe }}">
|
||||
|
||||
{%- set preview_image = 'images/screenshots/prague.jpg' -%}
|
||||
{%- if resource.extra.preview_image -%}
|
||||
|
|
@ -29,19 +41,19 @@
|
|||
{%- elif resource.assets %}
|
||||
{%- set basename = resource.assets[0] | split(pat='/') | last %}
|
||||
{%- if basename is ending_with('.jpg') or basename is ending_with('.jpeg') or basename is ending_with('.png') or basename is ending_with('.webp') %}
|
||||
{%- set preview_image = resource.path ~ basename -%}
|
||||
{%- set preview_image = resource_path ~ basename -%}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
<meta property="og:image" content="{{ get_url(path=preview_image) }}">
|
||||
<meta property="og:url" content="{{ current_url | safe }}">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:title" content="{{ resource.title }}">
|
||||
<meta property="og:title" content="{{ resource_title }}">
|
||||
{%- if resource.description -%}
|
||||
<meta property="og:description" content="{{ resource.description }}">
|
||||
{%- endif -%}
|
||||
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="{{ resource.title }}">
|
||||
<meta name="twitter:title" content="{{ resource_title }}">
|
||||
{%- if resource.description -%}
|
||||
<meta name="twitter:description" content="{{ resource.description }}">
|
||||
{%- endif -%}
|
||||
|
|
@ -59,7 +71,7 @@
|
|||
|
||||
<link href="{{ get_url(path="main.css", cachebust=true) }}" rel="stylesheet" type="text/css">
|
||||
|
||||
<title>{{ resource.title }}</title>
|
||||
<title>{{ resource_title }}</title>
|
||||
|
||||
{%- if lang == config.default_language %}
|
||||
{% include 'language_redirect.html' %}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
{% endif %}
|
||||
|
||||
{% if page.extra.menu_title %}
|
||||
{% if resource.path != page.path %}<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
|
||||
{% if resource_path != page.path %}<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
|
||||
<span>{{ page.extra.menu_title }}</span>
|
||||
{%- if resource.path != page.path %}</a>{% endif %}
|
||||
{%- if resource_path != page.path %}</a>{% endif %}
|
||||
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<a href="mailto:hello@organicmaps.app">{{ trans(key='contact', lang=lang) }}</a>
|
||||
</nav>
|
||||
</nav>
|
||||
|
|
@ -1,58 +1,14 @@
|
|||
{%- set resource = taxonomy %}
|
||||
{% extends 'base.html' %}
|
||||
|
||||
<!DOCTYPE html>
|
||||
{%- set rtl_langs = ["ar", "arc", "dv", "fa", "ha", "he", "khw", "ks", "ku", "ps", "ur", "yi"] -%}
|
||||
<html lang="{{ lang }}" {%- if lang in rtl_langs -%} dir="rtl" {%- endif -%}>
|
||||
{# __tera_context #}
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
|
||||
{% block meta_description %}
|
||||
<meta name="description" content="OrganicMaps - F.A.Q.">
|
||||
{% endblock %}
|
||||
|
||||
<meta name="description" content="">
|
||||
|
||||
<link rel="canonical" href="{{ config.base_url | safe }}{{ taxonomy.name }}">
|
||||
|
||||
<meta property="og:url" content="{{ current_url | safe }}">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:title" content="((Title))">
|
||||
<meta property="og:description" content="{{ taxonomy.name }}">
|
||||
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="((Title))">
|
||||
<meta name="twitter:description" content="{{ taxonomy.name }}">
|
||||
|
||||
<meta name="apple-itunes-app" content="app-id=1567437057">
|
||||
<meta name="wikidata" content="Q107078602">
|
||||
|
||||
<meta name="generator" content="Zola">
|
||||
|
||||
<link href="{{ get_url(path="main.css", cachebust=true) }}" rel="stylesheet" type="text/css">
|
||||
|
||||
<title>{{ taxonomy.name }}</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>
|
||||
{% include 'top_menu.html' %}
|
||||
(( __tera_context ))
|
||||
</header>
|
||||
|
||||
<main>
|
||||
<h1>F.A.Q.</h1>
|
||||
{%- for term in terms -%}
|
||||
<p><a href="{{term.permalink}}">{{term.name}} questions</a></p>
|
||||
{%- endfor -%}
|
||||
</main>
|
||||
|
||||
<footer>
|
||||
((bottom_menu.html))
|
||||
<p>
|
||||
<span>© 2023 <a href="mailto:legal@organicmaps.app">Organic Maps OÜ</a>, reg. code 16225385</span>
|
||||
<span>Harju maakond, Tallinn, Kesklinna linnaosa, Rävala pst 8-810, 10143, Estonia</span>
|
||||
</p>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
{% block content %}
|
||||
<h1>F.A.Q.</h1>
|
||||
{%- for term in terms -%}
|
||||
<p><a href="{{term.permalink}}">{{term.name}} questions</a></p>
|
||||
{%- endfor -%}
|
||||
{% endblock content %}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,13 @@
|
|||
{%- set resource = term %}
|
||||
{% extends 'base.html' %}
|
||||
|
||||
<!DOCTYPE html>
|
||||
{%- set rtl_langs = ["ar", "arc", "dv", "fa", "ha", "he", "khw", "ks", "ku", "ps", "ur", "yi"] -%}
|
||||
<html lang="{{ lang }}" {%- if lang in rtl_langs -%} dir="rtl" {%- endif -%}>
|
||||
{% block meta_description %}
|
||||
<meta name="description" content="OrganicMaps - F.A.Q.">
|
||||
{% endblock %}
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
|
||||
|
||||
<meta name="description" content="">
|
||||
|
||||
<link rel="canonical" href="{{ config.base_url | safe }}/{{ term.path }}">
|
||||
|
||||
<meta property="og:url" content="{{ current_url | safe }}">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:title" content="((Title))">
|
||||
<meta property="og:description" content="{{ term.name }}">
|
||||
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="((Title))">
|
||||
<meta name="twitter:description" content="{{ taxonomy.name }}">
|
||||
|
||||
<meta name="apple-itunes-app" content="app-id=1567437057">
|
||||
<meta name="wikidata" content="Q107078602">
|
||||
|
||||
<meta name="generator" content="Zola">
|
||||
|
||||
<link href="{{ get_url(path="main.css", cachebust=true) }}" rel="stylesheet" type="text/css">
|
||||
|
||||
<title>{{ term.name }}</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>
|
||||
{% include 'top_menu.html' %}
|
||||
(( __tera_context ))
|
||||
</header>
|
||||
|
||||
<main>
|
||||
{% block content %}
|
||||
{%- for page in term.pages -%}
|
||||
<h3>{{ page.extra | get(key="question", default="Question") }}</h3>
|
||||
{{ page.content | safe }}
|
||||
{%- endfor -%}
|
||||
{% endblock %}
|
||||
</main>
|
||||
|
||||
<footer>
|
||||
((bottom_menu.html))
|
||||
<p>
|
||||
<span>© 2023 <a href="mailto:legal@organicmaps.app">Organic Maps OÜ</a>, reg. code 16225385</span>
|
||||
<span>Harju maakond, Tallinn, Kesklinna linnaosa, Rävala pst 8-810, 10143, Estonia</span>
|
||||
</p>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
{% block content %}
|
||||
<h1>F.A.Q. - {{ term.name }}</h1>
|
||||
{%- for faq_page in term.pages -%} {# How to sort questions #}
|
||||
<h3>{{ faq_page.extra | get(key="question", default="Question") }}</h3>
|
||||
{{ faq_page.content | safe }}
|
||||
{%- endfor -%}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
// there were no previous redirects or explicit language selections before (see language_seletor.html)
|
||||
if (null === window.localStorage.getItem('lang')) {
|
||||
// ["en", "ru", ...]
|
||||
var pageTranslations = {{ resource.translations | map(attribute="lang") | sort | json_encode() | safe }};
|
||||
var pageTranslations = {{ resource | get(key="translations", default=[]) | map(attribute="lang") | sort | json_encode() | safe }};
|
||||
var userPreferredLanguages = navigator.languages ? navigator.languages : [navigator.language];
|
||||
outerLoop:
|
||||
for (var i = 0; i < userPreferredLanguages.length; i++) {
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
{% set page = get_page(path=translated.path) %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<span class="top_menu_{{ page.path | split(pat="/") | reverse | nth(n=1) }} top_menu_item{% if resource.path is defined and page.path == resource.path %}_active">{% else %}">
|
||||
<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
|
||||
<span class="top_menu_{{ page.path | split(pat="/") | reverse | nth(n=1) }} top_menu_item{% if page.path != resource_path %}">
|
||||
<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% else %}_active">{% endif %}
|
||||
<span>{{ page.extra.menu_title }}</span>
|
||||
{%- if resource.path is undefined or page.path != resource.path %}</a>{% endif %}
|
||||
{%- if page.path != resource_path %}</a>{% endif %}
|
||||
</span>
|
||||
•
|
||||
{% endfor %}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue