diff --git a/src/c3nav/site/templates/site/base.html b/src/c3nav/site/templates/site/base.html index c40f2520..823a3389 100644 --- a/src/c3nav/site/templates/site/base.html +++ b/src/c3nav/site/templates/site/base.html @@ -1,34 +1,32 @@ {% load static %} {% load compress %} {% load i18n %} - - - - + + c3nav {% compress css %} - + + + + + {% endcompress %} - - - - -
-

c3nav

- {% block content %} - {% endblock %} - - {% include 'site/footer.html' %} -
- - {% compress js %} - - - - {% endcompress %} - + + + {% if not embed %} +
+

c3nav

+ + {{ user_data.title }} + {% if user_data.subtitle %}{{ user_data.subtitle }}{% endif %} + +
+ {% endif %} + {% block content %} + {% endblock %} + diff --git a/src/c3nav/site/templates/site/footer.html b/src/c3nav/site/templates/site/footer.html deleted file mode 100644 index 0b8e7681..00000000 --- a/src/c3nav/site/templates/site/footer.html +++ /dev/null @@ -1,33 +0,0 @@ -{% load i18n %} - - diff --git a/src/c3nav/site/templates/site/fragment_location.html b/src/c3nav/site/templates/site/fragment_location.html deleted file mode 100644 index 0cfb0aca..00000000 --- a/src/c3nav/site/templates/site/fragment_location.html +++ /dev/null @@ -1,104 +0,0 @@ -{% load i18n %} -
-
- - {% if name == 'destination' %} - {% if origin %} - {% if destination %} - {% url 'site.route' origin=destination.location_id destination=origin.location_id as swap_url %} - {% else %} - {% url 'site.destination' destination=origin.location_id as swap_url %} - {% endif %} - {% elif destination %} - {% url 'site.origin' destination=destination.location_id as swap_url %} - {% endif %} - {% trans 'swap' %} - {% endif %} - -
-
- {% if search == name and search_results %} - - {% endif %} -
- - -
-
-
-
-
- {% if map_level %} - {% for area in visible_areas %} - - {% endfor %} -

{% trans 'Javascript is disabled. Please scroll in this direction ⇘' %}

- {% endif %} -
-
-
- {% for level in levels %} - {{ level }} - {% endfor %} -
{% trans 'close' %} -
- {% trans 'Click or tap the desired location on the map.' %} -
-
-
- {{ location.title }} - {{ location.subtitle }} -
-
- - -
- -
- -
-
- {% trans 'Sorry, we could not detect your position.' %} - {% trans 'Wifi mapping may not yet be available in the entire building.' %} -
-
- -
-
-
- {% if search == name and not search_results %} - {% trans 'No location matched your search query.' %} - {% endif %} -
- {% if name == 'location' %} -
-
- {% trans 'Route to here' %} -
-
- {% trans 'Route from here' %} -
-
- {% endif %} - {% if not location and not map_level %} - - {% endif %} -
diff --git a/src/c3nav/site/templates/site/fragment_route.html b/src/c3nav/site/templates/site/fragment_route.html deleted file mode 100644 index b02d4a87..00000000 --- a/src/c3nav/site/templates/site/fragment_route.html +++ /dev/null @@ -1,66 +0,0 @@ -{% load static %} -{% load i18n %} -{% load route_render %} - -

{% trans 'Your Route' %} {{ route.distance | stringformat:".1f" }}m

-{% if route.ctypes_exception %} -
- {% trans 'This Route contains way types you wanted to avoid.' %} -
-{% endif %} -
- {% for routepart in route.routeparts %} -
-
- - - - - - - - {% for area in visible_areas %} - - {% endfor %} - - - - {% for line in routepart.lines %} - - {% endfor %} - - -
-
- {% if forloop.first %} -
-
-

{{ origin.title }}
{{ origin.subtitle }}

-
- {% endif %} - {% for line in routepart.lines %} - {% if not line.ignore %} -
-
-

{% if line.title %}{{ line.title }}
{% endif %}{{ line.description }}

-
- {% endif %} - {% endfor %} - {% if forloop.last %} -
-
-

{{ destination.title }}
{{ destination.subtitle }}

-
- {% endif %} -
-
- {% endfor %} -
diff --git a/src/c3nav/site/templates/site/fragment_select.html b/src/c3nav/site/templates/site/fragment_select.html deleted file mode 100644 index 2ff5028c..00000000 --- a/src/c3nav/site/templates/site/fragment_select.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n %} - - diff --git a/src/c3nav/site/templates/site/main.html b/src/c3nav/site/templates/site/main.html deleted file mode 100644 index 204c6383..00000000 --- a/src/c3nav/site/templates/site/main.html +++ /dev/null @@ -1,112 +0,0 @@ -{% extends 'site/base.html' %} - -{% load static %} -{% load i18n %} - -{% block bodyclass %} nomobileclient{% endblock %} - -{% block content %} -
- {% csrf_token %} -
- {% trans "Location" as heading %} - {% url 'site.index' as reset_url %} - {% include 'site/fragment_location.html' with name='location' location=location heading=heading reset_url=reset_url %} - - {% trans "Origin" as heading %} - {% url 'site.destination' destination=destination.location_id as reset_url %} - {% include 'site/fragment_location.html' with name='origin' location=origin heading=heading reset_url=reset_url %} - - {% trans "Destination" as heading %} - {% url 'site.origin' origin=origin.location_id as reset_url %} - {% include 'site/fragment_location.html' with name='destination' location=destination heading=heading reset_url=reset_url %} -
-
-
-
- - {% include 'site/fragment_select.html' with name='stairs' value=stairs %} -
-
- - {% include 'site/fragment_select.html' with name='escalators' value=escalators %} -
-
- - {% include 'site/fragment_select.html' with name='elevators' value=elevators %} -
-
- -

- {% for name, includable in includables %} - - {% endfor %} - {% for name, excludable in excludables %} - - {% endfor %} -

-
-
-
-
-
-
- -
-
- {% trans 'Edit Settings' %} -
-
-
-
-
- -
-
-
-
-
- -{% if error == 'noroutefound' %} -
- {% trans 'Sorry, no Route could be found.' %} -

- {% blocktrans %} - Your origin or your destination is not within an accessible area or there is no possible route between them. - {% endblocktrans %} -

-
-{% elif error == 'alreadythere' %} -
- {% trans 'Congratulations, you are already there!' %} -
- {% elif error == 'notyetroutable' %} -
- {% trans 'One or both of your locations are not in the routing table yet.' %} -

{% trans 'Please try again in a few minutes.' %}

-
-{% endif %} -
-
-

-

https://c3nav.de/lalala.png

-

- - - - - -

-
-
-{% if route %} -{% include 'site/fragment_route.html' %} -{% endif %} -{% endblock %} diff --git a/src/c3nav/site/templates/site/map.html b/src/c3nav/site/templates/site/map.html index d121856b..892e27db 100644 --- a/src/c3nav/site/templates/site/map.html +++ b/src/c3nav/site/templates/site/map.html @@ -1,31 +1,9 @@ +{% extends 'site/base.html' %} {% load static %} {% load compress %} {% load i18n %} - - - - - - c3nav - {% compress css %} - - - - - - - {% endcompress %} - - - {% if not embed %} -
-

c3nav

- - {{ user_data.title }} - {% if user_data.subtitle %}{{ user_data.subtitle }}{% endif %} - -
- {% endif %} + +{% block content %}
{% if not embed %} @@ -130,5 +108,4 @@ {% endcompress %} - - +{% endblock %}