Merge branch 'feature/base/html' into 'develop'

A few changes design of menu See merge request 2020-2021/online/s101/group-02/access_controller!5
2021-02-11 17:28:55 +00:00 · 2021-02-11 17:28:55 +00:00 · ef36e8de40
commit ef36e8de40
parent ac99a23a3b 298baa3198
4 changed files with 7 additions and 4 deletions
--- a/access_controller/settings.py
+++ b/access_controller/settings.py
@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/3.1/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
-
+import os
 from pathlib import Path

 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@ -116,8 +116,9 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.1/howto/static-files/

 STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATICFILES_DIRS = [
-    'static'
+    os.path.join(BASE_DIR, 'staticfiles'),
 ]

 MEDIA_ROOT = BASE_DIR / 'media'
--- a/main/templates/base/base.html
+++ b/main/templates/base/base.html
@ -1,6 +1,7 @@
 <!DOCTYPE html>

 <html lang="ru" class="h-100">
+{% load static %}
 <head>
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
--- a/main/templates/base/menu.html
+++ b/main/templates/base/menu.html
@ -1,10 +1,11 @@
+{% load static %}
 <header>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

-  <nav class="navbar navbar-light" style="background-color: #a3f2fd;">
+  <nav class="navbar navbar-light" style="background-color: #00FF00;">
    <a class="navbar-brand" href="#">
-      <img src="media/images/access.png" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
+      <img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
      Access Controller
    </a>
    {% if request.user.is_authenticated %}
--- a/staticfiles/main/img/logo.png
+++ b/staticfiles/main/img/logo.png