mirror of
https://gitlab.crans.org/bde/nk20
synced 2024-11-26 18:37:12 +00:00
Remove custom CSS from base.html
This commit is contained in:
Alexandre Iooss
parent
c8a0882b31
commit
b76d4d69e0
@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
PROJECT_DIR = os.path.dirname(os.path.realpath(__file__))
|
PROJECT_DIR = os.path.dirname(os.path.realpath(__file__))
|
||||||
APPS_DIR = os.path.realpath(os.path.join(BASE_DIR,"apps"))
|
APPS_DIR = os.path.realpath(os.path.join(BASE_DIR, "apps"))
|
||||||
sys.path.append(APPS_DIR)
|
sys.path.append(APPS_DIR)
|
||||||
|
|
||||||
# Quick-start development settings - unsuitable for production
|
# Quick-start development settings - unsuitable for production
|
||||||
@ -76,7 +76,7 @@ ROOT_URLCONF = 'note_kfet.urls'
|
|||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'DIRS': [os.path.join(BASE_DIR,'templates')],
|
'DIRS': [os.path.join(BASE_DIR, 'templates')],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
'context_processors': [
|
'context_processors': [
|
||||||
@ -127,7 +127,7 @@ AUTHENTICATION_BACKENDS = (
|
|||||||
'guardian.backends.ObjectPermissionBackend',
|
'guardian.backends.ObjectPermissionBackend',
|
||||||
)
|
)
|
||||||
|
|
||||||
ANONYMOUS_USER_NAME = None # Disable guardian anonymous user
|
ANONYMOUS_USER_NAME = None # Disable guardian anonymous user
|
||||||
|
|
||||||
GUARDIAN_GET_CONTENT_TYPE = 'polymorphic.contrib.guardian.get_polymorphic_base_content_type'
|
GUARDIAN_GET_CONTENT_TYPE = 'polymorphic.contrib.guardian.get_polymorphic_base_content_type'
|
||||||
|
|
||||||
@ -149,6 +149,8 @@ USE_L10N = True
|
|||||||
|
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
||||||
|
LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
|
||||||
|
|
||||||
# Static files (CSS, JavaScript, Images)
|
# Static files (CSS, JavaScript, Images)
|
||||||
# https://docs.djangoproject.com/en/2.2/howto/static-files/
|
# https://docs.djangoproject.com/en/2.2/howto/static-files/
|
||||||
|
|
||||||
@ -158,7 +160,7 @@ USE_TZ = True
|
|||||||
# Example: "/var/www/example.com/static/"
|
# Example: "/var/www/example.com/static/"
|
||||||
STATIC_ROOT = os.path.realpath(__file__)
|
STATIC_ROOT = os.path.realpath(__file__)
|
||||||
STATICFILES_DIRS = [
|
STATICFILES_DIRS = [
|
||||||
os.path.join(BASE_DIR,'static')]
|
os.path.join(BASE_DIR, 'static')]
|
||||||
|
|
||||||
CRISPY_TEMPLATE_PACK = 'bootstrap4'
|
CRISPY_TEMPLATE_PACK = 'bootstrap4'
|
||||||
DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html'
|
DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html'
|
||||||
|
|||||||
@ -14,9 +14,8 @@ urlpatterns = [
|
|||||||
path('note/', include('note.urls')),
|
path('note/', include('note.urls')),
|
||||||
|
|
||||||
# Include Django Contrib and Core routers
|
# Include Django Contrib and Core routers
|
||||||
# admin/login/ is redirected to the non-admin login page
|
|
||||||
path('i18n/', include('django.conf.urls.i18n')),
|
path('i18n/', include('django.conf.urls.i18n')),
|
||||||
path('accounts/',include('member.urls')),
|
path('accounts/', include('member.urls')),
|
||||||
path('accounts/', include('django.contrib.auth.urls')),
|
path('accounts/', include('django.contrib.auth.urls')),
|
||||||
path('admin/doc/', include('django.contrib.admindocs.urls')),
|
path('admin/doc/', include('django.contrib.admindocs.urls')),
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
/* Footer en bas */
|
|
||||||
html {
|
|
||||||
position: relative;
|
|
||||||
min-height: 100%;
|
|
||||||
}
|
|
||||||
body {
|
|
||||||
margin-bottom: 70px; /* Margin bottom by footer height */
|
|
||||||
}
|
|
||||||
.footer {
|
|
||||||
position: absolute;
|
|
||||||
bottom: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 60px; /* Set the fixed height of the footer here */
|
|
||||||
line-height: 60px; /* Vertically center the text there */
|
|
||||||
background-color: #f5f5f5;
|
|
||||||
}
|
|
||||||
/* Affichage des accords dans les interlignes */
|
|
||||||
BIN
static/favicon/android-chrome-192x192.png
Normal file
BIN
static/favicon/android-chrome-192x192.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.7 KiB |
BIN
static/favicon/android-chrome-512x512.png
Normal file
BIN
static/favicon/android-chrome-512x512.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
static/favicon/apple-touch-icon.png
Normal file
BIN
static/favicon/apple-touch-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
9
static/favicon/browserconfig.xml
Normal file
9
static/favicon/browserconfig.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<browserconfig>
|
||||||
|
<msapplication>
|
||||||
|
<tile>
|
||||||
|
<square150x150logo src="/static/favicon/mstile-150x150.png"/>
|
||||||
|
<TileColor>#da532c</TileColor>
|
||||||
|
</tile>
|
||||||
|
</msapplication>
|
||||||
|
</browserconfig>
|
||||||
BIN
static/favicon/favicon-16x16.png
Normal file
BIN
static/favicon/favicon-16x16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 690 B |
BIN
static/favicon/favicon-32x32.png
Normal file
BIN
static/favicon/favicon-32x32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
static/favicon/favicon.ico
Normal file
BIN
static/favicon/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
static/favicon/mstile-150x150.png
Normal file
BIN
static/favicon/mstile-150x150.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
1
static/favicon/safari-pinned-tab.svg
Normal file
1
static/favicon/safari-pinned-tab.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 28 KiB |
19
static/favicon/site.webmanifest
Normal file
19
static/favicon/site.webmanifest
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"short_name": "",
|
||||||
|
"icons": [
|
||||||
|
{
|
||||||
|
"src": "/static/favicon/android-chrome-192x192.png",
|
||||||
|
"sizes": "192x192",
|
||||||
|
"type": "image/png"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"src": "/static/favicon/android-chrome-512x512.png",
|
||||||
|
"sizes": "512x512",
|
||||||
|
"type": "image/png"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"theme_color": "#ffffff",
|
||||||
|
"background_color": "#ffffff",
|
||||||
|
"display": "standalone"
|
||||||
|
}
|
||||||
@ -1,60 +1,80 @@
|
|||||||
{% load static %}
|
{% load static i18n static %}
|
||||||
|
{% comment %}
|
||||||
|
SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
{% endcomment %}
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en" class="position-relative h-100">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||||
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
|
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
|
||||||
<title>{% block title %}NoteKfet2020{% endblock title %}</title>
|
<title>
|
||||||
<meta name="description" content="A framework for launching new Django projects quickly.">
|
{% block title %}{{ title }}{% endblock title %} - {{ request.site.name }}
|
||||||
<meta name="author" content="">
|
</title>
|
||||||
<link rel="shortcut icon" type="image/x-icon" href="{% static 'img/favicon.ico' %}">
|
<meta name="description" content="{% trans "The ENS Paris-Saclay BDE note." %}">
|
||||||
|
|
||||||
{% block css %}
|
{# Favicon #}
|
||||||
<!-- Bootstrap CSS -->
|
<link rel="apple-touch-icon" sizes="180x180" href="{% static "favicon/apple-touch-icon.png" %}">
|
||||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
|
<link rel="icon" type="image/png" sizes="32x32" href="{% static "favicon/favicon-32x32.png" %}">
|
||||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
|
<link rel="icon" type="image/png" sizes="16x16" href="{% static "favicon/favicon-16x16.png" %}">
|
||||||
<link rel="stylesheet" href="{% static 'css/base.css' %}">
|
<link rel="manifest" href="{% static "favicon/site.webmanifest" %}">
|
||||||
{% endblock %}
|
<link rel="mask-icon" href="{% static "favicon/safari-pinned-tab.svg" %}" color="#5bbad5">
|
||||||
|
<link rel="shortcut icon" href="{% static "favicon/favicon.ico" %}">
|
||||||
|
<meta name="msapplication-TileColor" content="#da532c">
|
||||||
|
<meta name="msapplication-config" content="{% static "favicon/browserconfig.xml" %}">
|
||||||
|
<meta name="theme-color" content="#ffffff">
|
||||||
|
|
||||||
|
{# Bootstrap CSS #}
|
||||||
|
<link rel="stylesheet"
|
||||||
|
href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
|
||||||
|
integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
|
||||||
|
crossorigin="anonymous">
|
||||||
|
<link rel="stylesheet"
|
||||||
|
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
|
||||||
|
{% block extracss %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
<nav class="navbar navbar-expand-md navbar-light bg-light fixed-navbar">
|
<nav class="navbar navbar-expand-md navbar-light bg-light fixed-navbar">
|
||||||
<a class="navbar-brand" href="#">NK20-dev</a>
|
<a class="navbar-brand" href="/">{{ request.site.name }}</a>
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
|
<button class="navbar-toggler" type="button" data-toggle="collapse"
|
||||||
<span class="navbar-toggler-icon"></span>
|
data-target="#navbarNavAltMarkup"
|
||||||
</button>
|
aria-controls="navbarNavAltMarkup" aria-expanded="false"
|
||||||
<div class="collapse navbar-collapse" id="navbarNavDropdown">
|
aria-label="Toggle navigation">
|
||||||
<ul class="navbar-nav">
|
<span class="navbar-toggler-icon"></span>
|
||||||
<li class="nav-item active">
|
</button>
|
||||||
<a class="nav-link" href="#"><i class="fa fa-coffee"></i>Consos</a>
|
<div class="collapse navbar-collapse" id="navbarNavDropdown">
|
||||||
</li>
|
<ul class="navbar-nav">
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="{% url 'member:club_list' %}"><i class="fa fa-users"></i> Clubs</a>
|
<a class="nav-link" href="#"><i class="fa fa-coffee"></i> Consos</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="#"><i class="fa fa-calendar"></i> Activités</a>
|
<a class="nav-link" href="{% url 'member:club_list' %}"><i class="fa fa-users"></i> Clubs</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="{% url 'note:template_list' %}"><i class="fa fa-coffee"></i> Bouton</a>
|
<a class="nav-link" href="#"><i class="fa fa-calendar"></i> Activités</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
<li class="nav-item active">
|
||||||
|
<a class="nav-link" href="{% url 'note:template_list' %}"><i class="fa fa-coffee"></i> Bouton</a>
|
||||||
<ul class="navbar-nav ml-auto">
|
</li>
|
||||||
{% if user.is_authenticated%}
|
</ul>
|
||||||
|
<ul class="navbar-nav ml-auto">
|
||||||
|
{% if user.is_authenticated %}
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||||
<i class="fa fa-user"></i> {{ user.username }}
|
<i class="fa fa-user"></i> {{ user.username }}
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
|
<div class="dropdown-menu dropdown-menu-right"
|
||||||
<a class="dropdown-item" href="{% url 'member:user_detail' pk=user.profile.pk %}"> <i class="fa fa-user"></i> Mon compte </a>
|
aria-labelledby="navbarDropdownMenuLink">
|
||||||
|
<a class="dropdown-item" href="{% url 'member:user_detail' pk=user.profile.pk %}">
|
||||||
|
<i class="fa fa-user"></i> Mon compte
|
||||||
|
</a>
|
||||||
<a class="dropdown-item" href="{% url 'logout' %}">
|
<a class="dropdown-item" href="{% url 'logout' %}">
|
||||||
<i class="fa fa-sign-out"></i>
|
<i class="fa fa-sign-out"></i> Se déconnecter
|
||||||
Se déconnecter</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% else%}
|
{% else %}
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="{% url 'member:signup' %}">
|
<a class="nav-link" href="{% url 'member:signup' %}">
|
||||||
<i class="fa fa-user-plus"></i> S'inscrire
|
<i class="fa fa-user-plus"></i> S'inscrire
|
||||||
@ -65,43 +85,74 @@
|
|||||||
<i class="fa fa-sign-in"></i> Se connecter
|
<i class="fa fa-sign-in"></i> Se connecter
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif%}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
<div class="container-fluid mb-5 mt-2">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2">
|
||||||
|
{% block sidebar %}
|
||||||
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
<div class="col-md-10 text-justify">
|
||||||
<div class="container-fluid h-100">
|
{% block contenttitle %}<h1>{{ title }}</h1>{% endblock %}
|
||||||
<div class="row h-100">
|
{% block content %}
|
||||||
<div class="col-md-2">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class ="col-md-10 text-justify mt-5">
|
|
||||||
{% block content %}
|
|
||||||
<p>Default content...</p>
|
<p>Default content...</p>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</div>
|
||||||
<footer class="footer mt-2">
|
</main>
|
||||||
<div class="container">
|
<footer class="bg-light fixed-bottom position-absolute py-2">
|
||||||
<span class="text-muted"> NoteKfet2020 - Nous contacter - </span>
|
<div class="container-fluid">
|
||||||
<p class="pull-right"> <a href="#">Retour en haut</a></p>
|
<div class="row">
|
||||||
|
<div class="col-sm">
|
||||||
|
<form action="{% url 'set_language' %}" method="post"
|
||||||
|
class="form-inline">
|
||||||
|
<span class="text-muted mr-1">
|
||||||
|
NoteKfet2020 -
|
||||||
|
<a href="mailto:tresorie.bde@lists.crans.org"
|
||||||
|
class="text-muted">Nous contacter</a> -
|
||||||
|
</span>
|
||||||
|
{% csrf_token %}
|
||||||
|
<select title="language" name="language"
|
||||||
|
class="custom-select custom-select-sm"
|
||||||
|
onchange="this.form.submit()">
|
||||||
|
{% get_current_language as LANGUAGE_CODE %}
|
||||||
|
{% get_available_languages as LANGUAGES %}
|
||||||
|
{% get_language_info_list for LANGUAGES as languages %}
|
||||||
|
{% for language in languages %}
|
||||||
|
<option value="{{ language.code }}"
|
||||||
|
{% if language.code == LANGUAGE_CODE %}
|
||||||
|
selected{% endif %}>
|
||||||
|
{{ language.name_local }} ({{ language.code }})
|
||||||
|
</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
<noscript>
|
||||||
|
<input type="submit">
|
||||||
|
</noscript>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm text-right">
|
||||||
|
<a href="#" class="text-muted">Retour en haut</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</div>
|
||||||
|
</footer>
|
||||||
{% block javascript %}
|
|
||||||
<!-- Bootstrap JavaScript -->
|
|
||||||
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
|
|
||||||
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
|
|
||||||
|
|
||||||
<!-- 3rd party JavaScript -->
|
|
||||||
|
|
||||||
<!-- Project JS -->
|
|
||||||
<script src="{% static 'js/base.js' %}"></script>
|
|
||||||
|
|
||||||
{% endblock javascript %}
|
|
||||||
|
|
||||||
|
{# Bootstrap JavaScript #}
|
||||||
|
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
|
||||||
|
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
|
||||||
|
crossorigin="anonymous"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
|
||||||
|
integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
|
||||||
|
crossorigin="anonymous"></script>
|
||||||
|
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
|
||||||
|
integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
|
||||||
|
crossorigin="anonymous"></script>
|
||||||
|
{% block extrajavascript %}
|
||||||
|
{% endblock extrajavascript %}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user