Browse Source

fix my last fix using variables that actually exist

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
6127c00dc1
  1. 2
      pyweb/mumble/templates/mumble/list.html
  2. 8
      pyweb/mumble/templates/mumble/mumble.html
  3. 3
      pyweb/processors.py

2
pyweb/mumble/templates/mumble/list.html

@ -8,7 +8,7 @@
{% endblock %}
{% block HeadTag %}
<script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
<script type="text/javascript" src="{{ settings.MUMBLE_DJANGO_URL }}mumble/api/api.js"></script>
<script type="text/javascript" src="{{ MUMBLE_DJANGO_URL }}mumble/api/api.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/rendermumbleserver.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/buttoniframewindow.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/loginout_buttons.js"></script>

8
pyweb/mumble/templates/mumble/mumble.html

@ -15,11 +15,11 @@
}
</style>
<script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
<script type="text/javascript" src="{{ MUMBLE_DJANGO_URL }}mumble/api/api.js"></script>
<script type="text/javascript" src="{{ MUMBLE_DJANGO_URL }}mumble/forms/api.js"></script>
<script type="text/javascript" src="{{ MUMBLE_DJANGO_URL }}mumble/forms/{{ RegForm|lower }}.js"></script>
<script type="text/javascript" src="{{ MUMBLE_DJANGO_URL }}mumble/forms/mumbleform.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/TabScrollerMenu.js"></script>
<script type="text/javascript" src="{{ settings.MUMBLE_DJANGO_URL }}api/api.js"></script>
<script type="text/javascript" src="{{ settings.MUMBLE_DJANGO_URL }}forms/api.js"></script>
<script type="text/javascript" src="{{ settings.MUMBLE_DJANGO_URL }}forms/{{ RegForm|lower }}.js"></script>
<script type="text/javascript" src="{{ settings.MUMBLE_DJANGO_URL }}forms/mumbleform.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/channelviewer.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/channelviewerplugins.js"></script>
<script type="text/javascript" src="{{ MUMBLE_MEDIA_PREFIX }}js/rendermumbleserver.js"></script>

3
pyweb/processors.py

@ -25,7 +25,8 @@ def mumble_version(request):
def mumble_media_prefix(request):
from django.conf import settings
return { 'MUMBLE_MEDIA_PREFIX': settings.MUMBLE_MEDIA_PREFIX }
return { 'MUMBLE_MEDIA_PREFIX': settings.MUMBLE_MEDIA_PREFIX,
'MUMBLE_DJANGO_URL': settings.MUMBLE_DJANGO_URL}
def theme_url(request):
from django.conf import settings

Loading…
Cancel
Save