Disable scheduling module

We won't be making use of the scheduling module for
the Boston forum. Disable it in configuration, and
remove links from the cfp module to the scheduling
module in case it's not loaded.

Change-Id: I985f2bda2cda872e553ba52b27f3c264cf8a97bd
This commit is contained in:
Thierry Carrez 2017-03-16 13:46:26 +01:00
parent 579ed5bf52
commit 1bc28b4b1b
4 changed files with 10 additions and 3 deletions

View File

@ -1,19 +1,25 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block helppage %} {% block helppage %}
<p>This is the topic lead review screen. It lists all session suggestions for your topic so far.</p> <p>This is the topic lead review screen. It lists all session suggestions for your topic so far.</p>
{% if sched %}
<p>A graph shows you how many sessions you have proposed, preapproved and scheduled against the number of available slots you have for your topic.</p> <p>A graph shows you how many sessions you have proposed, preapproved and scheduled against the number of available slots you have for your topic.</p>
{% endif %}
<p>You can see the details of a proposed session (or edit sessions that are not in <i>Preapproved</i> state yet) by clicking on its title. You can sort the results by clicking on the corresponding table headers.</p> <p>You can see the details of a proposed session (or edit sessions that are not in <i>Preapproved</i> state yet) by clicking on its title. You can sort the results by clicking on the corresponding table headers.</p>
<p>To change the status for a given session, click on the <i>Status</i> you want to change.</p> <p>To change the status for a given session, click on the <i>Status</i> you want to change.</p>
{% if sched %}
<p>Finally, when you're ready to do the scheduling of your topic, you can click on the <i>Scheduling</i> button.</p> <p>Finally, when you're ready to do the scheduling of your topic, you can click on the <i>Scheduling</i> button.</p>
{% endif %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<script type="text/javascript" src="/media/sorting.js"></script> <script type="text/javascript" src="/media/sorting.js"></script>
<div class="span-8"> <div class="span-8">
<h2>{{ topic.name }}</h2> <h2>{{ topic.name }}</h2>
<a class=roundedButton href=/>Back to proposals list</A> <a class=roundedButton href=/>Back to proposals list</A>
{% if sched %}
<a class=roundedButton href="/scheduling/{{ topic.id }}">Scheduling</A> <a class=roundedButton href="/scheduling/{{ topic.id }}">Scheduling</A>
</div><div id="vis"><iframe frameborder=0 width=580 height=100 src=/scheduling/graph/{{ topic.id }}></iframe>
{% endif %}
</div> </div>
<div id="vis"><iframe frameborder=0 width=580 height=100 src=/scheduling/graph/{{ topic.id }}></iframe></div>
<table> <table>
<tr> <tr>
<th>Topic</th> <th>Topic</th>

View File

@ -48,6 +48,7 @@ def topiclist(request, topicid):
request.session['lastlist'] = "cfp/topic/%s" % topicid request.session['lastlist'] = "cfp/topic/%s" % topicid
return TemplateResponse(request, "topiclist.html", return TemplateResponse(request, "topiclist.html",
{'proposals': proposals, {'proposals': proposals,
'sched': 'scheduling' in settings.INSTALLED_APPS,
'topic': topic}) 'topic': topic})

View File

@ -84,7 +84,7 @@ INSTALLED_APPS = [
'django_openid_auth', 'django_openid_auth',
'django.contrib.admin', 'django.contrib.admin',
'cfp', 'cfp',
'scheduling', # 'scheduling',
] ]
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (

View File

@ -24,7 +24,7 @@ urlpatterns = [
url(r'^openid/', include('django_openid_auth.urls')), url(r'^openid/', include('django_openid_auth.urls')),
url(r'^$', views.list), url(r'^$', views.list),
url(r'^cfp/', include('cfp.urls')), url(r'^cfp/', include('cfp.urls')),
url(r'^scheduling/', include('scheduling.urls')), # url(r'^scheduling/', include('scheduling.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^logout$', views.dologout), url(r'^logout$', views.dologout),
] ]