mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Odstranění starých dependencí a okomentování většiny stávajících #42

Merged
zelvuska merged 13 commits from odstraneni_starych_dependenci into master 2023-12-18 23:08:57 +01:00
Conversation 2 Commits 13 Files changed 9 +2 -13
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 46fd51e7d9 - Show all commits

2
mamweb/settings_common.py
View file

@ -87,7 +87,6 @@ TEMPLATES = [
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request', 'django.template.context_processors.request',
'django.contrib.messages.context_processors.messages', 'django.contrib.messages.context_processors.messages',
'sekizai.context_processors.sekizai',
'header_fotky.context_processors.vzhled', 'header_fotky.context_processors.vzhled',
'various.context_processors.rozliseni', 'various.context_processors.rozliseni',
'various.context_processors.april', 'various.context_processors.april',
@ -110,7 +109,6 @@ INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',
# Utilities # Utilities
'sekizai',
'reversion', 'reversion',
'django_countries', 'django_countries',
'solo', 'solo',

5
mamweb/templates/base.html
View file

@ -1,4 +1,4 @@
{% load static sekizai_tags %} {% load static %}
{% load sitetree %} {% load sitetree %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang='cs'> <html lang='cs'>
@ -7,7 +7,6 @@
<title>{% block title %}{% block nadpis1a %}🦊{% endblock %} | Korespondenční seminář M&amp;M{% endblock title %}</title> <title>{% block title %}{% block nadpis1a %}🦊{% endblock %} | Korespondenční seminář M&amp;M{% endblock title %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{% static 'images/MATFYZ_MM_barevne.svg' %}" type="image/x-icon"> <link rel="shortcut icon" href="{% static 'images/MATFYZ_MM_barevne.svg' %}" type="image/x-icon">
{# {% render_block css %}#}
{% block custom_css %}{% endblock %} {% block custom_css %}{% endblock %}
<link href="{% static 'css/bootstrap-theme.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap-theme.css' %}" rel="stylesheet">
<link href="{% static 'css/bootstrap.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.css' %}" rel="stylesheet">
@ -189,6 +188,6 @@
walkText(document.body); walkText(document.body);
</script> </script>
{% endif %} {% endif %}
{% render_block "js" %} {% block js %}{% endblock %}
</body> </body>
</html> </html>

1
requirements.txt
View file

@ -12,7 +12,6 @@ pilkit>=3.0 # Kvůli kompatibilitě s Pillow>=10.0.0
Django<5.0 Django<5.0
#django-bootstrap-sass #django-bootstrap-sass
django-reversion # Version control na datech v databázi django-reversion # Version control na datech v databázi
django-sekizai # Vylepšení bloků v templatech
django-countries # Políčko ve formu / field v modelu ohledně států django-countries # Políčko ve formu / field v modelu ohledně států
django-solo # Singleton model (speciálně Nastavení) django-solo # Singleton model (speciálně Nastavení)
django-ckeditor # Editor htmlka (hlavně v adminu u flatpages) django-ckeditor # Editor htmlka (hlavně v adminu u flatpages)

7
treenode/templates/treenode/orphanage.html
View file

@ -1,12 +1,5 @@
{% extends "seminar/archiv/base.html" %} {% extends "seminar/archiv/base.html" %}
{% load static %} {% load static %}
{% load sekizai_tags %}
{# toto z nejakeho duvodu nefunguje #}
{% addtoblock css %}
dfsdfs
<link rel="stylesheet" type="text/css" href="{% static 'css/mamweb-dev.css' %}" />
{% endaddtoblock "css" %}
{% block custom_css %} {% block custom_css %}
<link rel="stylesheet" type="text/css" href="{% static 'css/mamweb-dev.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/mamweb-dev.css' %}" />