From 49f52fd41d88281ad5033dd8b8c75fff55239ad8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 13 Feb 2021 18:50:28 +0100 Subject: [PATCH] [bootstrap] update to bootstrap5 --- requirements.txt | 2 +- uncloud/settings.py | 2 +- uncloud/templates/uncloud/base.html | 72 ++---- uncloud/templates/uncloud/index.html | 235 ++++++++++-------- .../uncloud_pay/register_stripe.html | 34 +-- 5 files changed, 176 insertions(+), 169 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2a84047..0c153a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ django djangorestframework django-auth-ldap -django-bootstrap4 +django-bootstrap-v5 psycopg2 ldap3 diff --git a/uncloud/settings.py b/uncloud/settings.py index 2ac6d69..a103ca0 100644 --- a/uncloud/settings.py +++ b/uncloud/settings.py @@ -51,7 +51,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django_extensions', 'rest_framework', - 'bootstrap4', + 'bootstrap5', 'uncloud', 'uncloud_pay', 'uncloud_auth', diff --git a/uncloud/templates/uncloud/base.html b/uncloud/templates/uncloud/base.html index 44b5008..8c5c867 100644 --- a/uncloud/templates/uncloud/base.html +++ b/uncloud/templates/uncloud/base.html @@ -1,51 +1,27 @@ -{% extends 'bootstrap4/bootstrap4.html' %} +{% extends 'bootstrap5/bootstrap5.html' %} +{% block bootstrap5_before_content %} -{% load bootstrap4 %} + {% endblock %} - - diff --git a/uncloud/templates/uncloud/index.html b/uncloud/templates/uncloud/index.html index 97fda34..19fc436 100644 --- a/uncloud/templates/uncloud/index.html +++ b/uncloud/templates/uncloud/index.html @@ -1,119 +1,148 @@ {% extends 'uncloud/base.html' %} -{% block title %}{% endblock %} +{% block title %}Welcome to uncloud [beta]{% endblock %} -{% block body %} -
- -
-
-

Welcome to uncloud

+{% block bootstrap5_content %} +
+
+
+
+

Welcome to uncloud [beta]

+
-
-
-

About uncloud

-
-

- Welcome to uncloud, the Open Source cloud management - system by ungleich. - It is an API driven system with - some convience views provided by - the Django Rest - Framework. You can - freely access - the source code of uncloud. -

+ +
+

About uncloud

+
+

+ Welcome to uncloud, the Open Source cloud management + system by ungleich. + It is an API driven system with + some convience views provided by + the Django Rest + Framework. You can + freely access + the source code of uncloud. + This is a BETA service. As such, some + functionality might not be very sophisticated. +

+
-
-
-

Getting started

-
-

uncloud is designed to be as easy as possible to use. However, - there are some "real world" requirements that need to be met to - start using uncloud: +

+

Getting started

+
+

uncloud is designed to be as easy as possible to use. However, + there are some "real world" requirements that need to be met to + start using uncloud: -

    -
  • First you need - to register an - account. If you already have one, you can - login. -
  • If you have forgotten your password or other issues with - logging in, you can contact the ungleich support - via support at ungleich.ch. +
      +
    • First you need + to register an + account. If you already have one, you can + login. +
    • If you have forgotten your password or other issues with + logging in, you can contact the ungleich support + via support at ungleich.ch. -
    • Secondy you will need to - create a billing - address. This is required for determining the correct - tax. -
    • Next you will need to - register a credit card - from which payments can be made. Your credit card will not - be charged without your consent. -
    +
  • Secondy you will need to + create a billing + address. This is required for determining the correct + tax. +
  • Next you will need to + register a credit card + from which payments can be made. Your credit card will not + be charged without your consent. +
+
-
- -
-

Credit cards

-
-

- Credit cards are registered with stripe. We only save a the - last 4 digits and the expiry date of the card to make - identification for you easier. -

-
    -
  • Register a credit card - (this is required to be done via Javascript so that we never see - your credit card, but it is sent directly to stripe) -
  • You can list your - credit cards - By default the first credit card is used for charging - ("active: true") and later added cards will not be - used. To change this, first disable the active flag and - then set it on another credit card. +
    +

    Introduction to uncloud concepts

    +
    +

    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 pre-paid account model. Which means + that you can charge your account and then use your balance to + pay for product usage.

    +
    -
-
-

Billing Address, Payments and Balance

-
-

Billing addresses behave similar to credit cards: you can - have many of them, but only one can be active. The active - billing address is taken for creating new orders.

-

In uncloud we use the pre-paid model: you can add money to - your account via payments. You can always check your - balance. The products you use will automatically be charged from - your existing balance. -

- -

In the future you will be able opt-in to automatically - recharging your account at a certain time frame or whenever it - is below a certain amount

- - - +
+

Credit cards

+
+

+ Credit cards are registered with stripe. We only save a the + last 4 digits and the expiry date of the card to make + identification for you easier. +

+
    +
  • Register a credit card + (this is required to be done via Javascript so that we never see + your credit card, but it is sent directly to stripe) +
  • You can list your + credit cards + By default the first credit card is used for charging + ("active: true") and later added cards will not be + used. To change this, first disable the active flag and + then set it on another credit card. +
-
+
+

Billing Address, Payments and Balance

+
+

Billing addresses behave similar to credit cards: you can + have many of them, but only one can be active. The active + billing address is taken for creating new orders.

-
-

Networking

-
-

- With uncloud you can use a variety of network related - services. -

+

In uncloud we use the pre-paid model: you can add money to + your account via payments. You can always check your + balance. The products you use will automatically be charged from + your existing balance. +

- +

In the future you will be able opt-in to automatically + recharging your account at a certain time frame or whenever it + is below a certain amount

+ + + +
+ +
+

Networking

+
+

+ With uncloud you can use a variety of network related + services. +

+ + +
+
+ +
+

Current limitations

+
+
    +
  • Payments are only possible in CHF. +
  • Bills are not yet visible (payments are, though) +
+
+
+
{% endblock %} diff --git a/uncloud_pay/templates/uncloud_pay/register_stripe.html b/uncloud_pay/templates/uncloud_pay/register_stripe.html index 7bb0110..7205261 100644 --- a/uncloud_pay/templates/uncloud_pay/register_stripe.html +++ b/uncloud_pay/templates/uncloud_pay/register_stripe.html @@ -1,28 +1,30 @@ {% extends 'uncloud/base.html' %} -{% block header %} +{% block bootstrap5_extra_head %} {% endblock %} -{% block body %} -
-

Register Credit Card with Stripe

-

- By submitting I authorise to send instructions to - the financial institution that issued my card to take - payments from my card account in accordance with the +{% block bootstrap5_content %} +

+ +
+

Register Credit Card with Stripe

+

+ By submitting I authorise to send instructions to + the financial institution that issued my card to take + payments from my card account in accordance with the terms of my agreement with you. -

+

- -
- -
The card will be registered with stripe.
+ +
+ +
The card will be registered with stripe.
- -