diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2017-01-06 18:38:55 +0100 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2017-01-06 18:38:55 +0100 |
| commit | 8075fca3b427cdedb19c50bf8c8ede5476aaf7ad (patch) | |
| tree | 6065bda87ed2ee727cb79f614e57714b0a0f2aa2 /python/templates/includes/navigation | |
| parent | Update for django 1.10 and fix links for css and js (diff) | |
| download | tinderbox-cluster-www-8075fca3b427cdedb19c50bf8c8ede5476aaf7ad.tar.gz tinderbox-cluster-www-8075fca3b427cdedb19c50bf8c8ede5476aaf7ad.tar.bz2 tinderbox-cluster-www-8075fca3b427cdedb19c50bf8c8ede5476aaf7ad.zip | |
Redone the layout
Diffstat (limited to 'python/templates/includes/navigation')
| -rw-r--r-- | python/templates/includes/navigation/primary | 2 | ||||
| -rw-r--r-- | python/templates/includes/navigation/secondary | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/python/templates/includes/navigation/primary b/python/templates/includes/navigation/primary index c5d86e6..76fa273 100644 --- a/python/templates/includes/navigation/primary +++ b/python/templates/includes/navigation/primary @@ -1,5 +1,5 @@ {% for node in pages %} - {% if node.nav1_show %}{% if node.nav1 != 'donate' %} + {% if node.nav1_show %}{% if node.nav1 != 'login' %} {% if page.nav1 == node.nav1 %} <li class="active"><a href="/{{ node.url }}/" class="active">{% if node.nav_title %}{{ node.nav_title }}{% else %}{{node.title}}{% endif %}</a></li> {% else %} diff --git a/python/templates/includes/navigation/secondary b/python/templates/includes/navigation/secondary index a8cdfbd..60898ab 100644 --- a/python/templates/includes/navigation/secondary +++ b/python/templates/includes/navigation/secondary @@ -1,12 +1,5 @@ -{% assign pages_list2 = pages_list | sort:"nav2-weight" %} -{% for node in pages_list2 %} - {% if page.nav1 == node.nav1 and node.nav1-show != true and node.nav2-show == true %} - {% if page.nav2 == node.nav2 %} - <li class="active"><a href="{{node.url | replace:'index.html',''}}" class="active">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> - {% else %} - <li><a href="{{node.url | replace:'index.html',''}}">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> +{% for node in subpages %} + {% if page.PageId == node.PageId.PageId %} + <li><a href="{{node.url }}">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> {% endif %} - {% endif %} {% endfor %} -{% assign pages_list = nil %} -{% assign pages_list2 = nil %}
\ No newline at end of file |