Fixed generic popup code to work with Django 1.6