diff --git a/templates/home.html.twig b/templates/home.html.twig index 8f8e5cb..14ebc2e 100644 --- a/templates/home.html.twig +++ b/templates/home.html.twig @@ -2,8 +2,11 @@ {% block content %} <div class="row"> - <div class="col-12 col-md-6 mb-2" height="100%"> - <h1>Herzlich Willkommen</h1> + <div class="col-12 col-md-6" height="100%"> + <h1 class="d-inline"> + {% include 'partials/logo.html.twig' with {style: 'height: 3rem; padding-bottom: 0.5rem'} %} + Herzlich Willkommen + </h1> <div width="100%"> {% include 'partials/osm.html.twig' %} </div> @@ -43,4 +46,25 @@ </div> </div> {% endif %} + {% set collection = page.collection() %} + {% for child in collection %} + <hr class="mb-4" /> + {% if child.template == 'info' %} + <div class="row"> + {% set text_class = 'col-12' %} + {% if child.media.images|first %} + {% set text_class = 'col-12 col-md-9' %} + <div class="col-12 col-md-3"> + <img width="100%" src="{{ child.media.images|first.url }}"> + </div> + {% endif %} + <div class="{{ text_class }}"> + {{ child.content }} + </div> + </div> + {% else %} + <a href="{{ child.url }}">{{ child.title }}</a> + <p>{{ child.summary }}</p> + {% endif %} + {% endfor %} {% endblock %} diff --git a/templates/info-list.html.twig b/templates/info-list.html.twig index 9c218e7..637005a 100644 --- a/templates/info-list.html.twig +++ b/templates/info-list.html.twig @@ -22,6 +22,6 @@ <a href="{{ child.url }}">{{ child.title }}</a> <p>{{ child.summary }}</p> {% endif %} - <div class="mb-4"></div> + <hr class="mb-4" /> {% endfor %} {% endblock %} diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index 9d3a1f2..7867320 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -58,7 +58,7 @@ <p class="mx-auto">© Heike Tischler</p> </div> <div class="row"> - <p class="mx-auto">Diese Webseite nutzt <a href="http://getgrav.org">Grav</a> von <a href="http://www.rockettheme.com">RocketTheme</a>.</p> + <p class="mx-auto">Diese Webseite nutzt <a target="_blank" href="http://getgrav.org">Grav</a> von <a target="_blank" href="http://www.rockettheme.com">RocketTheme</a>.</p> </div> </footer> {% endblock %} diff --git a/templates/partials/logo.html.twig b/templates/partials/logo.html.twig index 6b0d52e..0342acc 100644 --- a/templates/partials/logo.html.twig +++ b/templates/partials/logo.html.twig @@ -1,9 +1,12 @@ -<a href="{{ home_url }}" class="navbar-brand mr-10"> - {% set logo = theme_var('custom_logo') %} - {% if logo %} - {% set logo_file = (logo|first).name %} - <img src="{{ url('theme://images/logo/' ~ logo_file) }}" /> - {% else %} - <img src="{{ url('theme://images/ro-logo.svg') }}" /> - {% endif %} -</a> +{% set logo = theme_var('custom_logo') %} +{% if style %} + {% set style='style="' ~ style ~ '"' %} +{% else %} + {% set style='' %} +{% endif %} +{% if logo %} + {% set logo_file = (logo|first).name %} + <img {{ style }} src="{{ url('theme://images/logo/' ~ logo_file) }}" /> +{% else %} + <img {{ style }} src="{{ url('theme://images/ro-logo.svg') }}" /> +{% endif %} diff --git a/templates/partials/navbar.html.twig b/templates/partials/navbar.html.twig index 83f7079..9ff6fad 100644 --- a/templates/partials/navbar.html.twig +++ b/templates/partials/navbar.html.twig @@ -7,7 +7,9 @@ <ul class="sidebar-nav"> <li class="sidebar-spacer"></li> <li class="sidebar-brand"> - {% include 'partials/logo.html.twig' %} + <a href="{{ home_url }}" class="navbar-brand mr-10"> + {% include 'partials/logo.html.twig' %} + </a> </li> {% for page in pages.children.visible %} {% set current_page = (page.active or page.activeChild) ? 'selected' : '' %} diff --git a/templates/partials/socialmedia.html.twig b/templates/partials/socialmedia.html.twig index 2a9ff6f..fc06064 100644 --- a/templates/partials/socialmedia.html.twig +++ b/templates/partials/socialmedia.html.twig @@ -1,3 +1,3 @@ -<a role="button" class="btn btn-facebook" href="https://www.facebook.com/Reitanlage-Oranienburg-Heike-Tischler-456154271116487/"> +<a role="button" class="btn btn-facebook" target="_blank" href="https://www.facebook.com/Reitanlage-Oranienburg-Heike-Tischler-456154271116487/"> <i class="fab fa-facebook-f"></i> </a>