kopia lustrzana https://github.com/hholzgra/maposmatic/
Porównaj commity
2 Commity
d7972606e1
...
6a974a52aa
| Autor | SHA1 | Data |
|---|---|---|
Hartmut Holzgraefe
|
6a974a52aa | |
|
Hartmut Holzgraefe
|
28a3517633 |
|
|
@ -28,6 +28,8 @@ from django.db import connections
|
||||||
import django.utils.translation
|
import django.utils.translation
|
||||||
import feedparser
|
import feedparser
|
||||||
import datetime
|
import datetime
|
||||||
|
import git
|
||||||
|
import os
|
||||||
|
|
||||||
from .models import MapRenderingJob
|
from .models import MapRenderingJob
|
||||||
import www.settings
|
import www.settings
|
||||||
|
|
@ -201,6 +203,12 @@ def all(request):
|
||||||
else:
|
else:
|
||||||
platform_status = 'hourglas-clock'
|
platform_status = 'hourglas-clock'
|
||||||
|
|
||||||
|
try:
|
||||||
|
git_repo = git.Repo(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
|
||||||
|
git_branch = git_repo.active_branch
|
||||||
|
except Exception as e:
|
||||||
|
git_branch = e
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'BBOX_MAXIMUM_LENGTH_IN_METERS': www.settings.BBOX_MAXIMUM_LENGTH_IN_METERS,
|
'BBOX_MAXIMUM_LENGTH_IN_METERS': www.settings.BBOX_MAXIMUM_LENGTH_IN_METERS,
|
||||||
'BRAND_NAME': www.settings.BRAND_NAME,
|
'BRAND_NAME': www.settings.BRAND_NAME,
|
||||||
|
|
@ -208,6 +216,7 @@ def all(request):
|
||||||
'CONTACT_EMAIL': www.settings.CONTACT_EMAIL,
|
'CONTACT_EMAIL': www.settings.CONTACT_EMAIL,
|
||||||
'DEBUG': www.settings.DEBUG,
|
'DEBUG': www.settings.DEBUG,
|
||||||
'EXTRA_FOOTER': www.settings.EXTRA_FOOTER,
|
'EXTRA_FOOTER': www.settings.EXTRA_FOOTER,
|
||||||
|
'GIT_BRANCH': git_branch,
|
||||||
'LANGUAGES': www.settings.LANGUAGES,
|
'LANGUAGES': www.settings.LANGUAGES,
|
||||||
'LANGUAGES_LIST': www.settings.LANGUAGES_LIST,
|
'LANGUAGES_LIST': www.settings.LANGUAGES_LIST,
|
||||||
'LANGUAGE_FLAGS': www.settings.LANGUAGE_FLAGS,
|
'LANGUAGE_FLAGS': www.settings.LANGUAGE_FLAGS,
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,10 @@
|
||||||
data-bs-content='<p class="text-{{queues_overall_state}}">{% trans "Rendering queue(s): " %}<i class="pull-right fas fa-{{queues_overall_symbol}}"></i></p>
|
data-bs-content='<p class="text-{{queues_overall_state}}">{% trans "Rendering queue(s): " %}<i class="pull-right fas fa-{{queues_overall_symbol}}"></i></p>
|
||||||
<p class="text-{% if gis_lag_ok %}success{% else %}{% if gis_lastupdate %}warning{% else %}danger{% endif %}{% endif %}">{% trans "GIS database: " %}<i class="pull-right fas fa-{% if gis_lag_ok %}check{% else %}{% if gis_lastupdate %}hourglass-half{% else %}times{% endif %}{% endif %}"></i></p>
|
<p class="text-{% if gis_lag_ok %}success{% else %}{% if gis_lastupdate %}warning{% else %}danger{% endif %}{% endif %}">{% trans "GIS database: " %}<i class="pull-right fas fa-{% if gis_lag_ok %}check{% else %}{% if gis_lastupdate %}hourglass-half{% else %}times{% endif %}{% endif %}"></i></p>
|
||||||
<p class="text-{% if waymarked_lag_ok %}success{% else %}{% if waymarked_lastupdate %}warning{% else %}danger{% endif %}{% endif %}">{% trans "WayMarked database: " %}<i class="pull-right fas fa-{% if waymarked_lag_ok %}check{% else %}{% if waymarked_lastupdate %}hourglass-half{% else %}times{% endif %}{% endif %}"></i></p>'
|
<p class="text-{% if waymarked_lag_ok %}success{% else %}{% if waymarked_lastupdate %}warning{% else %}danger{% endif %}{% endif %}">{% trans "WayMarked database: " %}<i class="pull-right fas fa-{% if waymarked_lag_ok %}check{% else %}{% if waymarked_lastupdate %}hourglass-half{% else %}times{% endif %}{% endif %}"></i></p>'
|
||||||
><i class="fas fa-{{ platform_status }}"></i> {{BRAND_NAME}}</a>
|
><i class="fas fa-{{ platform_status }}"></i> {{BRAND_NAME}}</a>
|
||||||
|
{% if DEBUG %}
|
||||||
|
<a class="btn btn-warning" role="button" href="https://github.com/hholzgra/maposmatic/tree/{{GIT_BRANCH}}"><i class="fas fa-person-digging"></i> {{GIT_BRANCH}}</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar-collapse" aria-expanded="false" aria-label="{% trans "Toggle navigation" %}">
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar-collapse" aria-expanded="false" aria-label="{% trans "Toggle navigation" %}">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
|
<html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
|
||||||
<head>
|
<head>
|
||||||
<title>{{BRAND_NAME}}{% if DEBUG %} [DEV]{% endif %}: {% block title %}Welcome!{% endblock %}</title>
|
<title>{{BRAND_NAME}}{% if DEBUG %} [DEV: {{GIT_BRANCH}}]{% endif %}: {% block title %}Welcome!{% endblock %}</title>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="referrer" content="no-referrer"/>
|
<meta name="referrer" content="no-referrer"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue