Skip to content

Commit eef752a

Browse files
jh-RLIjh-RLI
authored
Merge pull request #2024 from OpenEnergyPlatform/feature-2023-rework-nav-bar
Rework navigation bar
2 parents 60e0db4 + a0dab71 commit eef752a

File tree

5 files changed

+54
-12
lines changed

5 files changed

+54
-12
lines changed

‎base/templates/base/_header.html‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,37 @@
1111
<li class="nav-item">
1212
<a class="nav-link" href="/dataedit/schemas">Database</a>
1313
</li>
14+
15+
<li class="nav-item dropdown">
16+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMeta" role="button"
17+
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
18+
Metadata
19+
</a>
20+
<div class="dropdown-menu" aria-labelledby="navbarDropdownMeta">
21+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.oemetadata_key_description }}" target="_blank"><i class="fas fa-external-link-alt"></i> OEMetadata standard</a>
22+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.oedatamodel }}" target="_blank"><i class="fas fa-external-link-alt"></i> OEDataModel </a>
23+
<a class="dropdown-item" href="{% url 'dataedit:oemetabuilder' %}">OEMetaBuilder Tool</a>
24+
</div>
25+
</li>
1426
<li class="nav-item dropdown">
1527
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownFS" role="button"
1628
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
17-
Scenario Bundles
29+
Factsheets
1830
</a>
1931
<div class="dropdown-menu" aria-labelledby="navbarDropdownFS">
20-
<!-- <a class="dropdown-item" href="/factsheets/overview/">Overview</a> -->
21-
<!-- <sup class="small text-muted">Early Access</sup> -->
22-
<a class="dropdown-item" href="/scenario-bundles/main">Scenario Bundle</a>
2332
<a class="dropdown-item" href="/factsheets/frameworks/">Framework Factsheet</a>
2433
<a class="dropdown-item" href="/factsheets/models/">Model Factsheet</a>
25-
<!-- <a class="dropdown-item" href="/factsheets/scenarios/">Scenario Factsheet</a> -->
34+
</div>
35+
</li>
36+
37+
<li class="nav-item dropdown">
38+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownSB" role="button"
39+
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
40+
Scenario Bundles
41+
</a>
42+
<div class="dropdown-menu" aria-labelledby="navbarDropdownSB">
43+
<a class="dropdown-item" href="{% url 'factsheet:factsheets_index' %}">Scenario Bundle</a>
44+
<a class="dropdown-item" href="/oekg/gui/">OEKG SPARQL-Query</a>
2645
</div>
2746
</li>
2847
<li class="nav-item dropdown">
@@ -38,8 +57,26 @@
3857
<a class="dropdown-item" href="{{ EXTERNAL_URLS.tib_terminology_service }}" target="_blank" data-toggle="tooltip" data-placement="top" title="We want to combine our efforts in ontology development with the TIB as part of the NFDI4Energy project."><i class="fas fa-external-link-alt"></i> TIB Terminology Service</a>
3958
</div>
4059
</li>
41-
<li class="nav-item">
42-
<a class="nav-link" href="{{ EXTERNAL_URLS.tutorials_index }}" target="_blank">Academy <i class="fas fa-external-link-alt"></i></a>
60+
<li class="nav-item dropdown">
61+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAcademy" role="button"
62+
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
63+
Academy
64+
</a>
65+
<div class="dropdown-menu" aria-labelledby="navbarDropdownAcademy">
66+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.tutorials_index }}" target="_blank"><i class="fas fa-external-link-alt"></i> Getting Started </a>
67+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.tutorials_faq }}" target="_blank"><i class="fas fa-external-link-alt"></i> Questions </a>
68+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.ORKG }}" target="_blank"><i class="fas fa-external-link-alt"></i> ORKG </a>
69+
</div>
70+
</li>
71+
<li class="nav-item dropdown">
72+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownTools" role="button"
73+
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
74+
Open Data Tools
75+
</a>
76+
<div class="dropdown-menu" aria-labelledby="navbarDropdownTools">
77+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.open_plan }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open Plan</a>
78+
<a class="dropdown-item" href="{{ EXTERNAL_URLS.open_mastr }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open MaStR</a>
79+
</div>
4380
</li>
4481
<li class="nav-item dropdown">
4582
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAbout" role="button"
@@ -51,7 +88,6 @@
5188
<a class="dropdown-item" href="{{ EXTERNAL_URLS.compendium }}" target="_blank"><i class="fas fa-external-link-alt"></i> Compendium</a>
5289
<a class="dropdown-item" href="{{ EXTERNAL_URLS.mkdocs }}" target="_blank"><i class="fas fa-external-link-alt"></i> Developer Documentation</a>
5390
<a class="dropdown-item" href="{{ EXTERNAL_URLS.readthedocs }}" target="_blank"><i class="fas fa-external-link-alt"></i> REST-API Documentation</a>
54-
<a class="dropdown-item" href="{{ EXTERNAL_URLS.tutorials_faq }}" target="_blank"><i class="fas fa-external-link-alt"></i> FAQ</a>
5591
</div>
5692
</li>
5793
</ul>

‎base/templates/base/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
{% block main %}
1010
{% load static %}
11-
<!-- Add this at the desired location in your start page template -->
12-
<div class="alert alert-warning mb-4">
11+
<!-- This banner can be used to communicate latest developments / changes to the user -->
12+
<!-- <div class="alert alert-warning mb-4">
1313
<div class="container">
1414
<div class="d-flex align-items-center py-2">
1515
<div class="me-3">
@@ -26,7 +26,7 @@ <h5 class="mb-0">OEMetadata version 2.0 migration</h5>
2626
</div>
2727
</div>
2828
</div>
29-
</div>
29+
</div> -->
3030
<div class="index-home">
3131
<div class="index-group">
3232
<div class="index-padding">

‎factsheet/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
app_name = "factsheet"
66
urlpatterns = [
77
path(r"", views.factsheets_index),
8-
path(r"main", views.factsheets_index),
8+
path(r"main", views.factsheets_index, name="factsheets_index"),
99
re_path(r"^id/*", views.factsheets_index, name="bundle-id-page"),
1010
re_path(r"^compare/*", views.factsheets_index),
1111
re_path(r"^oekg_history/*", views.factsheets_index),

‎oeplatform/settings.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
"spdx_licenses": "https://spdx.github.io/license-list-data/",
106106
"oemetadata_key_description": "https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/oemetadata/latest/metadata_key_description.md", # noqa E501
107107
"oeo_extended_github": "https://github.com/OpenEnergyPlatform/oeo-extended", # noqa E501
108+
"oedatamodel": "https://github.com/OpenEnergyPlatform/oedatamodel",
109+
"ORKG": "https://academy.orkg.org/orkg-academy/main/index.html",
110+
"open_plan": "https://open-plan-tool.org/",
111+
"open_mastr": "https://open-mastr.readthedocs.io/en/latest/",
108112
}
109113

110114
# Kept this separate for now to avoid messing with the other list ...

‎versions/changelogs/current.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
- Refactor plain django based login system and replace its core by django allauth with custom OEP-styles thanks to @bmlancien [(#1896)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1896)
1616

17+
- Rework the navigation bar and promote each section and feature which can be linked individually as well as link to more external content which is close to the OEP. This change should help users to find specific features [(#2024)](https://github.com/OpenEnergyPlatform/oeplatform/pull/2024)
18+
1719
## Features
1820

1921
- Add NFDI AAI based login system enabled by KIT´s RegApp for Single Sign on. This enables institutional and ORCID based social login additionally to the oeplatform internal login system [(#1896)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1896)

0 commit comments

Comments
 (0)