diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | debug_toolbar/settings.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/base.html | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index ea0b314..51f9ede 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "2.7" - "3.2" - "3.3" + - "3.4" env: - DJANGO_VERSION=1.4.10 - DJANGO_VERSION=1.5.5 @@ -14,6 +15,8 @@ matrix: env: DJANGO_VERSION=1.4.10 - python: "3.3" env: DJANGO_VERSION=1.4.10 + - python: "3.4" + env: DJANGO_VERSION=1.4.10 install: - pip install -e . - pip install Django==$DJANGO_VERSION django-discover-runner sqlparse diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py index 7ba7012..70268b6 100644 --- a/debug_toolbar/settings.py +++ b/debug_toolbar/settings.py @@ -130,7 +130,7 @@ else: if 'INTERCEPT_REDIRECTS' in USER_CONFIG: warnings.warn( "INTERCEPT_REDIRECTS is deprecated. Please use the " - "DISABLE_PANELS config in the" + "DISABLE_PANELS config in the " "DEBUG_TOOLBAR_CONFIG setting.", DeprecationWarning) if USER_CONFIG['INTERCEPT_REDIRECTS']: if 'debug_toolbar.panels.redirects.RedirectsPanel' \ diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 617b020..b8f72a8 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -61,10 +61,12 @@ <h3>{{ panel.title|safe }}</h3> </div> <div class="djDebugPanelContent"> + {% if toolbar.store_id %} <img src="{% static 'debug_toolbar/img/ajax-loader.gif' %}" alt="loading" class="loader" /> - <div class="scroll"> - {% if not toolbar.store_id %}{{ panel.content }}{% endif %} - </div> + <div class="scroll"></div> + {% else %} + <div class="scroll">{{ panel.content }}</div> + {% endif %} </div> </div> {% endif %} |