Коммит ea48e31d создал по автору Кабанин Денис Андреевич's avatar Кабанин Денис Андреевич
Просмотр файлов

небольшие изменения в дизайне

владелец d2c5e4d0
Скрыть пробелы
Построчно Рядом
portal/static/css/global/index.css
Просмотр файла @ ea48e31d
...@@ -35,5 +35,6 @@ ul { ...@@ -35,5 +35,6 @@ ul {
} }
.main { .main {
min-height: calc(100vh - 75px);
margin-bottom: 100px; margin-bottom: 100px;
} }
portal/static/css/projects/project_page.css
Просмотр файла @ ea48e31d
.main { .main {
padding-top: 50px;
width: 100%; width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.main > div:first-child {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: center; justify-content: center;
flex-wrap: wrap;
gap: 30px;
} }
.people { .people {
padding: 15px 10px; padding: 15px 10px;
margin-right: 30px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
max-width: 350px; max-width: 350px;
...@@ -46,7 +52,6 @@ ...@@ -46,7 +52,6 @@
position: relative; position: relative;
padding: 15px 30px; padding: 15px 30px;
padding-top: 15px; padding-top: 15px;
width: 80%;
max-width: 700px; max-width: 700px;
background: #fff; background: #fff;
border-radius: 15px; border-radius: 15px;
......
portal/templates/projects/index.html
Просмотр файла @ ea48e31d
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
</div> </div>
{% else %} {% else %}
{% for project in projects %} {% for project in projects %}
<div class="flex" id="flex{{ project.id }}"> <!-- id проекта --> <div class="flex" id="flex{{ project.project.id }}"> <!-- id проекта -->
<p class="cap">{{ project.name }}</p> <!-- Название проекта --> <p class="cap">{{ project.project.name }}</p> <!-- Название проекта -->
<button class="btn btn-projects"></button> <!-- кнопка --> <!--Нужно сделать ссылку по типу projects/index/id_проекта--> <button class="btn btn-projects"><a href="./?id={{ project.project.id }}">ссылка на проект</a></button> <!-- кнопка --> <!--Нужно сделать ссылку по типу projects/index/id_проекта-->
<p class="text">{{ project.description }}</p> <!-- Описание проекта --> <p class="text">{{ project.project.description }}</p> <!-- Описание проекта -->
<div class="files"> <div class="files">
{% for file in project.files %} <!-- цикл для отрисовки файлов --> {% for file in project.files %} <!-- цикл для отрисовки файлов -->
<div class="file"> <div class="file">
......
portal/templates/projects/project_page.html
Просмотр файла @ ea48e31d
...@@ -17,126 +17,130 @@ ...@@ -17,126 +17,130 @@
{% endblock head %} {% endblock head %}
{% block content %} {% block content %}
<div class="people"> <div>
<div class="people-div teacher"> <div class="people">
<img src="{{ project.avaurl_of_teacher }}" alt="Фото учителя" class="people-img"> <div class="people-div teacher">
<div class="people-info"> <img src="{{ project.avaurl_of_teacher }}" alt="Фото учителя" class="people-img">
<h2 class="people-fio">{{project.teacher}}</h2> <div class="people-info">
<span class="people-span">Руководитель проекта</span> <h2 class="people-fio">{{project.teacher}}</h2>
<span class="people-span">Руководитель проекта</span>
</div>
</div> </div>
</div> <div class="people-div student">
<div class="people-div student"> <img src="{{ project.avaurl_of_student }}" alt="Фото учителя" class="people-img">
<img src="{{ project.avaurl_of_student }}" alt="Фото учителя" class="people-img"> <div class="people-info">
<div class="people-info"> <h2 class="people-fio">{{project.student}}</h2>
<h2 class="people-fio">{{project.student}}</h2> <span class="people-span">Исполнитель проекта</span>
<span class="people-span">Исполнитель проекта</span> </div>
</div>
<div class="status">
<span class="status-span">
{% if project.status == 'send request' %}
<span class="send-request">Заявка на рассмотрении руководителем</span>
{% elif project.status == 'on work' %}
<span class="on-work">Проект в процессе выполнения</span>
{% endif %}
</span>
</div> </div>
</div> </div>
<div class="status"> <div class="content">
<span class="status-span"> <div class="name">
{% if project.status == 'send request' %} <form method="POST" action="{% url 'correct_project' %}" id="form_name" class="name-form">
<span class="send-request">Заявка на рассмотрении руководителем</span> {% csrf_token %}
{% elif project.status == 'on work' %} <input type="hidden" name="project" value="{{project.project_id}}" />
<span class="on-work">Проект в процессе выполнения</span> <textarea id="name" name="name" class="textarea name-textarea" onkeyup="textarea_size(this)"
disabled>{{project.name}}</textarea>
</form>
{% if user.role == 'Ученик' %}
<button onclick="return edit(this, 'name')" class="edit-btn">
</button>
{% endif %} {% endif %}
</span> </div>
</div>
</div> <div class="descr">
<div class="content"> <form method="POST" action="{% url 'correct_project' %}" id="form_description" class="descr-form">
<div class="name"> {% csrf_token %}
<form method="POST" action="{% url 'correct_project' %}" id="form_name" class="name-form"> <input type="hidden" name="project" value="{{project.project_id}}">
{% csrf_token %} <textarea id="description" name="description" class="textarea descr-textarea"
<input type="hidden" name="project" value="{{project.project_id}}" /> onkeyup="textarea_size(this)" disabled>{{project.description}}</textarea>
<textarea id="name" name="name" class="textarea name-textarea" onkeyup="textarea_size(this)" </form>
disabled>{{project.name}}</textarea> {% if user.role == 'Ученик' %}
</form> <button onclick="return edit(this, 'description')" class="edit-btn"></button>
{% if user.role == 'Ученик' %} {% endif %}
<button onclick="return edit(this, 'name')" class="edit-btn"> </div>
</button>
{% endif %}
</div>
<div class="descr"> <div class="files">
<form method="POST" action="{% url 'correct_project' %}" id="form_description" class="descr-form"> <form method="POST" action="{% url 'add_file' %}" enctype="multipart/form-data" id="add-file">
{% csrf_token %}
<input type="hidden" name="file_id" value="-1" />
<input type="hidden" name="project_id" value="{{project.project_id}}" />
<label for="add_file" class="file-label">Добавить файл</label>
{% if user.role == 'Ученик' %}
<a href="{% url 'trash' %}?project_id={{project.project_id}}">Корзина</a>
{% endif %}
<input type="file" id="add_file" onchange="check_file_name(this)" class="file-input" name="file" />
</form>
<ul class="file-list">
{% for files_pack in files_packs %}
<li class="file-item">
<a href="{% url 'download_file' %}?file_id={{files_pack.file.id}}"
title="Загрузить файл">{{files_pack.name}}</a>
<div class="btns">
<button onclick="show_window('comments{{files_pack.file.id}}')" title="Посмотреть комментарии">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M6.79895 17.8034C6.35668 18.1298 5.73 18.0406 5.39921 17.6042C5.26989 17.4335 5.2 17.2262 5.2 17.0133L5.19937 14.8423H4.6C3.16406 14.8423 2 13.6935 2 12.2764V5.56582C2 4.14876 3.16406 3 4.6 3H15.4C16.8359 3 18 4.14876 18 5.56582V12.2764C18 13.6935 16.8359 14.8423 15.4 14.8423H10.81L6.79895 17.8034Z"
fill=" #5A88FF" />
</svg>
</button>
<button class="btn-old-files" onclick="show_window('old-files{{files_pack.file.id}}')"
title="Посмотреть предыдущие версии файла">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M4.31 9.49981L7.27297 12.4628C7.56586 12.7557 7.56586 13.2305 7.27297 13.5234C7.0067 13.7897 6.59004 13.8139 6.29643 13.596L6.21231 13.5234L1.96967 9.28078C1.7034 9.01452 1.6792 8.59785 1.89705 8.30424L1.96967 8.22012L6.21231 3.97748C6.5052 3.68459 6.98008 3.68459 7.27297 3.97748C7.53924 4.24375 7.56344 4.66041 7.34559 4.95402L7.27297 5.03814L4.31 7.99981L10 8.00045C14.1979 8.00045 17.6162 11.3381 17.7462 15.5044L17.75 15.7505C17.75 16.1647 17.4142 16.5005 17 16.5005C16.5858 16.5005 16.25 16.1647 16.25 15.7505C16.25 12.3754 13.5748 9.62514 10.2291 9.50458L10 9.50045L4.31 9.49981L7.27297 12.4628L4.31 9.49981Z"
fill="#88cc5a" />
</svg>
</button>
{% if user.role == 'Ученик' %}
<label for="delete_file{{files_pack.file.id}}" class="btns-label" title="Удалить файл">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20"
xmlns="http://www.w3.org/2000/svg">
<path
d="M3.89705 4.05379L3.96967 3.96967C4.23594 3.7034 4.6526 3.6792 4.94621 3.89705L5.03033 3.96967L10 8.939L14.9697 3.96967C15.2359 3.7034 15.6526 3.6792 15.9462 3.89705L16.0303 3.96967C16.2966 4.23594 16.3208 4.6526 16.1029 4.94621L16.0303 5.03033L11.061 10L16.0303 14.9697C16.2966 15.2359 16.3208 15.6526 16.1029 15.9462L16.0303 16.0303C15.7641 16.2966 15.3474 16.3208 15.0538 16.1029L14.9697 16.0303L10 11.061L5.03033 16.0303C4.76406 16.2966 4.3474 16.3208 4.05379 16.1029L3.96967 16.0303C3.7034 15.7641 3.6792 15.3474 3.89705 15.0538L3.96967 14.9697L8.939 10L3.96967 5.03033C3.7034 4.76406 3.6792 4.3474 3.89705 4.05379L3.96967 3.96967L3.89705 4.05379Z"
fill="#e24a4a" />
</svg>
</label>
{% endif %}
</div>
<form method="POST" action="{% url 'delete_file' %}" class="del-form">
{% csrf_token %}
<input type="hidden" name="file_id" value="{{files_pack.file.id}}" />
<input type="submit" id="delete_file{{files_pack.file.id}}" name="file"
style="display:none; visibility:hidden" />
</form>
</li>
{% endfor %}
</ul>
</div>
{% if project.status == 'send request' and user.role == 'Учитель'%}
<form method="POST" action="{% url 'approve_project' %}" class="form-btn">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="project" value="{{project.project_id}}"> <input type="hidden" name="project_id" value="{{project.project_id}}">
<textarea id="description" name="description" class="textarea descr-textarea" onkeyup="textarea_size(this)" <input type="submit" id="approve_project" class="status-input" value="Одобрить проект">
disabled>{{project.description}}</textarea>
</form> </form>
{% if user.role == 'Ученик' %} {% elif project.status == 'on work' and user.role == 'Учитель' %}
<button onclick="return edit(this, 'description')" class="edit-btn"></button> <form method="POST" action="{% url 'close_project' %}" class="form-btn">
{% endif %}
</div>
<div class="files">
<form method="POST" action="{% url 'add_file' %}" enctype="multipart/form-data" id="add-file">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="file_id" value="-1" /> <input type="hidden" name="project_id" value="{{project.project_id}}">
<input type="hidden" name="project_id" value="{{project.project_id}}" /> <input type="submit" id="close_project " class="status-input" value="Завршить проект">
<label for="add_file" class="file-label">Добавить файл</label>
{% if user.role == 'Ученик' %}
<a href="{% url 'trash' %}?project_id={{project.project_id}}">Корзина</a>
{% endif %}
<input type="file" id="add_file" onchange="check_file_name(this)" class="file-input" name="file" />
</form> </form>
<ul class="file-list"> {% endif %}
{% for files_pack in files_packs %}
<li class="file-item">
<a href="{% url 'download_file' %}?file_id={{files_pack.file.id}}"
title="Загрузить файл">{{files_pack.name}}</a>
<div class="btns">
<button onclick="show_window('comments{{files_pack.file.id}}')" title="Посмотреть комментарии">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
<path
d="M6.79895 17.8034C6.35668 18.1298 5.73 18.0406 5.39921 17.6042C5.26989 17.4335 5.2 17.2262 5.2 17.0133L5.19937 14.8423H4.6C3.16406 14.8423 2 13.6935 2 12.2764V5.56582C2 4.14876 3.16406 3 4.6 3H15.4C16.8359 3 18 4.14876 18 5.56582V12.2764C18 13.6935 16.8359 14.8423 15.4 14.8423H10.81L6.79895 17.8034Z"
fill=" #5A88FF" />
</svg>
</button>
<button class="btn-old-files" onclick="show_window('old-files{{files_pack.file.id}}')"
title="Посмотреть предыдущие версии файла">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
<path
d="M4.31 9.49981L7.27297 12.4628C7.56586 12.7557 7.56586 13.2305 7.27297 13.5234C7.0067 13.7897 6.59004 13.8139 6.29643 13.596L6.21231 13.5234L1.96967 9.28078C1.7034 9.01452 1.6792 8.59785 1.89705 8.30424L1.96967 8.22012L6.21231 3.97748C6.5052 3.68459 6.98008 3.68459 7.27297 3.97748C7.53924 4.24375 7.56344 4.66041 7.34559 4.95402L7.27297 5.03814L4.31 7.99981L10 8.00045C14.1979 8.00045 17.6162 11.3381 17.7462 15.5044L17.75 15.7505C17.75 16.1647 17.4142 16.5005 17 16.5005C16.5858 16.5005 16.25 16.1647 16.25 15.7505C16.25 12.3754 13.5748 9.62514 10.2291 9.50458L10 9.50045L4.31 9.49981L7.27297 12.4628L4.31 9.49981Z"
fill="#88cc5a" />
</svg>
</button>
{% if user.role == 'Ученик' %}
<label for="delete_file{{files_pack.file.id}}" class="btns-label" title="Удалить файл">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
<path
d="M3.89705 4.05379L3.96967 3.96967C4.23594 3.7034 4.6526 3.6792 4.94621 3.89705L5.03033 3.96967L10 8.939L14.9697 3.96967C15.2359 3.7034 15.6526 3.6792 15.9462 3.89705L16.0303 3.96967C16.2966 4.23594 16.3208 4.6526 16.1029 4.94621L16.0303 5.03033L11.061 10L16.0303 14.9697C16.2966 15.2359 16.3208 15.6526 16.1029 15.9462L16.0303 16.0303C15.7641 16.2966 15.3474 16.3208 15.0538 16.1029L14.9697 16.0303L10 11.061L5.03033 16.0303C4.76406 16.2966 4.3474 16.3208 4.05379 16.1029L3.96967 16.0303C3.7034 15.7641 3.6792 15.3474 3.89705 15.0538L3.96967 14.9697L8.939 10L3.96967 5.03033C3.7034 4.76406 3.6792 4.3474 3.89705 4.05379L3.96967 3.96967L3.89705 4.05379Z"
fill="#e24a4a" />
</svg>
</label>
{% endif %}
</div>
<form method="POST" action="{% url 'delete_file' %}" class="del-form">
{% csrf_token %}
<input type="hidden" name="file_id" value="{{files_pack.file.id}}" />
<input type="submit" id="delete_file{{files_pack.file.id}}" name="file"
style="display:none; visibility:hidden" />
</form>
</li>
{% endfor %}
</ul>
</div> </div>
{% if project.status == 'send request' and user.role == 'Учитель'%}
<form method="POST" action="{% url 'approve_project' %}" class="form-btn">
{% csrf_token %}
<input type="hidden" name="project_id" value="{{project.project_id}}">
<input type="submit" id="approve_project" class="status-input" value="Одобрить проект">
</form>
{% elif project.status == 'on work' and user.role == 'Учитель' %}
<form method="POST" action="{% url 'close_project' %}" class="form-btn">
{% csrf_token %}
<input type="hidden" name="project_id" value="{{project.project_id}}">
<input type="submit" id="close_project " class="status-input" value="Завршить проект">
</form>
{% endif %}
</div> </div>
{% for files_pack in files_packs %} {% for files_pack in files_packs %}
<div> <div>
<div id="comments{{files_pack.file.id}}" class="comment-window"> <div id="comments{{files_pack.file.id}}" class="comment-window">
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать