move editor to new django app
This commit is contained in:
Laura Klünder
parent
5bdbfb934c
commit
470815c859
11 changed files with 85 additions and 39 deletions
|
|
@ -4,5 +4,4 @@ from . import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', views.dashboard, name='control.dashboard'),
|
url(r'^$', views.dashboard, name='control.dashboard'),
|
||||||
url(r'^editor/(?P<level>[^/]+)?$', views.editor, name='control.editor'),
|
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,7 @@
|
||||||
import json
|
|
||||||
|
|
||||||
from django.contrib.admin.views.decorators import staff_member_required
|
from django.contrib.admin.views.decorators import staff_member_required
|
||||||
from django.shortcuts import get_object_or_404, redirect, render
|
from django.shortcuts import render
|
||||||
|
|
||||||
from ..mapdata.models import Level, Package, Source
|
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
@staff_member_required
|
||||||
def dashboard(request):
|
def dashboard(request):
|
||||||
return render(request, 'control/dashboard.html')
|
return render(request, 'control/dashboard.html')
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
|
||||||
def editor(request, level=None):
|
|
||||||
if not level:
|
|
||||||
return redirect('control.editor', level=Level.objects.first().name)
|
|
||||||
|
|
||||||
level = get_object_or_404(Level, name=level)
|
|
||||||
return render(request, 'control/editor.html', {
|
|
||||||
'bounds': json.dumps(Source.max_bounds()),
|
|
||||||
'sources': [p.sources.all().order_by('name') for p in Package.objects.all()],
|
|
||||||
'levels': Level.objects.all(),
|
|
||||||
'current_level': level,
|
|
||||||
})
|
|
||||||
|
|
|
||||||
0
src/c3nav/editor/__init__.py
Normal file
0
src/c3nav/editor/__init__.py
Normal file
58
src/c3nav/editor/templates/editor/base.html
Normal file
58
src/c3nav/editor/templates/editor/base.html
Normal file
|
|
@ -0,0 +1,58 @@
|
||||||
|
{% load static %}
|
||||||
|
{% load compress %}
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>c3nav Map Editor</title>
|
||||||
|
{% compress css %}
|
||||||
|
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
|
||||||
|
<link href="{% static 'leaflet/leaflet.css' %}" rel="stylesheet">
|
||||||
|
<link href="{% static 'editor/editor.css' %}" rel="stylesheet">
|
||||||
|
{% endcompress %}
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<nav class="navbar navbar-default">
|
||||||
|
<div class="container">
|
||||||
|
<div class="navbar-header">
|
||||||
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
</button>
|
||||||
|
<a class="navbar-brand" href="{% url 'editor.index' %}">c3nav map editor</a>
|
||||||
|
</div>
|
||||||
|
<div id="navbar" class="navbar-collapse collapse">
|
||||||
|
<ul class="nav navbar-nav">
|
||||||
|
<li><a href="#">Map</a></li>
|
||||||
|
<li><a href="#">Packages</a></li>
|
||||||
|
<li><a href="#">Levels</a></li>
|
||||||
|
<li><a href="#">Sources</a></li>
|
||||||
|
</ul>
|
||||||
|
<ul class="nav navbar-nav navbar-right">
|
||||||
|
<li><a href="#">Commit</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
{% block content %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% compress js %}
|
||||||
|
<script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
|
||||||
|
<script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.js' %}"></script>
|
||||||
|
<script type="text/javascript" src="{% static 'leaflet/leaflet.js' %}"></script>
|
||||||
|
<script type="text/javascript" src="{% static 'leaflet/leaflet.editable.js' %}"></script>
|
||||||
|
{% endcompress %}
|
||||||
|
{% block addbottom %}
|
||||||
|
{% endblock %}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'control/base.html' %}
|
{% extends 'editor/base.html' %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div id="mapeditor"></div>
|
<div id="mapeditor"></div>
|
||||||
|
|
@ -22,7 +22,7 @@ var map = L.map('mapeditor', {
|
||||||
{% for source_list in sources %}
|
{% for source_list in sources %}
|
||||||
L.control.layers([], {
|
L.control.layers([], {
|
||||||
{% for source in source_list %}
|
{% for source in source_list %}
|
||||||
"{{ source.name }}": L.imageOverlay('{% url 'map.source' source=source.name %}', {{ source.jsbounds }}),{% endfor %}
|
"{{ source.name }}": L.imageOverlay('{% url 'editor.sources.image' source=source.name %}', {{ source.jsbounds }}),{% endfor %}
|
||||||
}).addTo(map);
|
}).addTo(map);
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|
@ -34,8 +34,7 @@ L.LevelControl = L.Control.extend({
|
||||||
onAdd: function (map) {
|
onAdd: function (map) {
|
||||||
var container = L.DomUtil.create('div', 'leaflet-control leaflet-bar leaflet-levels'), link;
|
var container = L.DomUtil.create('div', 'leaflet-control leaflet-bar leaflet-levels'), link;
|
||||||
{% for level in levels reversed %}
|
{% for level in levels reversed %}
|
||||||
link = L.DomUtil.create('a', '{% if current_level == level %}current{% endif %}', container);
|
link = L.DomUtil.create('a', '{% if forloop.last %}current{% endif %}', container);
|
||||||
link.href = '{% url "control.editor" level=level.name %}';
|
|
||||||
link.innerHTML = '{{ level.name }}';
|
link.innerHTML = '{{ level.name }}';
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
return container;
|
return container;
|
||||||
8
src/c3nav/editor/urls.py
Normal file
8
src/c3nav/editor/urls.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
from django.conf.urls import url
|
||||||
|
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
url(r'^$', views.index, name='editor.index'),
|
||||||
|
url(r'^sources/image/(?P<source>[^/]+)$', views.source, name='editor.sources.image'),
|
||||||
|
]
|
||||||
|
|
@ -1,16 +1,23 @@
|
||||||
|
import json
|
||||||
import mimetypes
|
import mimetypes
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.admin.views.decorators import staff_member_required
|
|
||||||
from django.core.files import File
|
from django.core.files import File
|
||||||
from django.http import HttpResponse
|
from django.http import HttpResponse
|
||||||
from django.shortcuts import get_object_or_404
|
from django.shortcuts import get_object_or_404, render
|
||||||
|
|
||||||
from .models import Source
|
from ..mapdata.models import Level, Package, Source
|
||||||
|
|
||||||
|
|
||||||
|
def index(request):
|
||||||
|
return render(request, 'editor/map.html', {
|
||||||
|
'bounds': json.dumps(Source.max_bounds()),
|
||||||
|
'sources': [p.sources.all().order_by('name') for p in Package.objects.all()],
|
||||||
|
'levels': Level.objects.order_by('altitude'),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
|
||||||
def source(request, source):
|
def source(request, source):
|
||||||
source = get_object_or_404(Source, name=source)
|
source = get_object_or_404(Source, name=source)
|
||||||
response = HttpResponse(content_type=mimetypes.guess_type(source.name)[0])
|
response = HttpResponse(content_type=mimetypes.guess_type(source.name)[0])
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
from django.conf.urls import url
|
|
||||||
|
|
||||||
from . import views
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
url(r'^sources/(?P<source>[^/]+)$', views.source, name='map.source'),
|
|
||||||
url(r'^data/add$', views.source, name='map.edit.source'),
|
|
||||||
]
|
|
||||||
|
|
@ -108,8 +108,9 @@ INSTALLED_APPS = [
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'compressor',
|
'compressor',
|
||||||
'bootstrap3',
|
'bootstrap3',
|
||||||
'c3nav.control',
|
|
||||||
'c3nav.mapdata',
|
'c3nav.mapdata',
|
||||||
|
'c3nav.editor',
|
||||||
|
'c3nav.control',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE_CLASSES = [
|
MIDDLEWARE_CLASSES = [
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@ from django.conf.urls import include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from .control import urls as control_urls
|
from .control import urls as control_urls
|
||||||
from .mapdata import urls as map_urls
|
from .editor import urls as editor_urls
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^control/', include(control_urls)),
|
url(r'^control/', include(control_urls)),
|
||||||
url(r'^map/', include(map_urls)),
|
url(r'^editor/', include(editor_urls)),
|
||||||
url(r'^admin/', admin.site.urls),
|
url(r'^admin/', admin.site.urls),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue