From d5fea73ee0cca76f2fab892aa19f1d8d5ced78ce Mon Sep 17 00:00:00 2001 From: anon Date: Thu, 21 Jul 2022 11:05:44 -0300 Subject: [PATCH] 21/07 2 --- articles/templates/articles/article.html | 42 +++++++++++-------- articles/templates/articles/articles.html | 4 +- articles/templates/articles/edit_article.html | 4 +- articles/templates/articles/images.html | 4 +- articles/templates/articles/new_article.html | 4 +- articles/templates/articles/write.html | 4 +- charts/templates/charts/index.html | 12 +++--- charts/templates/charts/maintenance.html | 4 +- charts/templates/charts/reset.html | 4 +- moneropro/settings.py | 6 +-- users/templates/users/base.html | 4 +- users/templates/users/contract.html | 2 +- users/templates/users/error.html | 4 +- users/templates/users/login.html | 4 +- users/templates/users/register.html | 4 +- users/templates/users/users.html | 2 +- 16 files changed, 57 insertions(+), 51 deletions(-) diff --git a/articles/templates/articles/article.html b/articles/templates/articles/article.html index c34dd00..48b5495 100644 --- a/articles/templates/articles/article.html +++ b/articles/templates/articles/article.html @@ -1,25 +1,31 @@ {% extends "users/base.html" %} {% block header %} -{{ article.title }} + {{ article.title }} + + + + + + - + -{% endblock header %} +{% endblock %} {% block content %} {% load static %} @@ -112,4 +118,4 @@ -{% endblock content %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/articles/templates/articles/articles.html b/articles/templates/articles/articles.html index 99d05ed..8bfbab5 100644 --- a/articles/templates/articles/articles.html +++ b/articles/templates/articles/articles.html @@ -95,7 +95,7 @@ } -{% endblock header %} +{% endblock %} {% block content %} {% load static %} @@ -240,7 +240,7 @@ -{% endblock content %} +{% endblock %} diff --git a/articles/templates/articles/edit_article.html b/articles/templates/articles/edit_article.html index dd3ae36..adf5e09 100644 --- a/articles/templates/articles/edit_article.html +++ b/articles/templates/articles/edit_article.html @@ -65,7 +65,7 @@ } -{% endblock header %} +{% endblock %} {% block content %}


@@ -156,7 +156,7 @@


-{% endblock content %} +{% endblock %} diff --git a/articles/templates/articles/images.html b/articles/templates/articles/images.html index d00f1fa..8bc21f5 100644 --- a/articles/templates/articles/images.html +++ b/articles/templates/articles/images.html @@ -3,7 +3,7 @@ Moneroj.net - Choose your image -{% endblock header %} +{% endblock %} {% block content %} @@ -152,7 +152,7 @@ -{% endblock content %} +{% endblock %} diff --git a/articles/templates/articles/new_article.html b/articles/templates/articles/new_article.html index cdb110a..cdce861 100644 --- a/articles/templates/articles/new_article.html +++ b/articles/templates/articles/new_article.html @@ -22,7 +22,7 @@ -{% endblock header %} +{% endblock %} {% block content %}


@@ -131,7 +131,7 @@


-{% endblock content %} +{% endblock %} diff --git a/articles/templates/articles/write.html b/articles/templates/articles/write.html index 9ecb71e..94b1d0e 100644 --- a/articles/templates/articles/write.html +++ b/articles/templates/articles/write.html @@ -46,7 +46,7 @@ -{% endblock header %} +{% endblock %} {% block content %} @@ -317,7 +317,7 @@


-{% endblock content %} +{% endblock %} diff --git a/charts/templates/charts/index.html b/charts/templates/charts/index.html index a2348e4..3826164 100644 --- a/charts/templates/charts/index.html +++ b/charts/templates/charts/index.html @@ -69,7 +69,7 @@ } -{% endblock header %} +{% endblock %} {% block content %} @@ -102,12 +102,12 @@

- Raised 1.45 of 46 XMR + Raised 2.05 of 46 XMR

-
+
@@ -140,12 +140,12 @@

- Raised 1.45 of 46 XMR + Raised 2.05 of 46 XMR

-
+
@@ -525,6 +525,6 @@ -{% endblock content %} +{% endblock %} diff --git a/charts/templates/charts/maintenance.html b/charts/templates/charts/maintenance.html index 9c0e6d2..97a8664 100644 --- a/charts/templates/charts/maintenance.html +++ b/charts/templates/charts/maintenance.html @@ -64,7 +64,7 @@ } -{% endblock header %} +{% endblock %} {% block content %} @@ -76,6 +76,6 @@

-{% endblock content %} +{% endblock %} diff --git a/charts/templates/charts/reset.html b/charts/templates/charts/reset.html index ece8544..fd9a40e 100644 --- a/charts/templates/charts/reset.html +++ b/charts/templates/charts/reset.html @@ -64,7 +64,7 @@ } -{% endblock header %} +{% endblock %} {% block content %} @@ -76,6 +76,6 @@

-{% endblock content %} +{% endblock %} diff --git a/moneropro/settings.py b/moneropro/settings.py index 89cc1c1..520af3f 100644 --- a/moneropro/settings.py +++ b/moneropro/settings.py @@ -32,9 +32,9 @@ STATICFILES_DIRS = [ SECRET_KEY = 'dafsdasdfasfa7sdfs9d7das7f9as7df8ad43525fsffdssdg455$$###77saf9df79as79s' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True -#DEBUG = False -#STATIC_ROOT = "/var/www/moneropro/static/" +#DEBUG = True +DEBUG = False +STATIC_ROOT = "/var/www/moneropro/static/" ALLOWED_HOSTS = ['www.moneroj.net', 'localhost', '127.0.0.1', 'moneroj.net', 'ilt7jgmfro76wgrtt6752lvfnhcz6wk5sjqhyvntjixygp3cwpvr4nad.onion'] diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 0eaf6a5..351db32 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -23,6 +23,7 @@ color: #ff4d21; } + {% block header %}{% endblock %} @@ -85,8 +86,7 @@ - {% block header %}{% endblock header %} - {% block content %}{% endblock content %} + {% block content %}{% endblock %}