-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Доработан шаблон #25
Merged
Merged
Доработан шаблон #25
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <a href="#"> | ||
| <button type="button" class="btn btn-info border border-white" role="button" data-bs-toggle="button"> | ||
| {{ name }} | ||
| </button> | ||
| </a> | ||
| {% with request.path as current_url_name %} | ||
| <a href="{{ url_name }}" | ||
| class="nav-link border border-2 border-white hover:bg-[#340061] text-white p-2 mx-1 w-44 text-left | ||
| {% if current_url_name == url_name %}bg-[#340061]{% else %}bg-[#64c2d1]{% endif %}"> | ||
| {{ name }} | ||
| </a> | ||
| {% endwith %} |
58 changes: 39 additions & 19 deletions
58
adaptive_hockey_federation/templates/includes/drawer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,41 @@ | ||
| <div class="offcanvas offcanvas-start" style="background-color: #6f42c1" data-bs-backdrop="static" tabindex="-1" id="staticBackdrop" aria-labelledby="staticBackdropLabel"> | ||
|
|
||
| <div class="offcanvas-body"> | ||
| <ul class="nav-list" style="list-style-type:none"> | ||
| <div class="logo-img p-5"> | ||
| <img src="https://paraicehockey.ru/wp-content/uploads/2022/02/FAH_q.png" width="150" height="150"> | ||
| <div class="offcanvas offcanvas-start" style="background-color: #340061;" data-bs-backdrop="static" tabindex="-1" | ||
| id="staticBackdrop" aria-labelledby="staticBackdropLabel"> | ||
|
|
||
| <div class="offcanvas-body mx-auto"> | ||
| <ul class="nav-list" style="list-style-type:none"> | ||
| <div class="container py-5"> | ||
| <div class="row"> | ||
| <div class="col-4 flex justify-end"> | ||
| <span class="logo-img"> | ||
| <img src="https://paraicehockey.ru/wp-content/uploads/2022/02/FAH_q.png" width="100" height="100"> | ||
| </span> | ||
| </div> | ||
| <div class="col text-white flex justify-start"> | ||
| Мир хокея<br>для особенных<br>детей | ||
| </div> | ||
| </div> | ||
| <li>{% include "includes/button.html" with name="Пользователи" %}</li> | ||
| <li>{% include "includes/button.html" with name="Команды" %}</li> | ||
| <li>{% include "includes/button.html" with name="Соревнования" %}</li> | ||
| <li>{% include "includes/button.html" with name="Аналитика" %}</li> | ||
| <li>{% include "includes/button.html" with name="Выгрузки" %}</li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <li class="nav-item py-2"> | ||
| {% url 'main:users' as url_name %}{% include "includes/button.html" with name="Пользователи" %} | ||
| </li> | ||
| <li class="nav-item py-2"> | ||
| {% url 'main:teams' as url_name %}{% include "includes/button.html" with name="Команды" %} | ||
| </li> | ||
| <li class="nav-item py-2"> | ||
| {% url 'main:competitions' as url_name %}{% include "includes/button.html" with name="Соревнования" %} | ||
| </li> | ||
| <li class="nav-item py-2"> | ||
| {% url 'main:analytics' as url_name %}{% include "includes/button.html" with name="Аналитика" %} | ||
| </li> | ||
| <li class="nav-item py-2"> | ||
| {% url 'main:unloads' as url_name %}{% include "includes/button.html" with name="Выгрузки" %} | ||
| </li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div class="offcanvas-footer p-5"> | ||
| <button type="button" class="btn" data-bs-dismiss="offcanvas" aria-label="Close"> | ||
| <i class="bi bi-caret-left-fill"></i> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <div class="offcanvas-footer pb-5"> | ||
| <button type="button" class="btn ps-16" data-bs-dismiss="offcanvas" aria-label="Close"> | ||
| <i class="bi bi-caret-left-fill fs-3" style="color: white;"></i> | ||
| </button> | ||
| </div> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 21 additions & 16 deletions
37
adaptive_hockey_federation/templates/includes/footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 15 additions & 13 deletions
28
adaptive_hockey_federation/templates/includes/header.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Лучше наверное оставить одну кнопку т.к. вторая по сути бессмысленная (закрыть сайдбар можно только из сайдбара, а открыть только из футера)