diff --git a/config.toml b/config.toml index 34f8f1c1..34644cec 100644 --- a/config.toml +++ b/config.toml @@ -28,6 +28,10 @@ home = "Home" news = "News" language = "English" support-us = "Support Us" +install-appstore = "Install Organic Maps from the AppStore" +install-googleplay = "Install Organic Maps from Google Play" +install-fdroid="Install Organic Maps from F-Droid" +install-appgallery = "Install Organic Maps from Huawei AppGallery" [languages.tr] [languages.tr.translations] @@ -38,6 +42,10 @@ home = "Ana Sayfa" news = "Haberler" language = "Türkçe" support-us = "Bizi destekleyin" +install-appstore = "Organic Maps'i AppStore'dan İndir" +install-googleplay = "Organic Maps'i Google Play'den İndir" +install-fdroid="Organic Maps'i F-Droid'den İndir" +install-appgallery = "Organic Maps'i Huawei AppGallery'den İndir" [languages.it] [languages.it.translations] @@ -48,6 +56,10 @@ home = "Pagina Iniziale" news = "Notizie" language = "Italiano" support-us = "Contribuisci" +install-appstore = "Installa Organic Maps dall'AppStore" +install-googleplay = "Installa Organic Maps da Google Play" +install-fdroid="Installa Organic Maps da F-Droid" +install-appgallery = "Installa Organic Maps da Huawei AppGallery" [languages.ru] @@ -59,3 +71,7 @@ home = "Главная" news = "Новости" language = "Русский" support-us = "Помочь проекту" +install-appstore = "Установить Organic Maps из Apple AppStore" +install-googleplay = "Установить Organic Maps из Google Play" +install-fdroid="Установить Organic Maps из F-Droid" +install-appgallery = "Установить Organic Maps из Huawei AppGallery" diff --git a/content/_index.it.md b/content/_index.it.md index 7c035d0f..ec0d54ac 100644 --- a/content/_index.it.md +++ b/content/_index.it.md @@ -10,15 +10,7 @@ extra: **Organic Maps** è un'applicazione gratuita di mappe offline per Android e iOS per viaggiatori, turisti, escursionisti e ciclisti, basata su dati crowd-sourced di **[OpenStreetMap](https://www.openstreetmap.org)**. Si tratta di un [fork](https://it.wikipedia.org/wiki/Fork_(sviluppo_software)) open source dell'applicazione **Maps.me** (precedentemente nota come [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me)), incentrato sulla privacy e gestito dalle stesse persone che hanno creato **MapsWithMe** nel 2011. -
- -{{ badge(url='https://apps.apple.com/app/organic-maps/id1567437057', img='apple-appstore.svg', title="Installa Organic Maps dall'AppStore") }} - -{{ badge(url='https://play.google.com/store/apps/details?id=app.organicmaps', img='googleplay.svg', title="Installa Organic Maps da Google Play") }} - -{{ badge(url='https://f-droid.org/en/packages/app.organicmaps/', img='f-droid.svg', title="Installa Organic Maps da F-Droid") }} - -{{ badge(url='https://appgallery.huawei.com/#/app/C104325611', img='huawei-appgallery.png', title="Installa Organic Maps da Huawei AppGallery") }} +{{ badges() }} {{ screenshot(src='/images/screenshots/hiking.jpg', alt='Hiking') }} {{ screenshot(src='/images/screenshots/prague.jpg', alt='Prague') }} @@ -115,20 +107,3 @@ Organic Maps è un [software open-source](https://github.com/organicmaps/organic - Diğer kullanıcılarla tartışmak için [Telegram Grubumuza](https://t.me/OrganicMapsTR) katılın. - Visita la nostra [pagina GitHub](https://github.com/organicmaps/organicmaps). - Segui i nostri aggiornamenti su [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp), [Instagram](https://instagram.com/organicmaps.app/). - - - - diff --git a/content/_index.md b/content/_index.md index 5a1697dc..7d1a4295 100644 --- a/content/_index.md +++ b/content/_index.md @@ -11,15 +11,7 @@ extra: **[OpenStreetMap](https://www.openstreetmap.org)** data. It is a privacy-focused, open-source [fork](https://en.wikipedia.org/wiki/Fork_(software_development)) of **Maps.me** app (previously known as [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me)), maintained by the same people who created **MapsWithMe** in 2011. -
- -{{ badge(url='https://apps.apple.com/app/organic-maps/id1567437057', img='apple-appstore.svg', title='Install Organic Maps from the AppStore') }} - -{{ badge(url='https://play.google.com/store/apps/details?id=app.organicmaps', img='googleplay.svg', title='Install Organic Maps from Google Play') }} - -{{ badge(url='https://f-droid.org/en/packages/app.organicmaps/', img='f-droid.svg', title='Install Organic Maps from F-Droid') }} - -{{ badge(url='https://appgallery.huawei.com/#/app/C104325611', img='huawei-appgallery.png', title='Install Organic Maps from Huawei AppGallery') }} +{{ badges() }} {{ screenshot(src='/images/screenshots/hiking.jpg', alt='Hiking') }} {{ screenshot(src='/images/screenshots/prague.jpg', alt='Prague') }} @@ -120,20 +112,3 @@ licensed under the Apache License 2.0. - Visit our [GitHub page](https://github.com/organicmaps/organicmaps). - Follow our updates in [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp), [Instagram](https://instagram.com/organicmaps.app/). - - - - diff --git a/content/_index.ru.md b/content/_index.ru.md index 083b954d..cc30b8df 100644 --- a/content/_index.ru.md +++ b/content/_index.ru.md @@ -12,13 +12,7 @@ extra:
-{{ badge(url='https://apps.apple.com/app/organic-maps/id1567437057', img='apple-appstore.svg', title='Установить из AppStore') }} - -{{ badge(url='https://play.google.com/store/apps/details?id=app.organicmaps', img='googleplay.svg', title='Установить из Google Play') }} - -{{ badge(url='https://f-droid.org/en/packages/app.organicmaps/', img='f-droid.svg', title='Установить F-Droid') }} - -{{ badge(url='https://appgallery.huawei.com/#/app/C104325611', img='huawei-appgallery.png', title='Установить из Huawei AppGallery') }} +{{ badges() }} {{ screenshot(src='/images/screenshots/hiking.jpg', alt='Пеший поход') }} {{ screenshot(src='/images/screenshots/prague.jpg', alt='Прага') }} @@ -68,20 +62,3 @@ Organic Maps развивается сообществом энтузиасто - Поучаствуйте в [разработке](https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md) приложения под Android и iOS; - Подпишитесь на нас в [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp) и [Instagram](https://instagram.com/organicmaps.app/). - Расскажите своим друзьям и знакомым. - - - - diff --git a/content/_index.tr.md b/content/_index.tr.md index 148c0f60..b3c9e059 100644 --- a/content/_index.tr.md +++ b/content/_index.tr.md @@ -11,15 +11,7 @@ extra: Topluluk kaynaklı [**OpenStreetMap**](https://www.openstreetmap.org) verilerine dayanmaktadır. Daha önce [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me) olarak bilinen **Maps.me** uygulamasının gizlilik odaklı, açık kaynaklı bir [çatalı](https://tr.wikipedia.org/wiki/%C3%87atal_(yaz%C4%B1l%C4%B1m_geli%C5%9Ftirme)) olan Organic Maps, 2011 yılında **MapsWithMe** uygulamasını geliştiren kişiler tarafından sürdürülmektedir. -
-
-{{ badge(url='https://apps.apple.com/app/organic-maps/id1567437057', img='apple-appstore.svg', title="Organic Maps'i AppStore'dan İndir") }}
-
-{{ badge(url='https://play.google.com/store/apps/details?id=app.organicmaps', img='googleplay.svg', title="Organic Maps'i Google Play'den İndir") }}
-
-{{ badge(url='https://f-droid.org/en/packages/app.organicmaps/', img='f-droid.svg', title="Organic Maps'i F-Droid'den İndir") }}
-
-{{ badge(url='https://appgallery.huawei.com/#/app/C104325611', img='huawei-appgallery.png', title="Organic Maps'i Huawei AppGallery'den İndir") }}
+{{ badges() }}
{{ screenshot(src='/images/screenshots/hiking.jpg', alt='Yürüyüş') }}
{{ screenshot(src='/images/screenshots/prague.jpg', alt='Prag') }}
@@ -116,20 +108,3 @@ Organic Maps, Apache License 2.0 altında lisanslanmış bir [açık kaynaklı y
- [E-posta](mailto:hello@organicmaps.app) ile bizimle iletişime geçin
- Güncellemelerimizi [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp) ve
- [Instagram](https://instagram.com/organicmapstr/) üzerinden takip edin.
-
-
-
-
diff --git a/sass/main.scss b/sass/main.scss
index abcc0c57..1d8d644d 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -119,7 +119,7 @@ footer {
}
}
-.installButton {
+.installPWAButton {
display: none;
position: fixed;
top: 0;
diff --git a/templates/google_native_app_prompt.html b/templates/google_native_app_prompt.html
new file mode 100644
index 00000000..0d69bf21
--- /dev/null
+++ b/templates/google_native_app_prompt.html
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/templates/index.html b/templates/index.html
index c56fb589..25480b81 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,4 +6,6 @@
{{ resource.content | safe }}
+{% include 'google_native_app_prompt.html' %}
+
{% endblock content %}
diff --git a/templates/shortcodes/badge.html b/templates/shortcodes/badge.html
deleted file mode 100644
index 26d99146..00000000
--- a/templates/shortcodes/badge.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/templates/shortcodes/badges.html b/templates/shortcodes/badges.html
new file mode 100644
index 00000000..facd0562
--- /dev/null
+++ b/templates/shortcodes/badges.html
@@ -0,0 +1,14 @@
+