Commits

Dominique Guardiola committed 55e10ae

moving newer query AFTER form media so that the django.jQuery namespace is created safely before we load query 1.7.x

Comments (0)

Files changed (2)

admintools_bootstrap/templates/admin/base.html

     var name = windowname_to_id(win.name);
     var elem = document.getElementById(name);
     django_dismimssPopup(win, newId, newRepr);
-    $(elem).removeClass('chzn-done');
-    $('#' + name + '_chzn').remove();
-    $(elem).chosen();
+    //$(elem).removeClass('chzn-done');
+    //$('#' + name + '_chzn').remove();
+    //$(elem).chosen();
   }
 
   // menu search
     if (menu_search_visible) {
       $(this).twipsy('hide');
       $('#menu_search input').focus();
-    } 
+    }
   });
 
   $('fieldset label').addClass('control-label');
                     {% else %}
                         <a href="{{ root_path }}password_change/">
                     {% endif %}
-                    <i class="icon-lock"></i> 
+                    <i class="icon-lock"></i>
                     {% trans 'Change password' %}</a>
                   </li>
                   {% url admin:logout as logout_url %}
                     {% else %}
                         <a href="{{ root_path }}logout/">
                     {% endif %}
-                    <i class="icon-off"></i> 
+                    <i class="icon-off"></i>
                     {% trans 'Log out' %}</a>
                   </li>
               {% endblock %}

admintools_bootstrap/templates/admintools_bootstrap/tabbed_change_form.html

 {% load i18n admin_modify adminmedia %}
 {% load url from future %}
 
-{% block extrahead %}{{ block.super }}
+{% block extrahead %}
 {% url 'admin:jsi18n' as jsi18nurl %}
 <script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
 {{ media }}
+{{ block.super }}
 <script type="text/javascript" src="{{ STATIC_URL }}admintools_bootstrap/bootstrap/js/bootstrap-tab.js"></script>
 {% endblock %}
 
     <div class="alert alert-error{% if adminform.form.non_form_errors %} alert-block{% endif %}" data-alert="alert">
       {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
 
+{#{% repl pdb %}#}
       {% for field in adminform.form.visible_fields %}
         {% if field.errors %}
           <br/>