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

Compare commits

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

3 Commits
529ed25d7f ... 8ecf71b96e

Author SHA1 Message Date
Christophe Siraut
8ecf71b96e aircox/templates: display a link to dashboard when user in not authenticated 2024-11-08 10:22:11 +01:00
Christophe Siraut
0788d4af37 aircox/models/page: display episode/page title 2024-11-07 17:24:16 +01:00
Christophe Siraut
05be58b0c1 aircox/models/page: remove custom published() method which prevented new Podcasts to be included in EpisodeQuerySet.with_podcasts(), maybe related to 33e46ebd53 2024-11-07 17:23:27 +01:00
3 changed files with 18 additions and 11 deletions
Show Stats Expand all files Collapse all files

5
aircox/models/page.py
View File

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

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

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

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

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