[bootstrap] update to bootstrap5
This commit is contained in:
Nico Schottelius
parent
c8ce7dbb40
commit
49f52fd41d
5 changed files with 176 additions and 169 deletions
|
|
@ -2,7 +2,7 @@
|
|||
django
|
||||
djangorestframework
|
||||
django-auth-ldap
|
||||
django-bootstrap4
|
||||
django-bootstrap-v5
|
||||
|
||||
psycopg2
|
||||
ldap3
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ INSTALLED_APPS = [
|
|||
'django.contrib.staticfiles',
|
||||
'django_extensions',
|
||||
'rest_framework',
|
||||
'bootstrap4',
|
||||
'bootstrap5',
|
||||
'uncloud',
|
||||
'uncloud_pay',
|
||||
'uncloud_auth',
|
||||
|
|
|
|||
|
|
@ -1,21 +1,8 @@
|
|||
{% extends 'bootstrap4/bootstrap4.html' %}
|
||||
{% extends 'bootstrap5/bootstrap5.html' %}
|
||||
{% block bootstrap5_before_content %}
|
||||
|
||||
{% load bootstrap4 %}
|
||||
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
{% block bootstrap4_title %}{% block title %}Welcome to uncloud{% endblock %}{% endblock %}
|
||||
|
||||
{% block header %}{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
{% block bootstrap4_content %}
|
||||
<nav class="navbar navbar-expand-lg navbar-light bg-light">
|
||||
<nav class="navbar sticky-top navbar-expand-lg navbar-light bg-light">
|
||||
<div class="container">
|
||||
<a class="navbar-brand" href="{% url 'uncloudindex' %}">uncloud</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
|
|
@ -23,9 +10,6 @@
|
|||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<!-- <li class="nav-item"> -->
|
||||
<!-- <a class="nav-link" href="/random/">Generate random prefix</a> -->
|
||||
<!-- </li> -->
|
||||
{% if user.is_authenticated %}
|
||||
<span class="navbar-text">Logged in as {{ user }}.</span>
|
||||
<li class="nav-item">
|
||||
|
|
@ -38,14 +22,6 @@
|
|||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
|
||||
<div class="container">
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
|
||||
{% autoescape off %}{% bootstrap_messages %}{% endautoescape %}
|
||||
</nav>
|
||||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{% extends 'uncloud/base.html' %}
|
||||
{% block title %}{% endblock %}
|
||||
{% block title %}Welcome to uncloud [beta]{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{% block bootstrap5_content %}
|
||||
<div class="container">
|
||||
<div id="content">
|
||||
|
||||
<div id="intro" class="row">
|
||||
<div class=col>
|
||||
<h1>Welcome to uncloud</h1>
|
||||
<h1>Welcome to uncloud [beta]</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div id="intro" class="row">
|
||||
|
||||
<div id="about" class="row">
|
||||
<div class="col"><h3>About uncloud</h3></div>
|
||||
<div class="col-8">
|
||||
<p>
|
||||
|
|
@ -21,6 +22,8 @@
|
|||
Framework</a>. You can
|
||||
freely <a href="https://code.ungleich.ch/uncloud/uncloud/">access
|
||||
the source code of uncloud</a>.
|
||||
<strong>This is a BETA service.</strong> As such, some
|
||||
functionality might not be very sophisticated.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -51,6 +54,17 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="howto" class="row">
|
||||
<div class="col"><h3>Introduction to uncloud concepts</h3></div>
|
||||
<div class="col-8">
|
||||
<p>We plan to offer many services on uncloud ranging from
|
||||
for free, for a small amount or regular charges. As transfer
|
||||
fees are a major challenge for our business, we based uncloud
|
||||
on the <strong>pre-paid account model</strong>. Which means
|
||||
that you can charge your account and then use your balance to
|
||||
pay for product usage.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="creditcards" class="row">
|
||||
<div class="col"><h3>Credit cards</h3></div>
|
||||
|
|
@ -110,10 +124,25 @@
|
|||
<ul>
|
||||
<li>You can <a href="{% url 'wireguardvpnnetwork-list' %}">list or
|
||||
create VPNs</a> based on wireguard
|
||||
<li>You can also <a href="{% url 'wireguardvpnnetworksizes-list'
|
||||
%}">list which network sizes are available</a>
|
||||
<ul>
|
||||
<li>Checkout
|
||||
<a href="{% url 'wireguardvpnnetworksizes-list' %}">which
|
||||
network sizes are available</a> at the moment.
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="net" class="row">
|
||||
<div class="col"><h3>Current limitations</h3></div>
|
||||
<div class="col-8">
|
||||
<ul>
|
||||
<li>Payments are only possible in CHF.
|
||||
<li>Bills are not yet visible (payments are, though)
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{% extends 'uncloud/base.html' %}
|
||||
|
||||
{% block header %}
|
||||
{% block bootstrap5_extra_head %}
|
||||
<script src="https://js.stripe.com/v3/"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{% block bootstrap5_content %}
|
||||
<div class="container">
|
||||
|
||||
<div id="content">
|
||||
<h1>Register Credit Card with Stripe</h1>
|
||||
<p>
|
||||
|
|
|
|||
Loading…
Reference in a new issue