diff --git a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css index 1afca49..aa903b8 100644 --- a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css +++ b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css @@ -24,3 +24,57 @@ .space-below { margin-bottom: 10px; } + + +.history_btn { + float: right; + margin-bottom: 10px; + margin-right: 3px; +} + +.change_form { + border: 1px solid #C6BCBC; + border-radius: 5px; + height: 360px; +} + +label { + float: left; + margin-right : 40px; + font-weight: bold; +} + +p { + margin-bottom: 30px; +} + +.checkbox { + +} + +.comments_form { + clear: both; + margin-top: 50px; +} + +.control-group { + /*margin-bottom: 20px;*/ + padding-top: 10px; + padding-left: 20px; + border-bottom: 1px solid #CCCCC1; +} + +input { + width: 400px; + margin-left: 5px; +} +.textarea { + width: 800px; +} +textarea { + width: 800px; +} + +.add_comment { + height: 20px; +} \ No newline at end of file diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html index 8ceb6e5..ba85b57 100644 --- a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html +++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html @@ -1,6 +1,6 @@ {% extends "djadmin2/bootstrap/base.html" %} -{% load admin2_tags i18n %} +{% load admin2_tags i18n crispy_forms_tags %} {# Translators : examples : Add post, Change object #} {% block title %}{% blocktrans with action=action model_name=model_name %}{{ action_name }} {{ model_name }}{% endblocktrans %}{% endblock title %} @@ -30,11 +30,16 @@
  • {% trans 'Change' %}
  • {% endif %} + {% endblock breadcrumbs %} {% block content %} +
    + History +
    +
    @@ -49,11 +54,13 @@
    {% endif %} - - {% csrf_token %} - {{ form.as_p }} - +
    + {% csrf_token %} + {{ form|crispy }} {% for formset in inlines %} +
    + +

    {{ formset.model|model_verbose_name_plural|capfirst }}

    {{ formset.management_form }} @@ -83,6 +90,13 @@
    {% endfor %} + + {% if view.model_admin.save_on_bottom %}
    {% if object %} @@ -90,7 +104,6 @@ {% endif %} {% include "djadmin2/bootstrap/includes/save_buttons.html" %} {% endif %} -