diff --git a/note_kfet/settings.py b/note_kfet/settings.py index f64d1459..cfe09f7b 100644 --- a/note_kfet/settings.py +++ b/note_kfet/settings.py @@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__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) # Quick-start development settings - unsuitable for production @@ -76,7 +76,7 @@ ROOT_URLCONF = 'note_kfet.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR,'templates')], + 'DIRS': [os.path.join(BASE_DIR, 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -127,7 +127,7 @@ AUTHENTICATION_BACKENDS = ( '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' @@ -149,6 +149,8 @@ USE_L10N = True USE_TZ = True +LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")] + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ @@ -158,7 +160,7 @@ USE_TZ = True # Example: "/var/www/example.com/static/" STATIC_ROOT = os.path.realpath(__file__) STATICFILES_DIRS = [ - os.path.join(BASE_DIR,'static')] + os.path.join(BASE_DIR, 'static')] CRISPY_TEMPLATE_PACK = 'bootstrap4' DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html' diff --git a/note_kfet/urls.py b/note_kfet/urls.py index 40b6f3a6..88bb6bb9 100644 --- a/note_kfet/urls.py +++ b/note_kfet/urls.py @@ -14,9 +14,8 @@ urlpatterns = [ path('note/', include('note.urls')), # Include Django Contrib and Core routers - # admin/login/ is redirected to the non-admin login page 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('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), diff --git a/static/css/base.css b/static/css/base.css deleted file mode 100644 index 0407d419..00000000 --- a/static/css/base.css +++ /dev/null @@ -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 */ diff --git a/static/favicon/android-chrome-192x192.png b/static/favicon/android-chrome-192x192.png new file mode 100644 index 00000000..5b31f298 Binary files /dev/null and b/static/favicon/android-chrome-192x192.png differ diff --git a/static/favicon/android-chrome-512x512.png b/static/favicon/android-chrome-512x512.png new file mode 100644 index 00000000..bb9e4daa Binary files /dev/null and b/static/favicon/android-chrome-512x512.png differ diff --git a/static/favicon/apple-touch-icon.png b/static/favicon/apple-touch-icon.png new file mode 100644 index 00000000..c0b462bd Binary files /dev/null and b/static/favicon/apple-touch-icon.png differ diff --git a/static/favicon/browserconfig.xml b/static/favicon/browserconfig.xml new file mode 100644 index 00000000..49604f0e --- /dev/null +++ b/static/favicon/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/static/favicon/favicon-16x16.png b/static/favicon/favicon-16x16.png new file mode 100644 index 00000000..5db7ed94 Binary files /dev/null and b/static/favicon/favicon-16x16.png differ diff --git a/static/favicon/favicon-32x32.png b/static/favicon/favicon-32x32.png new file mode 100644 index 00000000..a3d9263f Binary files /dev/null and b/static/favicon/favicon-32x32.png differ diff --git a/static/favicon/favicon.ico b/static/favicon/favicon.ico new file mode 100644 index 00000000..53393cda Binary files /dev/null and b/static/favicon/favicon.ico differ diff --git a/static/favicon/mstile-150x150.png b/static/favicon/mstile-150x150.png new file mode 100644 index 00000000..378274c9 Binary files /dev/null and b/static/favicon/mstile-150x150.png differ diff --git a/static/favicon/safari-pinned-tab.svg b/static/favicon/safari-pinned-tab.svg new file mode 100644 index 00000000..a8425e8a --- /dev/null +++ b/static/favicon/safari-pinned-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/favicon/site.webmanifest b/static/favicon/site.webmanifest new file mode 100644 index 00000000..78fcc75f --- /dev/null +++ b/static/favicon/site.webmanifest @@ -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" +} diff --git a/templates/base.html b/templates/base.html index abfbfb27..5979506b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,60 +1,80 @@ -{% load static %} +{% load static i18n static %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} - + - - - -{% block title %}NoteKfet2020{% endblock title %} - - - + + + + + {% block title %}{{ title }}{% endblock title %} - {{ request.site.name }} + + -{% block css %} - - - - -{% endblock %} + {# Favicon #} + + + + + + + + + + + {# Bootstrap CSS #} + + + {% block extracss %}{% endblock %} - -
- +
+
+
+ {% block sidebar %} + {% endblock %}
- -
-
-
- -
-
- {% block content %} +
+ {% block contenttitle %}

{{ title }}

{% endblock %} + {% block content %}

Default content...

- {% endblock content %} - -
+ {% endblock content %}
-
- +{# Bootstrap JavaScript #} + + + +{% block extrajavascript %} +{% endblock extrajavascript %}