2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

change sources list format and add editor base + sources overlays

Browse source
This commit is contained in:
Laura Klünder 2016-08-19 19:45:11 +02:00
parent 0d3187558e
commit b79f84f0b6
10 changed files with 127 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/c3nav/control/static/control/control.css Normal file
View file

@ -0,0 +1,7 @@
#mapeditor {
position:absolute;
top:54px;
bottom:0;
left:0;
right:0;
}

58
src/c3nav/control/templates/control/base.html
View file

@ -6,52 +6,52 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Dashboard Template for Bootstrap</title>
<title>c3nav Administration</title>
{% compress css %}
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
<link href="{% static 'leaflet/leaflet.css' %}" rel="stylesheet">
<link href="{% static 'control/control.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="#">c3nav Administration</a>
<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="#">c3nav Administration</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="{% url 'control.dashboard' %}">Dashboard</a></li>
<li><a href="{% url 'control.editor' %}">Editor</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{% url 'admin:index' %}">Django Admin</a></li>
<li><a href="{% url 'admin:logout' %}">Logout</a></li>
</ul>
</div>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Django Admin</a></li>
<li><a href="#">Logout</a></li>
</ul>
</div>
</div>
</nav>
<div class="container">
<div class="row">
<div class="col-sm-4 col-md-3">
<ul class="nav nav-pills nav-stacked">
<li class="active"><a href="#">AAA</a></li>
<li><a href="#">BBB</a></li>
<li><a href="#">CCC</a></li>
</ul>
</div>
<div class="col-sm-8 col-md-9">
<h2>Dashboard</h2>
</div>
</div>
{% 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>

4
src/c3nav/control/templates/control/dashboard.html Normal file
View file

@ -0,0 +1,4 @@
{% extends 'control/base.html' %}
{% block content %}
<h1>Dashboard</h1>
{% endblock %}

25
src/c3nav/control/templates/control/editor.html Normal file
View file

@ -0,0 +1,25 @@
{% extends 'control/base.html' %}
{% block content %}
<h1>Editor</h1>
<div id="mapeditor"></div>
{% endblock %}
{% block addbottom %}
<script type="text/javascript">
var map = L.map('mapeditor', {
center: [120, 200],
zoom: 2,
maxBounds: [[0, 0], [{{ map.height }}, {{ map.width }}]],
maxZoom: 10,
minZoom: 1,
crs: L.CRS.Simple,
});
layers = {
{% for filename, source in map.sources_by_filename.items %}
"{{ source.name }}": L.imageOverlay('{% url 'map.source' filename=filename %}', {{ source.jsbounds }}),{% endfor %}
}
L.control.layers([], layers).addTo(map);
</script>
{% endblock %}

3
src/c3nav/control/urls.py
View file

@ -3,5 +3,6 @@ from django.conf.urls import url
from . import views
urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^$', views.dashboard, name='control.dashboard'),
url(r'^editor/(?P<level>[^/]+)?$', views.editor, name='control.editor'),
]

22
src/c3nav/control/views.py
View file

@ -1,7 +1,21 @@
from django.shortcuts import render
from django.contrib.admin.views.decorators import staff_member_required
from django.http import Http404
from django.shortcuts import redirect, render
from ..mapdata import mapmanager
def index(request):
return render(request, 'control/base.html')
@staff_member_required
def dashboard(request):
return render(request, 'control/dashboard.html')
# Create your views here.
@staff_member_required
def editor(request, level=None):
if not level:
return redirect('control.editor', level=mapmanager.levels[0])
if level not in mapmanager.levels:
raise Http404('Level does not exist')
return render(request, 'control/editor.html', {
'map': mapmanager
})