Merge branch 'master' of https://gitlab.rezometz.org/klafyvel/site_tps
This commit is contained in:
commit
cb4d469787
4 changed files with 10 additions and 4 deletions
|
@ -23,4 +23,5 @@ urlpatterns = [
|
||||||
path('', views.home),
|
path('', views.home),
|
||||||
path('content/', include('content.urls')),
|
path('content/', include('content.urls')),
|
||||||
path('settings/', include('settings.urls')),
|
path('settings/', include('settings.urls')),
|
||||||
|
path('vote/', include('vote.urls')),
|
||||||
]
|
]
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<a href="{% url 'content:category-list' category_id=c.id %}">{{c.name}}
|
<a href="{% url 'content:category-list' category_id=c.id %}">{{c.name}}
|
||||||
</a></li>
|
</a></li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<li><a href="">Vote</a></li>
|
<li><a href="{% url 'vote:home' %}">Vote</a></li>
|
||||||
<li><a href="{% url 'settings:index' %}">Administration</a></li>
|
<li><a href="{% url 'settings:index' %}">Administration</a></li>
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
|
||||||
|
|
|
@ -1,2 +1,6 @@
|
||||||
Lol
|
{% extends 'base.html' %}
|
||||||
|
{% block content %}
|
||||||
|
<div class="container">
|
||||||
|
<h2>Votes disponibles</h2>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
from django.urls import path
|
from django.urls import path
|
||||||
from . import views
|
from . import views
|
||||||
|
|
||||||
|
app_name = 'vote'
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('home', views.home)
|
path('home', views.home, name='home')
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue