Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #267

Merged
merged 8 commits into from
Feb 27, 2023
Merged

Develop #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
518442b
#262 main nav css update
yannickkuypers Feb 21, 2023
e46230c
#262 better jinja
yannickkuypers Feb 22, 2023
d8f3dc9
Merge pull request #265 from OnroerendErfgoed/master
JonasGe Feb 23, 2023
1484fef
Update CHANGES.rst
JonasGe Feb 23, 2023
bdd68bd
update version numbers
JonasGe Feb 23, 2023
1197e33
Merge pull request #266 from OnroerendErfgoed/release/0.16.1
JonasGe Feb 23, 2023
d717699
#262 indentation
yannickkuypers Feb 24, 2023
81bcf3e
Merge pull request #263 from OnroerendErfgoed/feature/262_main_nav_cs…
JonasGe Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.16.1 (24-02-2023)
===================

- main_nav updaten zodat het ook css kan zetten (#262)

0.16.0 (14-12-2022)
===================

Expand Down
2 changes: 1 addition & 1 deletion npm-packages/pyoes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyoes",
"version": "0.16.0",
"version": "0.16.1",
"description": "Pyoes styles package",
"repository": "git+https://github.com/OnroerendErfgoed/pyoes.git",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.16.0",
"version": "0.16.1",
"name": "pyoes-npm-packages",
"workspaces": ["npm-packages/*"],
"private": true
Expand Down
2 changes: 1 addition & 1 deletion pyoes/static/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pyoes",
"description": "Pyoes",
"version": "0.16.0",
"version": "0.16.1",
"private": true,
"repository": {
"type": "git",
Expand Down
28 changes: 17 additions & 11 deletions pyoes/templates/pyoes/header.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,28 @@
{% set default_login_sub_nav = [('Profiel', '/'), ('Afmelden', '/')] %}

{% set main_nav = main_nav|default(default_main_nav) -%}

{# MAIN NAV #}
<ul class="left">
{% for id, caption, href in main_nav %}
<li{% if id == active_main_nav %} class="active"{% endif %}>
{% if id == 'home' %}
<a href="{{ href }}"><i class="fa fa-home"></i></a>
{% else %}
<a href="{{ href }}">{{ caption|safe }}</a>
{% endif %}
{% for item in main_nav %}
{% if item|length == 3 %}
{% set id, caption, href = item %}
{% set class = None %}
{% else %}
{% set id, caption, href, class = item %}
{% endif %}
<li class="{{ 'active' if id == active_main_nav else '' }} {{class or ''}}">
{% if id == 'home' %}
<a href="{{ href }}"><i class="fa fa-home"></i></a>
{% else %}
<a href="{{ href }}">{{ caption|safe }}</a>
{% endif %}
</li>
{% endfor %}
<li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/contact" target="_blank" title="Contacteer ons">Contact</a></li>
<li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/over-ons" target="_blank" title="Meer informatie over ons">Over ons</a></li>
<li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/contact" target="_blank" title="Contacteer ons">Contact</a></li>
<li class="show-for-small-only"><a href="https://www.onroerenderfgoed.be/over-ons" target="_blank" title="Meer informatie over ons">Over ons</a></li>
</ul>

{% set dropdown_main_nav = dropdown_main_nav|default(default_dropdown_main_nav) -%}

{# DROPDOWN NAV #}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]

setup(name='pyoes',
version='0.16.0',
version='0.16.1',
description='Algemene onroerenderfgoed stijl (gebaseerd op de Vlaamse huisstijl) voor pyramid',
long_description=README + '\n\n' + CHANGES,
classifiers=[
Expand Down