mirror of
https://github.com/Rushilwiz/tj2023.git
synced 2025-04-20 12:00:17 -04:00
unified templates
This commit is contained in:
parent
55beede1b5
commit
7f74007e6f
|
@ -29,8 +29,8 @@ ALLOWED_HOSTS = []
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
'pages',
|
|
||||||
'notes',
|
'notes',
|
||||||
|
'pages',
|
||||||
|
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>TJ 2023 - {% block title %}{% endblock title %}</title>
|
|
||||||
<link rel="stylesheet" href="{% static 'css/base.css' %}">
|
|
||||||
{% block css %}{% endblock css %}
|
|
||||||
{% block js %}{% endblock js %}
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="content">
|
|
||||||
{% block body %}
|
|
||||||
|
|
||||||
{% endblock body %}
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
|
@ -1,8 +1,9 @@
|
||||||
{% extends 'notion/base.html' %}
|
{% extends 'pages/base.html' %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% block css %}
|
{% block css %}
|
||||||
<link rel="stylesheet" href="{% static 'css/meeting.css' %}">
|
<link rel="stylesheet" href="{% static 'notes/css/meeting.css' %}">
|
||||||
{% endblock css %}
|
{% endblock css %}
|
||||||
{% block body %}
|
|
||||||
|
{% block content %}
|
||||||
{{ html|safe }}
|
{{ html|safe }}
|
||||||
{% endblock body %}
|
{% endblock content %}
|
|
@ -1,13 +1,4 @@
|
||||||
<!DOCTYPE html>
|
{% extends 'pages/base.html' %}
|
||||||
<html lang="en">
|
{% block content %}
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>Test</title>
|
|
||||||
<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="notes">
|
|
||||||
{{html|safe}}
|
{{html|safe}}
|
||||||
</div>
|
{% endblock content %}
|
||||||
</body>
|
|
||||||
</html>
|
|
|
@ -12,7 +12,7 @@
|
||||||
<meta name="description" content="Official 2023CC Website">
|
<meta name="description" content="Official 2023CC Website">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
|
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
|
||||||
<link rel='stylesheet' href="{% static 'pages/css/styles.css' %}">
|
{% block css %}{% endblock css %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<!--[if lt IE 7]>
|
<!--[if lt IE 7]>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user