use django-forms-bootstrap instead of crispy

lighter and should works with python 3.2 out-of-the-box but still need a
patch to no longer depend of bootstrap doc's css (bs-callout)
This commit is contained in:
Élie Bouttier 2014-08-09 12:01:37 -07:00
parent 8de77be8f2
commit 0a9d0f91e0
10 changed files with 51 additions and 42 deletions

View file

@ -10,17 +10,16 @@ env:
install: install:
- if [[ $DJANGO == '1.6' ]]; then pip install django==1.6; fi - if [[ $DJANGO == '1.6' ]]; then pip install django==1.6; fi
- if [[ $DJANGO == '1.7' ]]; then pip install -e git+git://github.com/django/django.git@1.7c2#egg=django1.7rc2; fi - if [[ $DJANGO != '1.6' ]]; then pip install -e git+git://github.com/django/django.git@1.7c2#egg=django1.7rc2; fi
- pip install django-markdown - pip install django-markdown
- pip install django-colorful - pip install django-colorful
- if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install git+git://github.com/bouttier/django-crispy-forms@master; fi - pip install git+git://github.com/bouttier/django-forms-bootstrap.git@master
- if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install django-crispy-forms; fi
- pip install django-bootstrap3-datetimepicker - pip install django-bootstrap3-datetimepicker
- pip install coveralls - if [[ $DJANGO == '1.6' ]]; then pip install coveralls; fi
script: script:
- if [[ $DJANGO == '1.6' ]]; then coverage run --branch --source=issue --omit=issue/migrations/*.py manage.py test; fi - if [[ $DJANGO == '1.6' ]]; then coverage run --branch --source=issue --omit=issue/migrations/*.py manage.py test; fi
- if [[ $DJANGO == '1.7' ]]; then python manage.py test; fi - if [[ $DJANGO != '1.6' ]]; then python manage.py test; fi
after_success: after_success:
if [[ $DJANGO == '1.6' ]]; then coveralls; fi if [[ $DJANGO == '1.6' ]]; then coveralls; fi

View file

@ -1,6 +1,6 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block content %} {% block content %}
@ -15,11 +15,13 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="" method="post" role="form"> <div class="col-md-offset-3 col-md-6">
{{ form|crispy }} <form action="" method="post" role="form">
{% csrf_token %} {{ form|as_bootstrap }}
<button type="submit" class="btn btn-primary">Submit</button> {% csrf_token %}
</form> <button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block media %}{{ form.media }}{% endblock %} {% block media %}{{ form.media }}{% endblock %}
@ -9,7 +9,7 @@
{% block content %} {% block content %}
<form action="" method="post" role="form"> <form action="" method="post" role="form">
{{ form|crispy }} {{ form|as_bootstrap }}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block issuetab %} class="active"{% endblock %} {% block issuetab %} class="active"{% endblock %}
@ -30,11 +30,13 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="" method="post" role="form"> <div class="col-md-offset-2 col-md-8">
{{ form|crispy }} <form action="" method="post" role="form">
{% csrf_token %} {{ form|as_bootstrap }}
<button type="submit" class="btn btn-primary">Submit</button> {% csrf_token %}
</form> <button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block labeltab %} class="active"{% endblock %} {% block labeltab %} class="active"{% endblock %}
@ -24,7 +24,7 @@
<div class="panel-body"> <div class="panel-body">
<div class="col-md-offset-4 col-md-4"> <div class="col-md-offset-4 col-md-4">
<form action="" method="post" role="form"> <form action="" method="post" role="form">
{{ form|crispy }} {{ form|as_bootstrap }}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block milestonetab %} class="active"{% endblock %} {% block milestonetab %} class="active"{% endblock %}
@ -28,7 +28,7 @@
<div class="panel-body"> <div class="panel-body">
<div class="col-md-offset-4 col-md-4"> <div class="col-md-offset-4 col-md-4">
<form action="" method="post" role="form"> <form action="" method="post" role="form">
{{ form|crispy }} {{ form|as_bootstrap }}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

View file

@ -1,6 +1,6 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block content %} {% block content %}
@ -16,11 +16,13 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="" method="post" role="form"> <div class="col-md-offset-2 col-md-8">
{{ form|crispy }} <form action="" method="post" role="form">
{% csrf_token %} {{ form|as_bootstrap }}
<button type="submit" class="btn btn-primary">Submit</button> {% csrf_token %}
</form> <button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block content %} {% block content %}
@ -16,11 +16,13 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="" method="post" role="form"> <div class="col-md-offset-2 col-md-8">
{{ form|crispy }} <form action="" method="post" role="form">
{% csrf_token %} {{ form|as_bootstrap }}
<button type="submit" class="btn btn-primary">Submit</button> {% csrf_token %}
</form> <button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>

View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load crispy_forms_tags %} {% load bootstrap_tags %}
{% block permissiontab %} class="active"{% endblock %} {% block permissiontab %} class="active"{% endblock %}
@ -17,11 +17,13 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="" method="post" role="form"> <div class="col-md-offset-3 col-md-6">
{{ form|crispy }} <form action="" method="post" role="form">
{% csrf_token %} {{ form|as_bootstrap }}
<button type="submit" class="btn btn-primary">Submit</button> {% csrf_token %}
</form> <button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>

View file

@ -42,7 +42,7 @@ INSTALLED_APPS = (
'django_markdown', 'django_markdown',
'bootstrap3_datetime', 'bootstrap3_datetime',
'crispy_forms', 'django_forms_bootstrap',
'colorful', 'colorful',
'issue', 'issue',
) )