ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

Compare commits

base: ctactic:8ecf71b96e1ba89c927250890b4d264bba3c7024
Branches Tags
ctactic:radiocampus
ctactic:develop-1.0
rc:develop-1.0
rc:master
..
compare: ctactic:529ed25d7f02a5dd96993cade89cfdf27ce0b8b6
Branches Tags
ctactic:radiocampus
ctactic:develop-1.0
rc:develop-1.0
rc:master

No commits in common. "8ecf71b96e1ba89c927250890b4d264bba3c7024" and "529ed25d7f02a5dd96993cade89cfdf27ce0b8b6" have entirely different histories.
8ecf71b96e ... 529ed25d7f

3 changed files with 11 additions and 18 deletions
Show Stats Expand all files Collapse all files

5
aircox/models/page.py
View File

@ -182,7 +182,8 @@ class BasePage(Renderable, models.Model):
# FIXME: rename
class PageQuerySet(BasePageQuerySet):
pass
def published(self):
return self.filter(status=Page.STATUS_PUBLISHED, pub_date__lte=tz.now())
class Page(BasePage):
@ -240,7 +241,7 @@ class ChildPage(Page):
@property
def display_title(self):
if self.title:
if self.is_published:
return self.title
return self.parent and self.parent.title or ""

4
aircox/templates/aircox/base.html
View File

@ -76,8 +76,10 @@ Usefull context:
{% for item, render in items %}
{{ render }}
{% endfor %}
{% include "./widgets/nav.html" %}
{% endblock %}
{% if user.is_authenticated %}
{% include "./widgets/nav.html" %}
{% endif %}
</div>
{% endblock %}
</nav>

20
aircox/templates/aircox/widgets/nav.html
View File

@ -1,20 +1,11 @@
{% load aircox i18n %}
{% if not user.is_authenticated %}
<div class="dropdown-trigger nav-item">
<a class="button square" href="{% url 'dashboard' %}" style="background-color:unset;">
<span class="icon">
<i class="fa-regular fa-user" aria-hidden="true"></i>
</span>
</a>
</div>
{% else %}
<div class="dropdown is-hoverable is-right" style="display:block;">
<div class="dropdown-trigger nav-item">
<a class="button square" aria-haspopup="true" aria-controls="dropdown-menu" style="background-color:unset;">
<div class="dropdown is-hoverable is-right">
<div class="dropdown-trigger">
<button class="button square" aria-haspopup="true" aria-controls="dropdown-menu" type="button">
<span class="icon">
<i class="fa-regular fa-user" aria-hidden="true"></i>
<i class="fa-regular fa-user" aria-hidden="true" style="opacity: 0.6"></i>
</span>
</a>
</button>
</div>
<div class="dropdown-menu" id="dropdown-menu" role="menu" style="z-index:200">
<div class="dropdown-content">
@ -62,4 +53,3 @@
</div>
</div>
</div>
{% endif %}