From b878500949f2df3fdc4e3b58a806b576e011b555 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 14 Feb 2018 12:27:26 +0000
Subject: [PATCH] Re-add menu to frontpage* that was missing from new layout.
Also integrate the login as administrator functionality in this menu.
---
modules/core/templates/_frontpage_menu.twig | 25 +++++++++++++++++++
modules/core/templates/frontpage_auth.twig | 9 ++-----
modules/core/templates/frontpage_config.twig | 9 ++-----
.../core/templates/frontpage_federation.twig | 9 ++-----
modules/core/templates/frontpage_welcome.twig | 9 ++-----
5 files changed, 33 insertions(+), 28 deletions(-)
create mode 100644 modules/core/templates/_frontpage_menu.twig
diff --git a/modules/core/templates/_frontpage_menu.twig b/modules/core/templates/_frontpage_menu.twig
new file mode 100644
index 000000000..8e07bda1b
--- /dev/null
+++ b/modules/core/templates/_frontpage_menu.twig
@@ -0,0 +1,25 @@
+<div class="pure-g">
+ <div class="pure-u-2-3">
+ <div class="pure-menu pure-menu-horizontal">
+ <ul class="pure-menu-list">
+ <li class="pure-menu-item {% if frontpage_section == "welcome" %} pure-menu-selected{% endif %}">
+ <a href="frontpage_welcome.php" class="pure-menu-link">Welcome</a></li>
+ <li class="pure-menu-item {% if frontpage_section == "config" %} pure-menu-selected{% endif %}">
+ <a href="frontpage_config.php" class="pure-menu-link">Configuration</a></li>
+ <li class="pure-menu-item {% if frontpage_section == "auth" %} pure-menu-selected{% endif %}">
+ <a href="frontpage_auth.php" class="pure-menu-link">Authentication</a></li>
+ <li class="pure-menu-item {% if frontpage_section == "federation" %} pure-menu-selected{% endif %}">
+ <a href="frontpage_federation.php" class="pure-menu-link">Federation</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="pure-u-1-3">
+ {% if isadmin %}
+ <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
+ {% else %}
+ <p class="float-r youareadmin">
+ <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+ </p>
+ {% endif %}
+ </div>
+</div>
diff --git a/modules/core/templates/frontpage_auth.twig b/modules/core/templates/frontpage_auth.twig
index 3d30318f4..cfe3c4f9d 100644
--- a/modules/core/templates/frontpage_auth.twig
+++ b/modules/core/templates/frontpage_auth.twig
@@ -1,14 +1,9 @@
{% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'auth' %}
{% extends "base.twig" %}
{% block content %}
- {% if isadmin %}
- <p class="right youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
- {% else %}
- <p class="right youareadmin">
- <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
- </p>
- {% endif %}
+ {% include "@core/_frontpage_menu.twig" %}
<ul>
{% for key, link in links_auth %}
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 353f9b977..1d599c424 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -1,14 +1,9 @@
{% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'config' %}
{% extends "base.twig" %}
{% block content %}
- {% if isadmin %}
- <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
- {% else %}
- <p class="float-r youareadmin">
- <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
- </p>
- {% endif %}
+ {% include "@core/_frontpage_menu.twig" %}
<div style="margin-top: 1em;">
<code style="background: white; background: #f5f5f5; border: 1px dotted #bbb; padding: 1em; color: #555" >{{ directory }} ({{ version }})</code>
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 91772b693..ef21bbead 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -1,14 +1,9 @@
{% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'federation' %}
{% extends "base.twig" %}
{% block content %}
- {% if isadmin %}
- <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
- {% else %}
- <p class="float-r youareadmin">
- <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
- </p>
- {% endif %}
+ {% include "@core/_frontpage_menu.twig" %}
{% if metaentries.hosted is iterable and metaentries.hosted is not empty %}
<dl>
diff --git a/modules/core/templates/frontpage_welcome.twig b/modules/core/templates/frontpage_welcome.twig
index c4c305222..de2f3757c 100644
--- a/modules/core/templates/frontpage_welcome.twig
+++ b/modules/core/templates/frontpage_welcome.twig
@@ -1,14 +1,9 @@
{% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'welcome' %}
{% extends "base.twig" %}
{% block content %}
- {% if isadmin %}
- <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
- {% else %}
- <p class="float-r youareadmin">
- <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
- </p>
- {% endif %}
+ {% include "@core/_frontpage_menu.twig" %}
<p>{{ '{core:frontpage:intro}'|trans|raw }}</p>
<ul>
--
GitLab