merge

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;
+}

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 @@
     </li>
     <li class="active">{% trans 'Change' %}</li>
   {% endif %}
+
 {% endblock breadcrumbs %}
 
 
 {% block content %}
 
+<div class="history_btn">
+  <a href="#" class="btn btn-info">History</a>
+</div>
+
 <div class="row-fluid">
   <div class="span12">
     <form method="post">
@@ -49,11 +54,13 @@
           <hr />
       {% endif %}
 
-
-      {% csrf_token %}
-      {{ form.as_p }}
-
+      <div class="change_form">
+        {% csrf_token %}
+        {{ form|crispy }}
       {% for formset in inlines %}
+      </div>
+
+      <div class="comments_form">
       <h4>{{ formset.model|model_verbose_name_plural|capfirst }}</h4>
       {{ formset.management_form }}
       <table class="table table-striped table-bordered">
@@ -83,6 +90,13 @@
       </table>
       {% endfor %}
 
+      <div class="add_comment">
+        <a href="#" class="btn">
+          <i class="icon-plus"></i>
+          Add another comment
+        </a>
+      </div>
+      
       {% if view.model_admin.save_on_bottom %}
         <hr/>
         {% if object %}
@@ -90,7 +104,6 @@
         {% endif %}
           {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
       {% endif %}
-
     </form>
   </div>
 </div>