Manage frontpage (jumbotron, logo, brand name, etc.)

17 files changed, 202 insertions, 175 deletions

diff --git a/.gitignore b/.gitignore
index 6d9ca3f..1bf5b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 *.ignore
 *.ignore.py
 *.ignore.sql
-local_settings.py
+local.py
 fabfile.py
 Makefile
 Dockerfile
@@ -16,7 +16,11 @@ media/*
 *.log
 bootstrap-src
 node_modules/
+#drassm_showcase
 package-lock.json
 .idea
 .code-workspace
 .vscode/*
+scss/custom.scss
+scss/custom_post.scss
+drassm_showcase/
diff --git a/Makefile.example b/Makefile.example
index 2d14495..8932731 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -6,12 +6,13 @@ PYTHON=python3
 help:
 	# Actions available:
 	#	* clean: remove temporary files
-	#	* test: launch tests
-	#	* soft_test: launch tests without db reinitialization
+	#	* compilemessages: compile messages to be translated
+	#	* makemessages: create messages to be translated
 	#	* run: run local test server (port 9000)
+	#	* sass: compile scss file
 	#	* shell: launch a python shell with project context preloaded
-	#	* makemessages: create messages to be translated
-	#	* compilemessages: compile messages to be translated
+	#	* soft_test: launch tests without db reinitialization
+	#	* test: launch tests
 
 clean:
 	-rm -rf *~*
@@ -38,6 +39,9 @@ shell:
 run:
 	$(PYTHON) manage.py runserver 0.0.0.0:9000
 
+sass:
+	./node_modules/node-sass/bin/node-sass scss/ishtar_public.scss --output-style compressed > ishtar_public/static/css/ishtar_public.css
+
 makemessages:
 	$(PYTHON) manage.py makemessages
 
diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py
index e718441..a8d2d0c 100644
--- a/home/migrations/0001_initial.py
+++ b/home/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.3 on 2019-07-16 09:07
+# Generated by Django 2.2.3 on 2019-07-17 14:35
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -20,7 +20,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
                 ('body', wagtail.core.fields.RichTextField(blank=True)),
+                ('organization', models.CharField(blank=True, max_length=200, null=True)),
+                ('jumbotron', wagtail.core.fields.RichTextField(blank=True)),
+                ('footer', wagtail.core.fields.RichTextField(blank=True)),
                 ('image', models.ForeignKey(blank=True, help_text='For top page: full width image. For child page: vignette.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
+                ('logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
             ],
             options={
                 'abstract': False,
diff --git a/home/models.py b/home/models.py
index 64acee0..7eabfba 100644
--- a/home/models.py
+++ b/home/models.py
@@ -1,9 +1,9 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.core.models import Page
 from wagtail.core.fields import RichTextField
-from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.images.edit_handlers import ImageChooserPanel
 
 
@@ -24,7 +24,27 @@ class BasePage(Page):
     class Meta:
         abstract = True
 
+    def get_context(self, request):
+        context = super().get_context(request)
+        context['menu_items'] = self.get_children().filter(
+            show_in_menus=True).live().order_by('pk')
+        return context
+
 
 class HomePage(BasePage):
-    pass
+    organization = models.CharField(max_length=200, blank=True, null=True)
+    logo = models.ForeignKey(
+        'wagtailimages.Image', on_delete=models.SET_NULL, related_name='+',
+        blank=True, null=True
+    )
+    jumbotron = RichTextField(blank=True)
+    footer = RichTextField(blank=True)
+    content_panels = \
+        [BasePage.content_panels[0]] + [
+            FieldPanel('organization'),
+            ImageChooserPanel('logo'),
+            FieldPanel('jumbotron'),
+        ] + BasePage.content_panels[1:] + [
+            FieldPanel('footer'),
+        ]
 
diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html
index d35a0f7..0af8d02 100644
--- a/home/templates/home/home_page.html
+++ b/home/templates/home/home_page.html
@@ -1,37 +1,38 @@
 {% extends "base.html" %}
-{% load i18n static wagtailcore_tags %}
+{% load i18n static wagtailcore_tags wagtailimages_tags %}
 
 {% block body_class %}template-homepage{% endblock %}
 
 {% block extra_css %}
-<link rel="stylesheet" href="{% static 'css/welcome_page.css' %}">
-{% endblock extra_css %}
+
+{% endblock %}
+
+{% block precontent %}
+<div class="jumbotron jumbotron-fluid bg-dark">
+  
+  <div class="jumbotron-background">
+    {% if page.image %}
+    {% image page.image original as jumbo_image %}
+    <img src="{{jumbo_image.url}}">
+    {% endif %}
+  </div>
+  {% if page.jumbotron %}
+  <div class="container text-white">
+    {{page.jumbotron|safe}}
+  </div>
+  {% endif %}
+</div>
+{% endblock %}
 
 {% block content %}
-<header class="header">
-    <div class="logo">
-    </div>
-    <div class="header-link">
-    </div>
-</header>
-<main>
-    {{ page.body|richtext }}
-    <ul>
-    {% for subpage in page.get_children %}
-        <li>
-            <a href="{% pageurl subpage %}">{{subpage.title}}</a>
-            {{ page.body|richtext }}
-        </li>
-    {% endfor %}
-    </ul>
-</main>
 
-<footer class="footer">
-    <a class="option option-three" href="{% url 'wagtailadmin_home' %}">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>
-        <div>
-            <h4>{% trans "Admin Interface" %}</h4>
-        </div>
-    </a>
-</footer>
+{{ page.body|richtext }}
+<ul>
+{% for subpage in page.get_children %}
+    <li>
+        <a href="{% pageurl subpage %}">{{subpage.title}}</a>
+        {{ page.body|richtext }}
+    </li>
+{% endfor %}
+</ul>
 {% endblock %}
diff --git a/home/templates/home/home_page.html.py b/home/templates/home/home_page.html.py
deleted file mode 100644
index a54a37e..0000000
--- a/home/templates/home/home_page.html.py
+++ /dev/null
@@ -1,37 +0,0 @@
-BBBBBBB BBBBBBBBBBB
-BBBB BBBB BBBBBB BBBBBBBBBBBBBBBB
-
-BBBBB BBBBBBBBBBXXXXXXXXXXXXXXXXXBBBBBBBB
-
-BBBBB BBBBBBBBB
-XXXXX XXXXXXXXXXXXXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBXX
-BBBBBBBB BBBBBBBBB
-
-BBBBB BBBBBBB
-XXXXXXX XXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXX
-    XXXXXX
-XXXXXXXXX
-XXXXXX
-    FFFFFFFF
-    XXXX
-    BBB BBBBBBB BB BBBBBBBBBBBBBBBBB
-        XXXX
-            XX XXXXXXBBBBBBB BBBBBBBXXXXXX
-            FFFFFFFF
-        XXXXX
-    BBBBBB
-    XXXXX
-XXXXXXX
-
-XXXXXXX XXXXXXXXXXXXXXX
-    XX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XX XXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX X XXXXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXX X XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXX X X XXXX X XXXXXXXXXXXXXX XXXXXXX X XXXXXXXX XXXXXXXXXXXX X XXX X X XXXX X XXX XXXX XX XXX XXXXXXXXXXXXX X X XX X XXXXX XXX XXXXXXXXXX XXXX XXXXXX XXXXXXXX X XXXXXXXX XXXXXXXXXXXXX X XXXX X XX XXXX XX XXXXXXXX XXX XXX XXXXXXXXXXXXXX X X XX X XXXXX XXX XXXXXXXXXX XXXX XXXXXXXXXXXXX
-        XXXXX
-            XXXX gettext(u'Admin Interface') XXXXX
-        XXXXXX
-    XXXX
-XXXXXXXXX
-BBBBBBBB
diff --git a/home/templates/home/welcome_page.html.py b/home/templates/home/welcome_page.html.py
deleted file mode 100644
index d1123ac..0000000
--- a/home/templates/home/welcome_page.html.py
+++ /dev/null
@@ -1,53 +0,0 @@
-BBBB BBBB BBBBBBBBBBBBBBBB
-
-XXXXXXX XXXXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXX
-    XX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XXXXX XXXXXXXXXXXXXX gettext(u'Visit the Wagtail website') XXXXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXX XXXXXX XXXX XXXX X XX XXXX XX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXX XX XXX XX XXXXXXXXXXXXXX XX X XXXX X XXXX X XXXX XXXX XXXX XXXXXXXX XXXXXXXXXXXXXXXX XX XXXXXXXXXXXXX XXXXXXX X XXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXX XXXXXXXXXXXXX XXXXX XXXXXXX XXXXXX XXXXXX XXXXXXX XXXXXX XXXXXXX XXXXX XXXXXX XXXXXXX XXXXXXX XXXXX XXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXX XXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXX XXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXX XXXXX XXXXX XXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXX XXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XX XXX XXXXXXXXXXX XXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXX XXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXX XXX X XXX XXX XXXX XXX XXX XXX XXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXX XXX X XXXXX XXX XXX XXX XXXXX XXX XXX XXX XXX XXX X XXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXX XXXXXXXX XXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX XXX X XXXX X XXX X XXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXX XXXXXXXX XXX X XXX X XXXX XXXXXXXXXXXXXXXXX XXXXXX X XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX X XXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXX XXXXX XXXXXXX XXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXX XXX XXX XXXXX X XXX XXX XXX XXX XXX X XXXXXX XXXXXXXXXXX XXXXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXX XXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXX XXX X XXX XXX XXXX XXX XXX XXX XXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXX XXX X XXXXX XXX XXX XXX XXXXX XXX XXX XXX XXX XXX X XXXXXX XXXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXX XXX XXXXXXX XXXXXXX XXX X XXXXX XXX XXX X X XXX XXX XXX XXX X XXXXXX XXXXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXXXXX
-     #
- #
- #
-
-    XX XXXXXXBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXBBBBBBBBBBBBBBBBBBBBBBBBBBXX
-       gettext(u'View the release notes') 
-    XXXX
-  XXXXXX
-XXXXXXXXX
-XXXXX XXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XXX XXXX XXXXXXXXXXXXXXXXXXX
-      XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX X XX XXXXXX XX XXXXXXXXXXX XXXXX XXXXXX
-      XXXXXXXX XXXXXXXXXXX XXXXXXXX XXXXXXXX XXXXXXX XXXXXXXX
-    XXXXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXX gettext(u'Welcome to your new Wagtail site!') XXXXX
-    XXX gettext(u'Please feel free to <a href="https://github.com/wagtail/wagtail/wiki/Slack">join our community on Slack</a>, or get started with one of the links below.') XXXX
-  XXXXXX
-XXXXXXX
-XXXXXXX XXXXXXXXXXXXXXX
-  XX XXXXXXXXXXXXX XXXXXXXXXXX XXXXXXBBBBBBBBBBBBBBBBBBBBBBBBBBXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XX XXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXX X X XXXXXX X XXXX XXXXXXXXXXXXXXXXXXXX X X XXX X XXX XXX XXX XXX X XXXXXXXX XXXX X X XXXXXX X XXXX XXXXXXXXXXXXXXXX XXXXX XXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXX X XXXX X XXXXXXX XXXXX XXXXX XXX X XXX XXXXXX XXXXXXX XXXXXXXXXXXXX
-    XXXXX
-      XXXX gettext(u'Wagtail Documentation') XXXXX
-      XXX gettext(u'Topics, references, & how-tos') XXXX
-    XXXXXX
-  XXXX
-  XX XXXXXXXXXXXXX XXXXXXXXXXX XXXXXXBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XX XXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXX XXXXXXXXXXXX XXXX X X X XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXX XXX XXXXXXXXXXXXXXXXXXX
-    XXXXX
-      XXXX gettext(u'Tutorial') XXXXX
-      XXX gettext(u'Build your first Wagtail site') XXXX
-    XXXXXX
-  XXXX
-  XX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XX XXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX X XXXXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXX X XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXX X X XXXX X XXXXXXXXXXXXXX XXXXXXX X XXXXXXXX XXXXXXXXXXXX X XXX X X XXXX X XXX XXXX XX XXX XXXXXXXXXXXXX X X XX X XXXXX XXX XXXXXXXXXX XXXX XXXXXX XXXXXXXX X XXXXXXXX XXXXXXXXXXXXX X XXXX X XX XXXX XX XXXXXXXX XXX XXX XXXXXXXXXXXXXX X X XX X XXXXX XXX XXXXXXXXXX XXXX XXXXXXXXXXXXX
-    XXXXX
-      XXXX gettext(u'Admin Interface') XXXXX
-      XXX gettext(u'Create your superuser first!') XXXX
-    XXXXXX
-  XXXX
-XXXXXXXXX
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 %}
diff --git a/scss/ishtar_public.scss b/scss/ishtar_public.scss
index 1a72052..62cf259 100644
--- a/scss/ishtar_public.scss
+++ b/scss/ishtar_public.scss
@@ -1,5 +1,54 @@
+@import "custom";
 @import "bootstrap-src/scss/bootstrap";
 
-main {
-    background-color:#EEE;
-    }
+.navbar.navlogo{
+    padding: 0;
+}
+
+.navbar.navlogo .navbar-brand{
+    padding: 0;
+}
+
+.footer {
+    padding: 1rem 0;
+    margin-top: 2rem;
+    font-size: 85%;
+    text-align: left;
+}
+
+.footer.text-light a{
+    color: $light !important;
+    text-decoration: underline;
+}
+
+.jumbotron {
+    position: relative;
+    overflow: hidden;
+    min-height: 250px;
+}
+
+.jumbotron h2{
+    font-size: 3rem;
+}
+
+.jumbotron .container {
+    position: relative;
+    z-index: 2;
+    background:rgba(0,0,0,0.2);
+    padding: 2rem;
+    border: 1px solid rgba(0,0,0,0.1);
+    border-radius: 3px;
+}
+
+.jumbotron-background img {
+    object-fit: cover;
+    font-family: 'object-fit: cover;';
+    position: absolute;
+    top: 0;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+    opacity: 0.9;
+}
+
+@import "custom_post";
\ No newline at end of file
diff --git a/showcase/templates/showcase/item-find.html b/showcase/templates/showcase/item-find.html
index 3cd3b6f..008e55a 100644
--- a/showcase/templates/showcase/item-find.html
+++ b/showcase/templates/showcase/item-find.html
@@ -1,12 +1,9 @@
 {% extends "base.html" %}
 {% load i18n static wagtailcore_tags wagtailimages_tags %}
 
-{% block body_class %}template-showcase{% endblock %}
+{% block body_class %}template-showcase-item{% endblock %}
 
 {% block content %}
-<main>
-    {{denomination}}
-    <img src="{{images.0.thumbnail}}">
-</main>
-
+{{denomination}}
+<img src="{{images.0.thumbnail}}">
 {% endblock %}
diff --git a/showcase/templates/showcase/show_case.html b/showcase/templates/showcase/show_case.html
index 4940b43..b6a4afa 100644
--- a/showcase/templates/showcase/show_case.html
+++ b/showcase/templates/showcase/show_case.html
@@ -4,19 +4,17 @@
 {% block body_class %}template-showcase{% endblock %}
 
 {% block content %}
-<main>
-    {% image page.image width-500 %}
-    {{ page.body|richtext }}
-    {% if page.data %}<ul>
-    {% for item in page.data %}
-        <li>
-            <a href="{% url 'display-item' page.slug forloop.counter0 %}">
-                {{item.denomination}}
-                <img src="{{item.images.0.thumbnail}}">
-            </a>
-        </li>
-    {% endfor %}
-    </ul>{% endif %}
-</main>
+{% image page.image width-500 %}
+{{ page.body|richtext }}
+{% if page.data %}<ul>
+{% for item in page.data %}
+    <li>
+        <a href="{% url 'display-item' page.slug forloop.counter0 %}">
+            {{item.denomination}}
+            <img src="{{item.images.0.thumbnail}}">
+        </a>
+    </li>
+{% endfor %}
+</ul>{% endif %}
 
 {% endblock %}