3 files changed, 29 insertions, 5 deletions
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index fac4cfc3..19bad89b 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -93,7 +93,6 @@ INSTALLED_APPS = (
     'rpki.gui.cacheview',
     'rpki.gui.routeview',
     'south',
-    'crispy_forms'
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/rpkid/rpki/gui/app/templates/app/app_form.html b/rpkid/rpki/gui/app/templates/app/app_form.html
index 6b4b26b9..4688d726 100644
--- a/rpkid/rpki/gui/app/templates/app/app_form.html
+++ b/rpkid/rpki/gui/app/templates/app/app_form.html
@@ -1,15 +1,14 @@
 {% extends "app/app_base.html" %}
-{% load crispy_forms_tags %}
 
 {% block content %}
 <div class="page-header">
   <h1>{{ form_title }}</h1>
 </div>
 
-<form method='POST' action='{{ request.get_full_path }}'>
+<form method='POST' action='{{ request.get_full_path }}' class="form-horizontal">
   {% csrf_token %}
-  {{ form|crispy }}
-  <div class='form-actions'>
+  {% include "app/bootstrap_form.html" %}
+  <div class="form-actions">
     <input class='btn btn-primary' type='submit' value='Save'>
     <a class='btn' href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
   </div>
diff --git a/rpkid/rpki/gui/app/templates/app/bootstrap_form.html b/rpkid/rpki/gui/app/templates/app/bootstrap_form.html
new file mode 100644
index 00000000..935a43a4
--- /dev/null
+++ b/rpkid/rpki/gui/app/templates/app/bootstrap_form.html
@@ -0,0 +1,26 @@
+{% if form.non_field_errors %}
+<div class="alert alert-block alert-error">
+  {{ form.non_field_errors }}
+</div>
+{% endif %}
+
+{% for field in form %}
+
+{% if field.is_hidden %}
+{{ field }}
+{% else %}
+<div class="control-group {% if field.errors %}error{% endif %}">
+  <label class="control-label" for="field.html_name">{{ field.label }}</label>
+  <div class="controls">
+    {{ field }}
+    {% if field.help_text %}
+    <span class="help-inline">{{ field.help_text }}</span>
+    {% endif %}
+    {% if field.errors %}
+    <span class="help-inline">{{ field.errors }}</span>
+    {% endif %}
+  </div>
+</div>
+{% endif %}
+
+{% endfor %}