diff --git a/panikdb/settings.py b/panikdb/settings.py index 25070041daa51e4596feb84fd863fb12065c52e2..66358c51c8fb2ee9b09fdbd84bc6d0e3c0e3a8ac 100644 --- a/panikdb/settings.py +++ b/panikdb/settings.py @@ -139,6 +139,8 @@ INSTALLED_APPS = ( 'gadjo', 'combo.data', 'combo.manager', + 'panikombo', + 'django_select2', ) # A sample logging configuration. The only tangible logging diff --git a/panikdb/static/css/style.css b/panikdb/static/css/style.css index 75dedf1f94655e2891b69f696fd8f39052fd85a2..fa9c11f3dc8f8a3fda832ae1eb5e69cf2381345a 100644 --- a/panikdb/static/css/style.css +++ b/panikdb/static/css/style.css @@ -643,3 +643,7 @@ div#appbar > a { float: right; margin-left: 2em; } + +body.combo div.select2-container { + width: 100%; +} diff --git a/panikdb/templates/combo/manager_base.html b/panikdb/templates/combo/manager_base.html index 20aa194fe4909998921085e16062201acaa34e19..77a7f37b5c51a45868ea65bcf57cf782b26f6c99 100644 --- a/panikdb/templates/combo/manager_base.html +++ b/panikdb/templates/combo/manager_base.html @@ -12,3 +12,5 @@ {% block more-user-links %} CMS {% endblock %} + +{% block bodyattr %}class="combo"{% endblock %} diff --git a/panikdb/urls.py b/panikdb/urls.py index ae33475ca9ab0b7b04e79919b2559128f2ff068f..ab39e5654a257f2dd61282e3d4d6405715a6d6a5 100644 --- a/panikdb/urls.py +++ b/panikdb/urls.py @@ -58,6 +58,8 @@ urlpatterns = patterns('', url(r'^accounts/logout/', 'django.contrib.auth.views.logout_then_login', name='logout'), url(r'^accounts/', include('registration.backends.default.urls')), + url(r'^combok/soundfiles/', 'panikombo.views.soundfiles'), + url(r'^admin/', include(admin.site.urls)), )