1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00

Bootstrap5 (#17)

* Bootstrap5 migration
This commit is contained in:
catborise 2021-07-07 14:12:38 +03:00 committed by GitHub
parent 1663a49cee
commit 073b7b6717
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
244 changed files with 9494 additions and 8597 deletions

View file

@ -1,5 +1,5 @@
{% load static %}
{% load bootstrap4 %}
{% load django_bootstrap5 %}
<!DOCTYPE html>
<html lang="en">
<head>
@ -41,11 +41,11 @@
<div role="main" class="container">
<div class"row">
<div>
<div class="float-right">
<div class="float-end">
{% block page_heading_extra %}
{% endblock page_heading_extra %}
</div>
<h3 class="ml-0 page-header">
<h3 class="ms-0 page-header">
{% block page_heading %}
{% endblock page_heading %}
</h3>
@ -59,11 +59,11 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- jQuery -->
<script src="{% static "js/jquery.js" %}"></script>
<script src="{% static 'js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{% static "js/bootstrap.bundle.min.js" %}"></script>
<script src="{% static 'js/bootstrap.bundle.min.js' %}"></script>
<!-- JavaScript Cookie -->
<script src="{% static "js/js.cookie.js" %}"></script>
<script src="{% static 'js/js.cookie.js' %}"></script>
{% block script %}{% endblock %}
</body>
</html>

View file

@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load bootstrap4 %}
{% load django_bootstrap5 %}
{% load icons %}
{% load i18n %}
@ -15,7 +15,7 @@
<div class="alert alert-warning">
{%trans "Are you sure you want to delete" %} "{{ object }}"?
</div>
<div class="form-group mb-0 float-right">
<div class="mb-0 float-end">
<a class="btn btn-primary" href="javascript:history.back()">{% icon 'times' %} {% trans "Cancel" %}</a>
<button type="submit" class="btn btn-danger">
{% icon 'trash' %} {% trans "Delete" %}

View file

@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load bootstrap4 %}
{% load django_bootstrap5 %}
{% load icons %}
{% load i18n %}
@ -16,7 +16,7 @@
</form>
</div>
<div class="card-footer">
<div class="form-group mb-0 float-right">
<div class="mb-0 float-end">
<a class="btn btn-primary" href="javascript:history.back()">{% icon 'times' %} {% trans "Cancel" %}</a>
<button type="submit" form="create-update" class="btn btn-success">
{% icon 'check' %} {% trans "Save" %}

View file

@ -5,11 +5,11 @@
<nav class="navbar navbar-expand-md navbar-dark bg-primary mb-3" aria-label="Main top navbar">
<div class="container">
<a class="navbar-brand" href="{% url 'index' %}">WebVirtCloud</a>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-label="Toggle navigation">
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div id="navbar" class="navbar-collapse collapse">
<ul class="navbar-nav mr-auto mt-2 mt-md-0">
<div class="collapse navbar-collapse" id="navbar">
<ul class="navbar-nav">
<li class="nav-item {% class_active request '^/instances' %}">
<a class="nav-link" href="{% url 'instances:index' %}"><i class="fa fa-fw fa-desktop"></i> {% trans "Instances" %}</a>
</li>
@ -19,10 +19,10 @@
</li>
{% endif %}
</ul>
<ul class="navbar-nav navbar-right mt-2 mt-md-0">
<ul class="navbar-nav ms-auto">
{% if request.user.is_superuser %}
<li class="nav-item dropdown {% app_active request 'admin' %}">
<a class="nav-link" id="administration" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link" id="administration" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% icon 'wrench' %}
</a>
<div class="dropdown-menu" aria-labelledby="administration">
@ -34,13 +34,13 @@
</li>
{% endif %}
<li class="nav-item dropdown {% class_active request '^/accounts' %}">
<a class="nav-link dropdown-toggle" href="#" id="navbarUserDropdown" data-toggle="dropdown" role="button" aria-expanded="false">
<a class="nav-link dropdown-toggle" href="#" id="navbarUserDropdown" data-bs-toggle="dropdown" role="button" aria-expanded="false">
<i class="fa fa-fw fa-user"></i> {{ request.user.username }}
</a>
<div class="dropdown-menu" aria-labelledby="navbarUserDropdown">
{% get_current_language as LANGUAGE_CODE %}
<a class="dropdown-item disabled" href="#">
{% trans "Language" %}: <span class="badge badge-secondary">{{ LANGUAGE_CODE }}</span>
{% trans "Language" %}: <span class="badge bg-secondary">{{ LANGUAGE_CODE }}</span>
</a>
<a class="dropdown-item {% view_active request 'accounts:profile' %}" href="{% url 'accounts:profile' %}">{% icon 'vcard' %} {% trans "Profile" %}</a>
<div class="dropdown-divider"></div>

View file

@ -1,4 +1,4 @@
{% load i18n %}
<div class="float-right search">
<div class="float-end search">
<input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
</div>