diff --git a/proj/views.py b/proj/views.py index f93b2a0c..c5cb918d 100644 --- a/proj/views.py +++ b/proj/views.py @@ -37,7 +37,9 @@ def error404(request): expo_themes = Theme.active.expo_themes_with_count() conf_themes = Theme.active.conference_themes_with_count() context.update({'expo_themes': expo_themes, 'conf_themes': conf_themes}) - return render_to_response('client/404.html', context, context_instance=RequestContext(request)) + response = render_to_response('client/404.html', context, context_instance=RequestContext(request)) + response.status_code = 404 + return response class MainPageView(JitterCacheMixin,TemplateView): cache_range = settings.CACHE_RANGE diff --git a/templates/client/includes/conference/conference_object.html b/templates/client/includes/conference/conference_object.html index 0e417f6f..87aee843 100644 --- a/templates/client/includes/conference/conference_object.html +++ b/templates/client/includes/conference/conference_object.html @@ -152,6 +152,22 @@ {% endfor %} {% endwith %} + {% else %} + {% if event.org %} +