diff --git a/issue/templates/base.html b/issue/templates/base.html index f55d6e8..0d59794 100644 --- a/issue/templates/base.html +++ b/issue/templates/base.html @@ -1,4 +1,5 @@ {% load staticfiles %} +{% load bootstrap3 %} @@ -17,11 +18,11 @@ {% block title %}PonyTracker{% endblock %} - + {% bootstrap_css %} {% block css %}{% endblock %} - + {% block js %}{% endblock %} {% block media %}{% endblock %} @@ -89,14 +90,7 @@
- {% if messages %} - {% for message in messages %} -
- - {{ message }} -
- {% endfor %} - {% endif %} + {% bootstrap_messages %} {% block content %}{% endblock %} @@ -122,7 +116,7 @@
- + {% bootstrap_javascript %} {% block js_end %}{% endblock %} diff --git a/issue/templates/issue/global_permission_edit.html b/issue/templates/issue/global_permission_edit.html index 7f3f7f7..21fc207 100644 --- a/issue/templates/issue/global_permission_edit.html +++ b/issue/templates/issue/global_permission_edit.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block content %} @@ -17,7 +17,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/issue.html b/issue/templates/issue/issue.html index fa295db..63d2fd4 100644 --- a/issue/templates/issue/issue.html +++ b/issue/templates/issue/issue.html @@ -2,7 +2,6 @@ {% load humanize %} {% load django_markdown %} -{% load bootstrap_tags %} {% load issue_tags %} {% block issuetab %} class="active"{% endblock %} diff --git a/issue/templates/issue/issue_comment.html b/issue/templates/issue/issue_comment.html index a3ba96f..67d11fc 100644 --- a/issue/templates/issue/issue_comment.html +++ b/issue/templates/issue/issue_comment.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block media %}{{ form.media }}{% endblock %} @@ -9,7 +9,7 @@ {% block content %}
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/issue_edit.html b/issue/templates/issue/issue_edit.html index 0147dec..2d47039 100644 --- a/issue/templates/issue/issue_edit.html +++ b/issue/templates/issue/issue_edit.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block issuetab %} class="active"{% endblock %} @@ -32,7 +32,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/label_edit.html b/issue/templates/issue/label_edit.html index 14e6e9a..ab6c39e 100644 --- a/issue/templates/issue/label_edit.html +++ b/issue/templates/issue/label_edit.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block labeltab %} class="active"{% endblock %} @@ -24,7 +24,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/milestone_edit.html b/issue/templates/issue/milestone_edit.html index e3ba310..e60b201 100644 --- a/issue/templates/issue/milestone_edit.html +++ b/issue/templates/issue/milestone_edit.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block milestonetab %} class="active"{% endblock %} @@ -28,7 +28,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/project_add.html b/issue/templates/issue/project_add.html index d6bcf3d..2d9ac0c 100644 --- a/issue/templates/issue/project_add.html +++ b/issue/templates/issue/project_add.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block content %} @@ -18,7 +18,7 @@
- {{ form|as_bootstrap }} + {%bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/project_edit.html b/issue/templates/issue/project_edit.html index fa3f759..ca05aac 100644 --- a/issue/templates/issue/project_edit.html +++ b/issue/templates/issue/project_edit.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block content %} @@ -18,7 +18,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/project_permission_edit.html b/issue/templates/issue/project_permission_edit.html index 025e1c2..e6f647e 100644 --- a/issue/templates/issue/project_permission_edit.html +++ b/issue/templates/issue/project_permission_edit.html @@ -1,6 +1,6 @@ {% extends 'issue/project.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block permissiontab %} class="active"{% endblock %} @@ -19,7 +19,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/issue/team_edit.html b/issue/templates/issue/team_edit.html index 2ec5aa5..70c0149 100644 --- a/issue/templates/issue/team_edit.html +++ b/issue/templates/issue/team_edit.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block content %} @@ -26,7 +26,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/issue/templates/login.html b/issue/templates/login.html index 52b040b..18c3979 100644 --- a/issue/templates/login.html +++ b/issue/templates/login.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load bootstrap_tags %} +{% load bootstrap3 %} {% block content %} @@ -18,7 +18,7 @@
- {{ form|as_bootstrap }} + {% bootstrap_form form %} {% csrf_token %}
diff --git a/ponytracker/settings.py b/ponytracker/settings.py index bb23d4c..6dfa3f9 100644 --- a/ponytracker/settings.py +++ b/ponytracker/settings.py @@ -42,7 +42,7 @@ INSTALLED_APPS = ( 'django_markdown', 'bootstrap3_datetime', - 'django_forms_bootstrap', + 'bootstrap3', 'colorful', 'issue', ) @@ -129,3 +129,23 @@ EMAIL_HOST = 'smtp' #FROM_ADDR = 'ponytracker@example.com' BASE_URL = 'http://localhost:8000' + +BOOTSTRAP3 = { + + # The URL to the jQuery JavaScript file + #'jquery_url': '//code.jquery.com/jquery.min.js', + 'jquery_url': STATIC_URL + 'js/jquery.min.js', + + # The Bootstrap base URL + #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/', + 'base_url': STATIC_URL, + + # The complete URL to the Bootstrap CSS file (None means derive it from base_url) + 'css_url': None, + + # The complete URL to the Bootstrap CSS file (None means no theme) + 'theme_url': None, + + # The complete URL to the Bootstrap JavaScript file (None means derive it from base_url) + 'javascript_url': None, +} diff --git a/requirements.txt b/requirements.txt index 124cb24..17a2537 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ django django-markdown django-colorful -git+git://github.com/bouttier/django-forms-bootstrap.git@master +django-bootstrap3 django-bootstrap3-datetimepicker