diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c48ec4..d4363cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,8 +19,9 @@ In most cases the best thing you can do is to create an issue with your contribu If you feel like the issue is easily fixable for you and the consensus of the issue is positive for your idea, go for it! - Fork the repository +- Checkout the dev branch - Commit your changes with an understandable commit message -- Create a pull request from your fork to the main repository (preferably in the dev branch!) +- Create a pull request from your fork to the main repository (from your branch to the `dev` branch) - Profit! ## Which branch should I push to? diff --git a/src/asiimov/settings.py b/src/asiimov/settings.py index 76a7835..f5ec3bc 100644 --- a/src/asiimov/settings.py +++ b/src/asiimov/settings.py @@ -53,7 +53,7 @@ ROOT_URLCONF = 'asiimov.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [os.path.join(BASE_DIR, 'common', 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/src/core/templates/static_pages/about.html b/src/core/templates/static_pages/about.html new file mode 100644 index 0000000..979e3b2 --- /dev/null +++ b/src/core/templates/static_pages/about.html @@ -0,0 +1,5 @@ +{% extends 'master.html' %} + +{% block content %} +TESt +{% endblock %} diff --git a/src/core/templates/static_pages/help.html b/src/core/templates/static_pages/help.html new file mode 100644 index 0000000..e69de29 diff --git a/src/core/templates/static_pages/imprint.html b/src/core/templates/static_pages/imprint.html new file mode 100644 index 0000000..e69de29 diff --git a/src/core/urls.py b/src/core/urls.py index c5852e3..f7f277c 100644 --- a/src/core/urls.py +++ b/src/core/urls.py @@ -15,5 +15,6 @@ urlpatterns = [ path('profile/settings', views.me_settings, name='me_settings'), path('help', views.help, name='help'), - path('imprint', views.imprint, name='imprint') + path('imprint', views.imprint, name='imprint'), + path('about', views.about, name='about') ] diff --git a/src/core/views.py b/src/core/views.py index 6f6b29b..edefb96 100644 --- a/src/core/views.py +++ b/src/core/views.py @@ -3,15 +3,18 @@ from django.shortcuts import render, get_object_or_404, redirect from django.http import HttpResponseForbidden from django.contrib.auth.decorators import login_required + # STATIC PAGES - - def help(request): - return render(request, 'core/help.html') + return render(request, 'static_pages/help.html') def imprint(request): - return render(request, 'core/imprint.html') + return render(request, 'static_pages/imprint.html') + + +def about(request): + return render(request, 'static_pages/about.html') # PUBLIC AREA