Commits

salvator committed 8d1d403 Draft Merge
  • Participants
  • Parent commits a7111ac, 9a96ab0

Comments (0)

Files changed (3)

File admintools_bootstrap/templates/admin/base.html

 {% block extrastyle %}{% endblock %}
 <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.css{% endblock %}" /><![endif]-->
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
-{#{% render_theming_css %}#}
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script>
 {% block extrahead %}{% endblock %}
 
 
 {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
 
+{% render_theming_css %}
+
 <script type="text/javascript">
 $(function(){
 
       <div class="container-fluid">
         {% block branding %}{% endblock %}
         {% block nav-global %}{% endblock %}
-        {% block search %}{% endblock %}
         {% if user.is_active and user.is_staff %}
         <ul class="nav pull-right">
           {% comment %}
             {% if title %}
               <h3 class="well page-top">
                 {% block object-tools %}{% endblock %}
+                {% block search %}{% endblock %}
                 {{ title }}
               </h3>
             {% endif %}
 </div>
 <!-- END Container -->
 
+{% block footer_scripts %}{% endblock %}
+
 </body>
 </html>

File admintools_bootstrap/templates/admin/search_form.html

 {% load adminmedia %}
 {% load i18n %}
 {% if cl.search_fields %}
-<form id="changelist-search" action="" method="get" class="navbar-search pull-left">
+<form id="changelist-search" action="" method="get">
 <input type="text" size="40" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" placeholder="{% trans "Search" %}" class="search-query" />
 {% if show_result_count %}
     <span class="small quiet search-results">{% blocktrans count cl.result_count as counter %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktrans %} (<a href="?{% if cl.is_popup %}pop=1{% endif %}">{% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}</a>)</span>

File admintools_bootstrap/templates/admintools_bootstrap/tabbed_change_form.html

   {% if errors %}
     <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 %}
+
+      {% for field in adminform.form.visible_fields %}
+        {% if field.errors %}
+          <br/>
+          <div class="field-error"><b>{{field.label}}</b><ul>
+            {% for err in field.errors %}
+            <li>{{ err }}</li>
+            {% endfor %}
+          </ul></div>
+        {% endif %}
+      {% endfor %}
+
       {{ adminform.form.non_field_errors }}
     </div>
   {% endif %}