python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

starts move to bootstrap4

Browse Source
This commit is contained in:
artus
2018-10-11 16:07:21 +02:00
parent cb7e28990f
commit 4f67398219
5 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -1,7 +1,7 @@
# Requirements # Requirements
django django
django-bootstrap3 django-bootstrap4
django-select2 django-select2
django-watson django-watson
django-graphos django-graphos

2
settings.py
View File

@@ -51,7 +51,7 @@ TEMPLATES[0]['DIRS'] += [
# Applications # Applications
INSTALLED_APPS += [ INSTALLED_APPS += [
# Design # Design
'bootstrap3', 'bootstrap4',
'django_select2', 'django_select2',
# Search Engine # Search Engine
'watson', 'watson',

100
website/static/css/dashboard.css Normal file
View File

@@ -0,0 +1,100 @@
body {
font-size: .875rem;
}
.feather {
width: 16px;
height: 16px;
vertical-align: text-bottom;
}
/*
* Sidebar
*/
.sidebar {
position: fixed;
top: 0;
bottom: 0;
left: 0;
z-index: 100; /* Behind the navbar */
padding: 48px 0 0; /* Height of navbar */
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
}
.sidebar-sticky {
position: relative;
top: 0;
height: calc(100vh - 48px);
padding-top: .5rem;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
}
@supports ((position: -webkit-sticky) or (position: sticky)) {
.sidebar-sticky {
position: -webkit-sticky;
position: sticky;
}
}
.sidebar .nav-link {
font-weight: 500;
color: #333;
}
.sidebar .nav-link .feather {
margin-right: 4px;
color: #999;
}
.sidebar .nav-link.active {
color: #007bff;
}
.sidebar .nav-link:hover .feather,
.sidebar .nav-link.active .feather {
color: inherit;
}
.sidebar-heading {
font-size: .75rem;
text-transform: uppercase;
}
/*
* Content
*/
[role="main"] {
padding-top: 48px; /* Space for fixed navbar */
}
/*
* Navbar
*/
.navbar-brand {
padding-top: .75rem;
padding-bottom: .75rem;
font-size: 1rem;
background-color: rgba(0, 0, 0, .25);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
}
.navbar .form-control {
padding: .75rem 1rem;
border-width: 0;
border-radius: 0;
}
.form-control-dark {
color: #fff;
background-color: rgba(255, 255, 255, .1);
border-color: rgba(255, 255, 255, .1);
}
.form-control-dark:focus {
border-color: transparent;
box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
}

135
website/templates/base.html
View File

@@ -1,84 +1,97 @@
<!DOCTYPE html> <!DOCTYPE html>
{% load staticfiles %} {% load bootstrap3 %} {% load navbar %} {% load staticfiles %} {% load bootstrap4 %} {% load navbar %}
<html lang="fr"> <html lang="fr">
<head> <head>
<title>{% block title %}La maraude{% endblock %}</title> <title>{% block title %}La maraude{% endblock %}</title>
{% bootstrap_css %}{% bootstrap_javascript %} {% bootstrap_css %}{% bootstrap_javascript %}
<link rel="stylesheet" type="text/css" href="/static/css/base.css" /> <link rel="stylesheet" type="text/css" href="/static/css/base.css" />
<link rel="stylesheet" type="text/css" href="/static/css/dashboard.css" />
{% block extrastyle %}{% endblock %} {% block extrastyle %}{% endblock %}
{% if stylesheets %}{% for stylesheet in stylesheets %}<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %} {% if stylesheets %}{% for stylesheet in stylesheets %}<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %}
{% block extrahead %}{% endblock %} {% block extrahead %}{% endblock %}
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %} {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
</head> </head>
<body {% block extra_body_attrs %}{% endblock %}> <body {% block extra_body_attrs %}{% endblock %}>
<div class="container-fluid"> <!-- START: Navigation Bar -->
<!-- START: Navigation Bar --> <nav class="navbar fixed-top navbar-dark bg-dark">
<div class="row"> <a class="navbar-brand" href="/">Maraude ALSA</a>
<nav class="navbar navbar-static-top navbar-default"> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="container-fluid"> <div class="collapse navbar-collapse" id="navbar-collapse">
<!-- Brand and toggle get grouped for better mobile display --> <ol class="breadcrumb navbar-text">
<div class="navbar-header"> {% block breadcrumbs %}
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"> <li>{{ page_header }}</li>
<span class="sr-only">Toggle navigation</span> {% if page_header_small %}<li>{{ page_header_small }}</li>{% endif %}
<span class="icon-bar"></span> {% endblock %}
<span class="icon-bar"></span> </ol>
<span class="icon-bar"></span> {% if user.is_authenticated %}
</button> <ul class="nav navbar-nav navbar-right">
<a class="navbar-brand" href="/">Maraude ALSA</a> <li class="dropdown">
</div> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<!-- Collect the nav links, forms, and other content for toggling --> Menu <span class="glyphicon glyphicon-menu-hamburger"></span>
<div class="collapse navbar-collapse" id="navbar-collapse"> </a>
<ul class="nav navbar-nav navbar-left"> <ul class="dropdown-menu">
{% if user.is_authenticated %} <li><a href="{% url "statistiques:index" %}"><span class="glyphicon glyphicon-stats"></span> Statistiques</a></li>
<li class="dropdown {% active namespace="maraudes" append=True %}"> {% if user.is_superuser %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "road" %}&nbsp; Maraudes</span></a> <li><a href="/admin/"><span class="glyphicon glyphicon-wrench"></span> Administration</a></li>
{% include "maraudes/menu.html" %}
</li>
<li class="dropdown {% active namespace="notes" append=True %}">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "pencil" %}&nbsp; Notes</span></a>
{% include "notes/menu.html" %}
</li>
{% else %}
<li {% active namespace="statistiques" %}><a href="{% url "statistiques:index" %}">{% bootstrap_icon "stats" %}&nbsp; Statistiques</a></li>
{% endif %} {% endif %}
<li role="separator" class="divider"></li>
<li><a href="{% url "utilisateurs:index" %}"><span class="glyphicon glyphicon-user"></span> {{ user }}</a></li>
<li><a href="/logout/"><span class="glyphicon glyphicon-log-out"></span> Déconnexion</a></li>
</ul> </ul>
<ol class="breadcrumb navbar-text"> </li>
{% block breadcrumbs %} </ul>
<li>{{ page_header }}</li> {% endif %}
{% if page_header_small %}<li>{{ page_header_small }}</li>{% endif %} </div><!-- /.navbar-collapse -->
{% endblock %} </nav>
</ol> <!-- END: Navigation Bar -->
<div class="container-fluid">
<div class="row">
<nav class="col-md-2 d-none d-md-block bg-light sidebar">
<div class="sidebar-sticky">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<ul class="nav navbar-nav navbar-right"> <h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted">
<li class="dropdown"> <span>Maraudes</span>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> </h6>
Menu <span class="glyphicon glyphicon-menu-hamburger"></span> <ul class="nav flex-column">
</a> <li class="nav-item">
<ul class="dropdown-menu"> <a href="{% url 'maraudes:index' %}" class="nav-link {% active namespace="maraudes" append=True %}">Maraudes</a>
<li><a href="{% url "statistiques:index" %}"><span class="glyphicon glyphicon-stats"></span> Statistiques</a></li> </li>
{% if user.is_superuser %} </ul>
<li><a href="/admin/"><span class="glyphicon glyphicon-wrench"></span> Administration</a></li> <ul class="nav flex-column">
{% endif %} <li class="nav-item">
<li role="separator" class="divider"></li> <a href="{% url 'maraudes:planning' %}" class="nav-link {% active namespace="maraudes" append=True %}">Planning</a>
<li><a href="{% url "utilisateurs:index" %}"><span class="glyphicon glyphicon-user"></span> {{ user }}</a></li> </li>
<li><a href="/logout/"><span class="glyphicon glyphicon-log-out"></span> Déconnexion</a></li> </ul>
</ul> <h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted">
<span>Notes</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a href="{% url 'notes:liste-maraude' %}" class="nav-link {% active namespace="notes" append=True %}">Par maraudes</a>
</li>
<li class="nav-item">
<a href="{% url 'notes:liste-sujet' %}" class="nav-link {% active namespace="notes" append=True %}">Par sujets</a>
</li>
</ul>
{% else %}
<h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted">
<span>Menu</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link {% active namespace="statistiques" append=True %}" href="{% url "statistiques:index" %}">Statistiques</a>
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
</div><!-- /.navbar-collapse --> {% block sidebar %}{% endblock %}
</div><!-- /.container-fluid --> </div>
</nav> </nav>
</div> <main role="main" class="col-md-10 ml-sm-auto px-4">
<!-- END: Navigation Bar --> <div class="d-flex justify-content-between">
<div class="row">
<div class="col-lg-10 col-lg-push-2 col-md-9 col-md-push-3">
{% bootstrap_messages %} {% bootstrap_messages %}
{% block page_content %}{% endblock %} {% block page_content %}{% endblock %}
</div> </div>
<div class="col-lg-2 col-lg-pull-10 col-md-3 col-md-pull-9"> </main>
{% block sidebar %}{% endblock %}
</div>
</div> </div>
</div> </div>
</body> </body>

10
website/templates/index.html
View File

@@ -1,12 +1,11 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load bootstrap3 %} {% load bootstrap4 %}
{% block sidebar %} {% block sidebar %}
{% include "login.html" %} {% include "login.html" %}
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}
<div class="col-md-8">
<div class="jumbotron"> <div class="jumbotron">
<h2>Présentation</h2> <h2>Présentation</h2>
<p>L'Association pour le Logement des Sans-Abri organise une maraude psychosociale dans la ville de Mulhouse.</p> <p>L'Association pour le Logement des Sans-Abri organise une maraude psychosociale dans la ville de Mulhouse.</p>
@@ -16,15 +15,10 @@
<p>La mission de la Maraude est de créer du lien avec des personnes en errance dans l'objectif d'opérer un ancrage.</p> <p>La mission de la Maraude est de créer du lien avec des personnes en errance dans l'objectif d'opérer un ancrage.</p>
<p>Reconnaissables par leurs vêtements oranges, les maraudeurs sont disponibles pour informer et orienter vers les <p>Reconnaissables par leurs vêtements oranges, les maraudeurs sont disponibles pour informer et orienter vers les
services compétents, ou simplement échanger autour d'un café offert.</p> services compétents, ou simplement échanger autour d'un café offert.</p>
</div> <h2>Horaires</h2>
</div>
<div class="col-md-4">
<div class="jumbotron">
<h2>{% bootstrap_icon "time" %} Horaires</h2>
<ul><li>lundi de 19h à 23h</li> <ul><li>lundi de 19h à 23h</li>
<li>mardi de 19h à 23h</li> <li>mardi de 19h à 23h</li>
<li>jeudi de 19h à 23h</li> <li>jeudi de 19h à 23h</li>
<li>vendredis de 16h à 20h</li></ul> <li>vendredis de 16h à 20h</li></ul>
</div> </div>
</div>
{% endblock %} {% endblock %}