Commit 5ca00500 authored by Élie Bouttier's avatar Élie Bouttier
Browse files

gestion des tâches

parent 7e060cf2

djadhere/settings.py

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ INSTALLED_APPS = [ 
    'services',

    'banking',

    'stocking',

    'todo',

    'djadhere',



    'bootstrap4',

djadhere/static/css/djadhere.css

+4 −0
Original line number Diff line number Diff line 
.container {

  padding-top: 2rem;

  padding-bottom: 2rem;

}

djadhere/templates/_base.html

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
    {% block js %}

    {% bootstrap_javascript jquery="full" %}

    {% endblock %}



    {% block extrahead %}{% endblock extrahead %}

    {% block extra_js %}{% endblock extra_js %}

  </head>



  <body>

djadhere/templates/base.html

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
{% endblock %}



{% block body %}

{% block pageheader %}

  <header>

    <nav class="navbar navbar-expand-md navbar-dark bg-dark">

      <a class="navbar-brand" href="#">tetaneutral.net</a>

      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTop" aria-expanded="false" aria-controls="navbarTop" aria-label="Toggle navigation">
@@ -40,6 +42,11 @@ 
          </li>

          {% endif %}

          {% endfor %}

          <li class="nav-item{% block todotab %}{% endblock %}">

            <a class="nav-link" href="{% url 'todo:list-tasklists' %}">

              <span class="glyphicon glyphicon-heart-empty"></span>&nbsp;Liste des tâches

            </a>

          </li>

        </ul>

        <ul class="navbar-nav">

          {% if request.user.is_staff %}
@@ -60,6 +67,8 @@ 
        </ul>

      </div>

    </nav>

  </header>

{% endblock %}



{% block container %}

	<main class="container">

djadhere/urls.py

+6 −5
Original line number Diff line number Diff line
@@ -13,16 +13,17 @@ Including another URLconf 
    1. Import the include() function: from django.conf.urls import url, include

    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))

"""

from django.conf.urls import url, include

from django.urls import include, path

from django.contrib.gis import admin

from django.conf import settings





urlpatterns = [

    url(r'^accounts/', include('accounts.urls')),

    url(r'^', include('services.urls')),

    url(r'^', include('adhesions.urls')),

    url(r'^admin/', admin.site.urls),

    path('accounts/', include('accounts.urls')),

    path('todo/', include('todo.urls')),

    path('', include('services.urls')),

    path('', include('adhesions.urls')),

    path('admin/', admin.site.urls),

]



if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: