sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge tag 'v6.74' into develop

Browse Source 
release
This commit is contained in:
Sander Roosendaal
2018-05-27 10:54:01 +02:00
parent b5f0f41b41 3818f83cf1
commit 7ae1e1603a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/views.py
View File

@@ -13668,6 +13668,8 @@ def virtualevent_create_view(request):
# create Site Announcement & Tweet # create Site Announcement & Tweet
if settings.DEBUG: if settings.DEBUG:
dotweet = False dotweet = False
elif 'dev' in settings.SITE_URL:
dotweet = False
else: else:
dotweet = True dotweet = True
sa = SiteAnnouncement( sa = SiteAnnouncement(

4
templates/basebase.html
View File

@@ -227,11 +227,11 @@
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 tooltip"> <div class="grid_1 tooltip">
{% block teams %} {% block challenges %}
{% endblock %} {% endblock %}
</div> </div>
<div class="grid_1 tooltip"> <div class="grid_1 tooltip">
{% block challenges %} {% block teams %}
{% endblock %} {% endblock %}
</div> </div>
</div> </div>