versao provisoria da sidenav

sigi/apps/convenios/admin.py

@@ -10,11 +10,8 @@ from sigi.apps.utils import queryset_ascii
 from sigi.apps.servidores.models import Servidor
 from sigi.apps.casas.admin import ConveniosInline, GerentesInterlegisFilter
 from sigi.apps.utils.mixins import CartExportReportMixin, LabeledResourse
-<<<<<<< HEAD
 from django_weasyprint.views import WeasyTemplateResponse
-=======
 from sigi.apps.utils.filters import DateRangeFilter
->>>>>>> 96ea3b8f2dd4c7380c7e59f4a0546e6c27b09ffe
 
 class ConvenioExportResourse(LabeledResourse):
     class Meta:

templates/admin/change_list.html

@@ -1,36 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls admin_static admin_list bootstrapped_goodies_tags %}
 
-{% block extrastyle %}
-  {{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
-  {% if cl.formset %}
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
-  {% endif %}
-  {% if cl.formset or action_form %}
-    {% url 'admin:jsi18n' as jsi18nurl %}
-    <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
-  {% endif %}
-  {{ media.css }}
-{% endblock %}
-
-{% block extrahead %}
-{{ block.super }}
-{{ media.js }}
-{% if action_form %}{% if actions_on_top or actions_on_bottom %}
-<script type="text/javascript">
-(function($) {
-    $(document).ready(function($) {
-        $("tr input.action-select").actions();
-    });
-})(django.jQuery);
-</script>
-{% endif %}{% endif %}
-{% endblock %}
-
-{% block bodyclass %}_change-list{% endblock %}
-
-{% block coltype %}flex{% endblock %}
 
 {% block object-tools %}
         <ul class="object-tools pull-left nav nav-pills">
@@ -60,62 +30,33 @@
         {% block search %}{% search_form cl %}{% endblock %}
     {% endblock %}
 
-{% block content %}
+{% block extrastyle %}
-{% block extra_search %}{% endblock %}
+  {{ block.super }}
-<form class="" id="changelist-form" action="" method="post"{% if cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
+  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
-
-{% if cl.formset.errors %}
-<div class="alert alert-danger">
-    <p class="errornote">
-        {% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
-    </p>
-    {{ cl.formset.non_form_errors }}
-</div>
-{% endif %}
-
-
-{% with app_name=cl.opts.module_name|lower|slugify %}
-    {% render_with_template_if_exist cl.opts.app_label|lower|add:"/admin_app_"|add:app_name|add:"_description.html" "" %}
-{% endwith %}
-
-{% if action_form and actions_on_top and cl.full_result_count %}
-<div class='pull-left'>{% admin_actions %}</div>
-{% endif %}
-
-<div id="content-main">
-    <div class="module{% if cl.has_filters %} filtered{% endif %}" id="_changelist">
-        {% block date_hierarchy %}
-            {% date_hierarchy cl %}
-        {% endblock %}
-
   {% if cl.formset %}
-            <div>{{ cl.formset.management_form }}</div>
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
   {% endif %}
-
+  {% if cl.formset or action_form %}
-        {% block result_list %}
+    {% url 'admin:jsi18n' as jsi18nurl %}
-            {% result_list cl %}
+    <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
-        {% endblock %}
-    </div>
-</div>
-{# {% if cl.formset and cl.result_count %} #}
-<div class="navbar navbar-default">
-    <div class="navbar-inner">
-        <div class="navbar-form pull-left">
-            {% if action_form and actions_on_bottom and cl.full_result_count %}
-                {% admin_actions %}
   {% endif %}
-        </div>
+  {{ media.css }}
-        <div class="navbar-form pull-right">
-            <input type="submit" name="_save" class="btn btn-primary default" value="{% trans 'Save' %}"/>
-        </div>
-    </div>
-</div>
-{# {% endif %} #}
-
-{% block pagination %}
-    {% pagination cl %}
 {% endblock %}
-</form>
+
+{% block extrahead %}
+{{ block.super }}
+{{ media.js }}
+{% if action_form %}{% if actions_on_top or actions_on_bottom %}
+<script type="text/javascript">
+(function($) {
+    $(document).ready(function($) {
+        $("tr input.action-select").actions();
+    });
+})(django.jQuery);
+</script>
+{% endif %}{% endif %}
 {% endblock %}
 
+{% block bodyclass %}_change-list{% endblock %}
 
+{% block coltype %}flex{% endblock %}