allow changing the branding, disabling app adds, and fix "imprint"
This commit is contained in:
Laura Klünder
parent
33242ba86d
commit
8828362950
5 changed files with 46 additions and 15 deletions
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-08-28 15:02+0200\n"
|
||||
"PO-Revision-Date: 2024-03-24 17:46+0100\n"
|
||||
"POT-Creation-Date: 2024-09-16 18:01+0200\n"
|
||||
"PO-Revision-Date: 2024-09-16 18:02+0200\n"
|
||||
"Last-Translator: Laura Klünder <laura@codingcatgirl.de>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: de\n"
|
||||
|
|
@ -3595,7 +3595,7 @@ msgstr ""
|
|||
"auf <a href=\"https://patreon.com/c3nav\" rel=\"external\" "
|
||||
"target=\"_blank\">Patreon</a>:"
|
||||
|
||||
#: c3nav/site/templates/site/about.html c3nav/site/templates/site/map.html
|
||||
#: c3nav/site/templates/site/about.html
|
||||
msgid "Imprint"
|
||||
msgstr "Impressum"
|
||||
|
||||
|
|
@ -3682,7 +3682,6 @@ msgid "You are reporting an issue with the following location:"
|
|||
msgstr "Du meldest einen Fehler beim folgenden Ort:"
|
||||
|
||||
#: c3nav/site/templates/site/fragment_report_meta.html
|
||||
#: c3nav/site/templates/site/map.html
|
||||
msgid "open in c3nav"
|
||||
msgstr "in c3nav öffnen"
|
||||
|
||||
|
|
@ -3723,8 +3722,13 @@ msgid "API"
|
|||
msgstr "API"
|
||||
|
||||
#: c3nav/site/templates/site/map.html
|
||||
msgid "about c3nav"
|
||||
msgstr "über c3nav"
|
||||
#, python-format
|
||||
msgid "about %(branding)s"
|
||||
msgstr "über %(branding)s"
|
||||
|
||||
#: c3nav/site/templates/site/map.html
|
||||
msgid "Legal notice"
|
||||
msgstr "Impressum"
|
||||
|
||||
#: c3nav/site/templates/site/map.html
|
||||
msgid "Select"
|
||||
|
|
@ -3814,6 +3818,11 @@ msgstr ""
|
|||
msgid "Select theme"
|
||||
msgstr "Theme wählen"
|
||||
|
||||
#: c3nav/site/templates/site/map.html
|
||||
#, python-format
|
||||
msgid "open in %(branding)s"
|
||||
msgstr "in %(branding)s öffnen"
|
||||
|
||||
#: c3nav/site/templates/site/position_create.html
|
||||
#: c3nav/site/templates/site/position_list.html
|
||||
msgid "Create position"
|
||||
|
|
@ -4110,6 +4119,19 @@ msgstr ""
|
|||
"API-Secret erstellt. Notier es dir sofort, denn es wird nicht erneut "
|
||||
"angezeigt!"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgid "Map update"
|
||||
#~ msgid "Mapupdate"
|
||||
#~ msgstr "Kartenänderung"
|
||||
|
||||
#, fuzzy, python-format
|
||||
#~| msgid "on level %(level_title)s"
|
||||
#~ msgid "changes on level %(level_title)s"
|
||||
#~ msgstr "in der Etage %(level_title)s"
|
||||
|
||||
#~ msgid "about c3nav"
|
||||
#~ msgstr "über c3nav"
|
||||
|
||||
#~ msgid "second altitude"
|
||||
#~ msgstr "zweite Bodenhöhe"
|
||||
|
||||
|
|
|
|||
|
|
@ -163,6 +163,9 @@ if not SECRET_MESH_KEY:
|
|||
debug_fallback = "runserver" in sys.argv
|
||||
DEBUG = config.getboolean('django', 'debug', fallback=debug_fallback, env='C3NAV_DEBUG')
|
||||
|
||||
BRANDING = config.get('c3nav', 'branding', fallback='c3nav')
|
||||
APP_ENABLED = config.getboolean('c3nav', 'app_enabled', fallback=False)
|
||||
|
||||
ENABLE_MESH = config.getboolean('c3nav', 'enable_mesh', fallback=True, env='ENABLE_MESH')
|
||||
SERVE_ANYTHING = config.getboolean('c3nav', 'serve_anything', fallback=True, env='SERVE_ANYTHING')
|
||||
SERVE_API = config.getboolean('c3nav', 'serve_api', fallback=SERVE_ANYTHING, env='SERVE_API')
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<head>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, user-scalable=no">
|
||||
<title>{% block title %}c3nav{% endblock %}</title>
|
||||
<title>{% block title %}{% if branding %}{{ branding }}{% else %}}c3nav{% endif %}{% endblock %}</title>
|
||||
{% if favicon %}
|
||||
<link href="{% static favicon %}" rel="icon">
|
||||
{% endif %}
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon_package/apple-touch-icon.png' %}">
|
||||
<link rel="manifest" href="{% static 'favicon_package/site.webmanifest' %}">
|
||||
<link rel="mask-icon" href="{% static 'favicon_package/safari-pinned-tab.svg' %}" color="{{ primary_color }}">
|
||||
<meta name="apple-mobile-web-app-title" content="c3nav">
|
||||
<meta name="application-name" content="c3nav">
|
||||
<meta name="apple-mobile-web-app-title" content="{% if branding %}{{ branding }}{% else %}}c3nav{% endif %}">
|
||||
<meta name="application-name" content="{% if branding %}{{ branding }}{% else %}}c3nav{% endif %}">
|
||||
<meta name="msapplication-TileColor" content="{{ primary_color }}">
|
||||
<meta name="msapplication-config" content="{% static 'favicon_package/browserconfig.xml' %}">
|
||||
{% endif %}
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
{% if not embed and not request.mobileclient %}
|
||||
<header>
|
||||
<h1><a href="{% block header_title_url %}/{% endblock %}" id="header-logo-link">
|
||||
{% if header_logo %}<img src="{% static header_logo %}">{% else %}c3nav {% endif %}{% spaceless %}
|
||||
{% if header_logo %}<img src="{% static header_logo %}" alt="{% if branding %}{{ branding }}{% else %}}c3nav{% endif %}">{% else %}{% if branding %}{{ branding }}{% else %}}c3nav{% endif %} {% endif %}{% spaceless %}
|
||||
{% endspaceless %}{% block header_title %}{% endblock %}
|
||||
</a></h1>
|
||||
<a href="/account/" id="user">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
{% if meta %}
|
||||
<meta property="twitter:card" content="summary_large_image"/>
|
||||
<meta property="og:type" content="website"/>
|
||||
<meta property="og:site_name" content="c3nav"/>
|
||||
<meta property="og:site_name" content="{{ branding }}"/>
|
||||
{% endif %}
|
||||
{% if meta.title %}
|
||||
<meta name="title" content="{{ meta.title }}"/>
|
||||
|
|
@ -46,9 +46,9 @@
|
|||
<a href="/api/" target="_blank">{% trans 'API' %}</a> //
|
||||
<a href="https://chaos.social/@c3nav/" rel="external" target="_blank">Fediverse</a> //
|
||||
<a href="https://github.com/c3nav/c3nav/" rel="external" target="_blank">GitHub</a> //
|
||||
<a href="{% url 'site.about' %}" id="about-link">{% trans 'about c3nav' %}</a>
|
||||
<a href="{% url 'site.about' %}" id="about-link">{% blocktrans with branding=branding %}about {{ branding }}{% endblocktrans %}</a>
|
||||
{% if imprint %}
|
||||
// <a href="{{ imprint }}" target="_blank">{% trans 'Imprint' %}</a>
|
||||
// <a href="{{ imprint }}" target="_blank">{% trans 'Legal notice' %}</a>
|
||||
{% endif %}
|
||||
</section>
|
||||
{% endif %}
|
||||
|
|
@ -96,6 +96,7 @@
|
|||
<button class="mobileclient-shortcut">{% trans 'create shortcut' %}</button>
|
||||
</p>
|
||||
</section>
|
||||
{% if app_enabled %}
|
||||
<section id="app-ad">
|
||||
<h3>{% trans 'Wifi-based location' %}</h3>
|
||||
<p>{% trans 'Get the c3nav app for Android to see your location on the map.' %}</p>
|
||||
|
|
@ -105,6 +106,7 @@
|
|||
<a class="button" href="https://github.com/c3nav/c3nav-android/releases" target="_blank">{% trans 'APK' %}</a>
|
||||
</p>
|
||||
</section>
|
||||
{% endif %}
|
||||
<section id="reload-msg">
|
||||
<img src="{% static 'img/loader.gif' %}">
|
||||
</section>
|
||||
|
|
@ -217,12 +219,14 @@
|
|||
</section>
|
||||
</div>
|
||||
</section>
|
||||
{% if app_enabled %}
|
||||
<div class="app-ads">
|
||||
<div id="android-app-ad">
|
||||
<a href="#" class="close"><i class="material-symbols">close</i></a>
|
||||
{% blocktrans with play_url="https://play.google.com/store/apps/details?id=de.c3nav.droid" apk_url="https://github.com/c3nav/c3nav-android/releases" %}Get the c3nav Android app on <a href="{{ play_url }}" target="_blank">Google Play</a> or <a href="{{ apk_url }}" target="_blank">download the APK!</a>{% endblocktrans %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="theme-selection">
|
||||
<h2>{% trans 'Select theme' %}</h2>
|
||||
<p>
|
||||
|
|
@ -233,8 +237,8 @@
|
|||
<button>Save theme</button>
|
||||
</div>
|
||||
{% else %}
|
||||
<a id="embed-logo" class="embed-link" target="_blank">{% if header_logo %}<img src="{% static header_logo %}">{% else %}<span>c3nav</span>{% endif %}</a>
|
||||
<a id="embed-open" class="embed-link" target="_blank">{% trans 'open in c3nav' %}</a>
|
||||
<a id="embed-logo" class="embed-link" target="_blank">{% if header_logo %}<img src="{% static header_logo %}" alt="{{ branding }}">{% else %}<span>{{ branding }}</span>{% endif %}</a>
|
||||
<a id="embed-open" class="embed-link" target="_blank">{% blocktrans with branding=branding %}open in {{ branding }}{% endblocktrans %}</a>
|
||||
<section id="popup-buttons"></section>
|
||||
<section id="search">
|
||||
<input type="hidden" id="origin-input">
|
||||
|
|
|
|||
|
|
@ -192,6 +192,8 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, options=N
|
|||
'bounds': json.dumps(Source.max_bounds(), separators=(',', ':')),
|
||||
'levels': json.dumps(tuple((level.pk, level.short_label) for level in levels.values()), separators=(',', ':')),
|
||||
'state': json.dumps(state, separators=(',', ':'), cls=DjangoJSONEncoder),
|
||||
'branding': settings.BRANDING,
|
||||
'app_enabled': settings.APP_ENABLED,
|
||||
'tile_cache_server': settings.TILE_CACHE_SERVER,
|
||||
'initial_level': settings.INITIAL_LEVEL,
|
||||
'initial_bounds': json.dumps(initial_bounds, separators=(',', ':')) if initial_bounds else None,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue