Ticket #229
This commit is contained in:
parent
ad8d5585f1
commit
a149d5a6bc
@ -4,6 +4,6 @@
|
||||
{% load i18n %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% get_config 'event_name' %}</h1>
|
||||
{% get_config 'event_description' %}
|
||||
<h1>{% get_config 'frontpage_title' %}</h1>
|
||||
{% get_config 'frontpage_welcometext' %}
|
||||
{% endblock %}
|
||||
|
@ -2,6 +2,19 @@
|
||||
{% load i18n %}
|
||||
{% load tags %}
|
||||
|
||||
|
||||
<ul style="line-height: 180%">
|
||||
<li class="{% if welcomepage_is_active %}activeline{% endif %}">
|
||||
<a href="{% url projector_activate_welcomepage %}" class="activate_link {% if welcomepage_is_active %}active{% endif %}">
|
||||
<div></div>
|
||||
</a>
|
||||
<a href="{% url projctor_preview_welcomepage %}" title="{% trans 'Preview' %}" class="icon preview right">
|
||||
<span></span>
|
||||
</a>
|
||||
{% trans 'Welcome Page' %}
|
||||
</li>
|
||||
</ul>
|
||||
<hr>
|
||||
<ul style="line-height: 180%">
|
||||
{% for slide in slides %}
|
||||
<li class="{% if slide.active %}activeline{% endif %}">
|
||||
|
@ -27,6 +27,12 @@ urlpatterns = patterns('projector.views',
|
||||
name='projector_show',
|
||||
),
|
||||
|
||||
url(r'^preview/$',
|
||||
Projector.as_view(),
|
||||
{'sid': None},
|
||||
name='projctor_preview_welcomepage',
|
||||
),
|
||||
|
||||
url(r'^preview/(?P<sid>[^/]*)/$',
|
||||
Projector.as_view(),
|
||||
name='projctor_preview_slide',
|
||||
@ -37,6 +43,12 @@ urlpatterns = patterns('projector.views',
|
||||
name='projector_control',
|
||||
),
|
||||
|
||||
url(r'^activate/$',
|
||||
ActivateView.as_view(),
|
||||
{'sid': None},
|
||||
name='projector_activate_welcomepage',
|
||||
),
|
||||
|
||||
url(r'^activate/(?P<sid>[^/]*)/$',
|
||||
ActivateView.as_view(),
|
||||
name='projector_activate_slide',
|
||||
|
@ -329,6 +329,7 @@ def get_widgets(request):
|
||||
template='projector/widget.html',
|
||||
context={
|
||||
'slides': ProjectorSlide.objects.all(),
|
||||
'welcomepage_is_active': not bool(config["presentation"]),
|
||||
}
|
||||
),
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user