Commits

Anonymous committed 1d554a7

moving search form out of navbar because it's unavailable in a popup window…
needs a bit of CSS to work like

#changelist-search{
right: 20px;
float: right;
padding-right: 10px;
}

span.small.quiet.search-results{
font: normal 0.5em sans-serif;
}

input#searchbar.search-query{
color: #000;
right: 20px;
height: 2.2em;
line-height: 1.1px;
}

  • Participants
  • Parent commits 31429d6

Comments (0)

Files changed (2)

admintools_bootstrap/templates/admin/base.html

       <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 %}

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>