add search_from and pagination tag

Author: ZhangBohan

adminlte/templates/adminlte/groups/index.html

@@ -4,7 +4,7 @@
 {% block content %}
     <form>
     <div class="box">
-        {% include 'adminlte/lib/_list_search_form.html' %}
+        {% search_form %}
 
         <div class="box-body">
             <table class="table table-bordered">
@@ -28,7 +28,7 @@
         </div>
         <!-- /.box-body -->
         <div class="box-footer clearfix">
-            {% include 'adminlte/lib/_pagination.html' %}
+            {% pagination %}
         </div>
     </div>
     </form>

adminlte/templates/adminlte/lib/_list_search_form.html

@@ -1,11 +1,9 @@
-{% if search != None %}
-    <div class="box-tools">
-        <div class="input-group input-group-sm">
-            <input type="text" name="search" value="{{ search }}" class="form-control pull-right" placeholder="Search">
+<div class="box-tools">
+    <div class="input-group input-group-sm">
+        <input type="text" name="search" value="{{ value }}" class="form-control pull-right" placeholder="{{ placeholder }}">
 
-            <div class="input-group-btn">
-                <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
-            </div>
+        <div class="input-group-btn">
+            <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
         </div>
     </div>
-{% endif %}
+</div>

adminlte/templates/adminlte/permissions/index.html

@@ -4,7 +4,7 @@
 {% block content %}
     <form id="listForm">
         <div class="box">
-            {% include 'adminlte/lib/_list_search_form.html' %}
+            {% search_form %}
 
             <div class="box-body">
                 <table class="table table-bordered dataTable">
@@ -32,7 +32,7 @@
             </div>
             <!-- /.box-body -->
             <div class="box-footer clearfix">
-                {% include 'adminlte/lib/_pagination.html' %}
+                {% pagination %}
             </div>
         </div>
     </form>

adminlte/templates/adminlte/user_groups/index.html

@@ -1,9 +1,10 @@
 {% extends 'adminlte/lib/base.html' %}
+{% load adminlte_extras %}
 
 {% block content %}
     <form>
     <div class="box">
-        {% include 'adminlte/lib/_list_search_form.html' %}
+        {% search_form %}
 
         <div class="box-body">
             <table class="table table-bordered">
@@ -25,7 +26,7 @@
         </div>
         <!-- /.box-body -->
         <div class="box-footer clearfix">
-            {% include 'adminlte/lib/_pagination.html' %}
+            {% pagination %}
         </div>
     </div>
     </form>

adminlte/templatetags/adminlte_extras.py

@@ -38,3 +38,13 @@ def confirm_btn(view_name, css_class='btn btn-danger', text="Delete", title="Are
 
     return mark_safe("""<button class="%s confirm-to-href-btn" data-title="%s" data-href="%s">%s</button>""" % (
         css_class, title, url, text))
+
+
+@register.inclusion_tag('adminlte/lib/_pagination.html', takes_context=True)
+def pagination(context):
+    return context
+
+
+@register.inclusion_tag('adminlte/lib/_list_search_form.html', takes_context=True)
+def search_form(context, placeholder='Search'):
+    return dict(value=context.get('search', ''), placeholder=placeholder)

examples/demo/page/templates/pages/index.html

@@ -1,4 +1,5 @@
 {% extends 'adminlte/lib/base.html' %}
+{% load adminlte_extras %}
 
 {% block content %}
     <div class="box">
@@ -20,7 +21,7 @@
         </div>
         <!-- /.box-body -->
         <div class="box-footer clearfix">
-            {% include 'adminlte/lib/_pagination.html' %}
+            {% pagination %}
         </div>
     </div>
 {% endblock %}

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-adminlte-admin',
-    version='0.4.9',
+    version='0.4.10',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',