diff options
| author | Étienne Loks <etienne@peacefrogs.net> | 2019-07-17 16:39:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne@peacefrogs.net> | 2019-07-17 16:39:01 +0200 |
| commit | 08ced77fb1fcb29c41c1e7075f57453addd867db (patch) | |
| tree | fa4c8bf4e256a2ff0611d9290dc4edfa01fe09a5 /ishtar_public | |
| parent | 7ece2d6d0532b29b6c939ff97e6f1e55c94a028f (diff) | |
| download | ishtar-pergamon-08ced77fb1fcb29c41c1e7075f57453addd867db.tar.bz2 ishtar-pergamon-08ced77fb1fcb29c41c1e7075f57453addd867db.zip | |
Manage frontpage (jumbotron, logo, brand name, etc.)
Diffstat (limited to 'ishtar_public')
| -rw-r--r-- | ishtar_public/settings/dev.py | 6 | ||||
| -rw-r--r-- | ishtar_public/settings/local.py.sample | 1 | ||||
| -rw-r--r-- | ishtar_public/settings/production.py | 5 | ||||
| -rw-r--r-- | ishtar_public/static/js/ishtar_public.js | 3 | ||||
| -rw-r--r-- | ishtar_public/templates/404.html.py | 9 | ||||
| -rw-r--r-- | ishtar_public/templates/500.html.py | 13 | ||||
| -rw-r--r-- | ishtar_public/templates/base.html | 55 |
7 files changed, 66 insertions, 26 deletions
diff --git a/ishtar_public/settings/dev.py b/ishtar_public/settings/dev.py index b7705b8..48a4862 100644 --- a/ishtar_public/settings/dev.py +++ b/ishtar_public/settings/dev.py @@ -11,8 +11,14 @@ ALLOWED_HOSTS = ['*'] EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EXTRA_APP = "" try: from .local import * except ImportError: pass + +if EXTRA_APP: + STATICFILES_DIRS += [ + os.path.join(BASE_DIR, EXTRA_APP, 'static'), + ] diff --git a/ishtar_public/settings/local.py.sample b/ishtar_public/settings/local.py.sample index e69de29..512145b 100644 --- a/ishtar_public/settings/local.py.sample +++ b/ishtar_public/settings/local.py.sample @@ -0,0 +1 @@ +EXTRA_APP = "" # add your own extra app diff --git a/ishtar_public/settings/production.py b/ishtar_public/settings/production.py index 9ca4ed7..596ca5c 100644 --- a/ishtar_public/settings/production.py +++ b/ishtar_public/settings/production.py @@ -6,3 +6,8 @@ try: from .local import * except ImportError: pass + +if EXTRA_APP: + STATICFILES_DIRS += [ + os.path.join(BASE_DIR, EXTRA_APP, 'static'), + ] diff --git a/ishtar_public/static/js/ishtar_public.js b/ishtar_public/static/js/ishtar_public.js index e69de29..b7d248d 100644 --- a/ishtar_public/static/js/ishtar_public.js +++ b/ishtar_public/static/js/ishtar_public.js @@ -0,0 +1,3 @@ +$(function () { + objectFitImages(""); +});
\ No newline at end of file diff --git a/ishtar_public/templates/404.html.py b/ishtar_public/templates/404.html.py deleted file mode 100644 index 629a68b..0000000 --- a/ishtar_public/templates/404.html.py +++ /dev/null @@ -1,9 +0,0 @@ -BBBBBBB BBBBBBBBBBB - -BBBBB BBBBBBBBBBXXXXXXXXXXXXBBBBBBBB - -BBBBB BBBBBBB - XXXXXXXX XXX XXXXXXXXXX - - XXXXXXXXXX XXXX XXXX XXXXX XXX XX XXXXXXXXXXX -BBBBBBBB diff --git a/ishtar_public/templates/500.html.py b/ishtar_public/templates/500.html.py deleted file mode 100644 index e5865c6..0000000 --- a/ishtar_public/templates/500.html.py +++ /dev/null @@ -1,13 +0,0 @@ -XXXXXXXXX XXXXX -XXXXX XXXXXXXXXXXXXX - XXXXXX - XXXXX XXXXXXXXXXXXXXX XX - XXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXX - XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XX - XXXXXXX - XXXXXX - XXXXXXXXXXXX XXXXXX XXXXXXXXXX - - XXXXXXXXXX XXXXX XXXXX XX XX XX XXXXXX XXXXXX XXX XXXXX XXXXXXXXXX - XXXXXXX -XXXXXXX diff --git a/ishtar_public/templates/base.html b/ishtar_public/templates/base.html index 169ac72..460a36c 100644 --- a/ishtar_public/templates/base.html +++ b/ishtar_public/templates/base.html @@ -1,6 +1,4 @@ -{% load static wagtailuserbar %} - -<!DOCTYPE html> +{% load static i18n wagtailuserbar wagtailcore_tags wagtailimages_tags %}<!DOCTYPE html> <html class="no-js" lang="en"> <head> <meta charset="utf-8" /> @@ -28,9 +26,58 @@ <body class="{% block body_class %}{% endblock %}"> {% wagtailuserbar %} - {% block content %}{% endblock %} + {% block header %} + <header><nav class="navbar navbar-expand-lg navbar-dark bg-primary{% if page.logo %} navlogo{% endif %}"> + <a class="navbar-brand" href="#"> + {% if page.logo %} + {% image page.logo height-50 %} + {% else %} + {% trans "No organization name" as no_organization_msg %} + {{ page.organization|default:no_organization_msg }} + {% endif%} + </a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + + <div class="collapse navbar-collapse" id="navbarSupportedContent"> + <ul class="navbar-nav mr-auto"> + <li class="nav-item active"> + <a class="nav-link" href="/">{% trans "Home" %} <span class="sr-only">{% trans "(current)" %}</span></a> + </li> + {% for item in menu_items %} + <li class="nav-item"> + <a class="nav-link" href="{% pageurl item %}">{{item.title}}</a> + </li> + {% endfor %} + </ul> + </div> + </nav></header> + {% endblock %} + + {% block precontent %} + {% endblock %} + + <main class="container"> + {% block content %} + {% endblock %} + </main> + + {% block footer %} + <footer class="footer text-light bg-primary"> + <div class="container"> + {% if page.footer %} + {{ page.footer|safe }} + {% else %} + {% trans "No footer is defined."%} + {% endif %} + </div> + </footer> + {% endblock %} {# Global javascript #} + <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script> + <script type="text/javascript" src="{% static 'js/ofi.min.js' %}"></script> <script type="text/javascript" src="{% static 'js/ishtar_public.js' %}"></script> {% block extra_js %} |