From fa7cb01c11041864d1122687cd5272aa74a80212 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 5 Jan 2018 15:34:01 +0300 Subject: [PATCH] Done some landing manipulations --- .gitignore | 4 ++-- app/admin.py | 5 +++++ app/settings_db.py | 4 ++-- app/views.py | 1 + manage.py | 0 static/style.css | 2 ++ templates/home.html | 1 + 7 files changed, 13 insertions(+), 4 deletions(-) mode change 100644 => 100755 manage.py diff --git a/.gitignore b/.gitignore index 5be3119..d4e62cc 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,6 @@ docs/_build/ .idea/ db.sqlite3 -migrations/* -!migrations/__init__.py +app/migrations/* +!app/migrations/__init__.py venv/ diff --git a/app/admin.py b/app/admin.py index 8c38f3f..29eb1a0 100644 --- a/app/admin.py +++ b/app/admin.py @@ -1,3 +1,8 @@ from django.contrib import admin +from django.contrib import admin +from app.models import Setting # Register your models here. + + +admin.site.register(Setting) diff --git a/app/settings_db.py b/app/settings_db.py index c10c0d1..dd5574b 100644 --- a/app/settings_db.py +++ b/app/settings_db.py @@ -5,9 +5,9 @@ from django.conf import settings def get_setting(name, language=settings.LANGUAGE_CODE[:2]): try: - return Setting.objects.filter(name=name, language=language)[0].get().string + return Setting.objects.filter(name=name, language=language)[0].string except IndexError: try: - return Setting.objects.filter(name=name)[0].get().string + return Setting.objects.filter(name=name)[0].string except IndexError: return '

Oops, setting {0} with language {1} not found!

'.format(name, language) diff --git a/app/views.py b/app/views.py index f75f3a2..4457278 100644 --- a/app/views.py +++ b/app/views.py @@ -12,4 +12,5 @@ def home(request): 'title': _('Home'), 'app_name': settings.APP_NAME, 'app_description_text': get_setting('app_description_text'), + 'app_mainpage_html': get_setting('app_mainpage_html'), }) diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/static/style.css b/static/style.css index b6145ed..b4fc289 100644 --- a/static/style.css +++ b/static/style.css @@ -4,6 +4,8 @@ body { background-color: black; color: lime; + max-width: 800px; + margin: auto; } ::selection { color: black; diff --git a/templates/home.html b/templates/home.html index a11a08a..95e3ec5 100644 --- a/templates/home.html +++ b/templates/home.html @@ -9,4 +9,5 @@

+ {{ app_mainpage_html|safe }} {% endblock %}