diff --git a/README.md b/README.md index 58fe9cb9e..18cc68fb0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MultiUserOpenRefine -![MultiUserOpenRefine](logo.svg) +![MultiUserOpenRefine](Serwer_django/static/images/logo.svg) MultiUserOpenRefine is an extension to open-source tool that, in addition to all the features described below, allows creating user accounts, each providing diff --git a/Serwer_django/Serwer_django/settings.py b/Serwer_django/Serwer_django/settings.py index 79217d3e5..18c94182a 100644 --- a/Serwer_django/Serwer_django/settings.py +++ b/Serwer_django/Serwer_django/settings.py @@ -37,6 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'crispy_forms' ] MIDDLEWARE = [ @@ -130,3 +131,4 @@ LOGOUT_REDIRECT_URL = 'home' # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +CRISPY_TEMPLATE_PACK = 'bootstrap4' diff --git a/Serwer_django/db.sqlite3 b/Serwer_django/db.sqlite3 index f7c223663..94342f0d9 100644 Binary files a/Serwer_django/db.sqlite3 and b/Serwer_django/db.sqlite3 differ diff --git a/Serwer_django/static/base.css b/Serwer_django/static/base.css deleted file mode 100644 index 682ef2f0e..000000000 --- a/Serwer_django/static/base.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - background-color: #818fb7; -} \ No newline at end of file diff --git a/Serwer_django/static/images/logo.jpg b/Serwer_django/static/images/logo.jpg deleted file mode 100644 index c478da7a3..000000000 Binary files a/Serwer_django/static/images/logo.jpg and /dev/null differ diff --git a/Serwer_django/static/images/logo.png b/Serwer_django/static/images/logo.png new file mode 100644 index 000000000..7920304f7 Binary files /dev/null and b/Serwer_django/static/images/logo.png differ diff --git a/logo.svg b/Serwer_django/static/images/logo.svg similarity index 100% rename from logo.svg rename to Serwer_django/static/images/logo.svg diff --git a/Serwer_django/templates/base.html b/Serwer_django/templates/base.html index 6c6137e50..bb3b175c6 100644 --- a/Serwer_django/templates/base.html +++ b/Serwer_django/templates/base.html @@ -2,17 +2,28 @@ - {% load static %} - - - + - {% block title %}Auth{% endblock %} + {% block title %}MultiUserOpenRefine{% endblock %}
- {% block content %} - {% endblock %} +
+
+
+
+ logo +

MultiUserOpenRefine

+
+ {% block content %} + {% endblock %} +
+
+
+
+
\ No newline at end of file diff --git a/Serwer_django/templates/home.html b/Serwer_django/templates/home.html index 8327f5bcf..6dd9f1a1a 100644 --- a/Serwer_django/templates/home.html +++ b/Serwer_django/templates/home.html @@ -5,11 +5,11 @@ {% block content %} {% if user.is_authenticated %} -Hi {{ user.username }}! -

Log Out

+

Hi {{ user.username }}!

+

Log Out

{% else %}

You are not logged in

-

Log In

-

Sign Up

+

Log In

+

Create an account

{% endif %} {% endblock %} \ No newline at end of file diff --git a/Serwer_django/templates/registration/login.html b/Serwer_django/templates/registration/login.html index ff1ed52eb..ab15b4ba6 100644 --- a/Serwer_django/templates/registration/login.html +++ b/Serwer_django/templates/registration/login.html @@ -8,6 +8,6 @@
{% csrf_token %} {{ form.as_p }} - +
{% endblock %} \ No newline at end of file diff --git a/Serwer_django/templates/registration/signup.html b/Serwer_django/templates/registration/signup.html index 81a73ea3a..de6856aca 100644 --- a/Serwer_django/templates/registration/signup.html +++ b/Serwer_django/templates/registration/signup.html @@ -8,6 +8,6 @@
{% csrf_token %} {{ form.as_p }} - +
{% endblock %} \ No newline at end of file