Merge branch 'qwann/html/base2' into qwann/html/user

This commit is contained in:
Qwann 2017-03-05 19:12:56 +01:00
commit f47608d246
4 changed files with 3 additions and 151 deletions

View file

@ -1,5 +1,5 @@
""" """
GestionEvenmentiel URL configuration GestionÉvenementiel URL configuration
""" """
from django.conf import settings from django.conf import settings
from django.conf.urls import url, include from django.conf.urls import url, include

View file

@ -1,75 +0,0 @@
{% extends "base_html.html" %}
{% load staticfiles %}
{% block title %}Qwann{% block sub_title %}{% endblock %}{% endblock %}
{% block navbar %}
<li> <a href="{% url 'event:index' %}"><i class="fa fa-home" aria-hidden="true"></i></a></li>
{% if user.is_authenticated %}
<li class="dropdown">
<a data-toggle="dropdown" href="#"><i class="fa fa-user-circle" aria-hidden="true"></i><b class="caret"></b></a>
<ul class="dropdown-menu">
<li> <a href="{% url 'user:password_change' %}">Changer de mot de passe</a> </li>
<li> <a href="{% url 'user:logout' %}">Se déconnecter</a> </li>
</ul>
</li>
{% else %}
<li class="{% block active_login %} {% endblock %}"> <a href="{% url 'user:login' %}"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
</li>
{% endif %}
{% endblock %}
{% block main_container %}
<div class="starter-template">
<div class="row">
<main class="col-xs-12">
{% if messages %}
{% for message in messages %}
<div class="alert message-{{message.tags}} alter-dismissible fade in" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<strong>
{% if message.level == DEFAULT_MESSAGE_LEVELS.DEBUG %}DEBUG : {% endif %}
{% if message.level == DEFAULT_MESSAGE_LEVELS.INFO %}Info : {% endif %}
{% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}Ayé ! {% endif %}
{% if message.level == DEFAULT_MESSAGE_LEVELS.WARNING %}Ooops ! {% endif %}
{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}Attention ! {% endif %}
</strong>
{{ message }}
</div>
{% endfor %}
{% endif %}
{% block content %}{% endblock %}
</main>
<aside class="col-xs-12">
{{message_title}}
{% block aside %}{% endblock %}
</aside>
</div>
</div>
{% endblock %}
{% block foot %}
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-4">
<strong>Liens utiles</strong>
<ul>
<li><a href="https://github.com/ErkanNarmanli/">GitHub</a></li>
<li><a href="https://git.eleves.ens.fr/u/narmanli">GitÉlèves (ENS)</a></li>
<li><a href="http://www.lemonde.fr/campus/article/2016/02/16/ils-ont-integre-polytechnique-normale-sup-et-hec-par-une-voie-detournee_4866488_4401467.html">Pour la frime</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-4">
<strong>Pages amies</strong>
<ul>
<li><a href="http://evarin.fr/"><i>Le site d'Evarin</i>, par Evarin :p</a></li>
<li><a href="http://blogs.eleves.ens.fr/lenid/">Blog <i>le nid</i>, par Julie Beauté</a></li>
</ul>
</div>
</div>
</div><!-- /.container -->
{% endblock %}
{% block foot_copyrights %}
La totalité du contenu de ce site est sous licence libre CC0. <a href="https://fr.wikipedia.org/wiki/Licence_CC0">Plus d'infos.</a>
{% endblock %}

View file

@ -1,7 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block sec_title %}Erreur !{% endblock %} {% block page_title %}Erreur !{% endblock %}
{% block aside %}
Les messages d'erreur, c'est pas cool. Mais bon, si vous êtes tombé de ssus, c'est que vous l'avez sans doute un peu cherché. Sinon c'est que le site a été codé par un-e incapable. L'un des cas de figure est plus probable que l'autre, mais je me garderai bien de dire lequel.
{% endblock %}

View file

@ -1,71 +0,0 @@
{% load staticfiles %}
<!DOCTYPE html>
<html lang="fr">
<head>
<title>
{% block title %}{% endblock %}
</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='https://fonts.googleapis.com/css?family=Nunito:700' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Catamaran:700' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Teko:500" rel="stylesheet">
<script src="{% static "jquery/jquery-3.1.0.min.js" %}" type="text/javascript"></script>
<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "css/index.css" %}" rel="stylesheet">
<link href="{% static "fonts/glyphicons-halflings-regular.ttf" %}" rel="stylesheet">
<link href="{% static "font-awesome/css/font-awesome.min.css" %}" rel="stylesheet">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
{% block extra_head %}{% endblock %}
</head>
<body>
<header>
<div class="strong-banner head-banner">
<div class="container">
<nav class="navbar navbar-inverse" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'event:index' %}"><img src="{% static "img/qwann_big.png" %}" alt="Qwann" style=height:50px;"></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
{% block navbar %}{% endblock %}
</ul>
</div>
</nav>
</div><!-- /.container -->
</div><!-- /.strong-banner -->
<div class="soft-banner">
<div class="container">
<h1 class="page-title">{% block section_title %}{% endblock %}</h1>
</div><!-- /.container -->
</div><!-- /.soft-banner -->
</header>
<div class="container" id="principal">
{% block main_container %}{% endblock %}
</div><!-- /.container -->
<footer>
<div class="soft-banner bottom-banner">
{% block foot %}{% endblock %}
</div><!-- /.soft-banner -->
<div class="strong-banner copyrights">
<div class="container">
{% block foot_copyrights %}{% endblock %}
</div><!-- /.container -->
</div><!-- /.strong-banner -->
</footer>
{% block extra_script %}{% endblock %}
<script src=" {% static "js/bootstrap.min.js" %}"></script>
</body>
</html>