django-forms-bootstrap -> django-bootstrap3

This commit is contained in:
Élie Bouttier 2014-08-18 20:17:17 -07:00
parent 8adeca3a3a
commit da619acc4c
14 changed files with 47 additions and 34 deletions

View file

@ -1,4 +1,5 @@
{% load staticfiles %}
{% load bootstrap3 %}
<!DOCTYPE html>
<html lang="en">
<head>
@ -17,11 +18,11 @@
<title>{% block title %}PonyTracker{% endblock %}</title>
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
{% bootstrap_css %}
<link href="{% static 'css/issue.css' %}" rel="stylesheet">
{% block css %}{% endblock %}
<script src="{% static 'js/jquery.min.js' %}"></script>
<script src="{% bootstrap_jquery_url %}"></script>
{% block js %}{% endblock %}
{% block media %}{% endblock %}
@ -89,14 +90,7 @@
<div class="row">
{% if messages %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }} alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ message }}
</div>
{% endfor %}
{% endif %}
{% bootstrap_messages %}
{% block content %}{% endblock %}
@ -122,7 +116,7 @@
</div> <!-- /container -->
<script src="{% static 'js/bootstrap.min.js' %}"></script>
{% bootstrap_javascript %}
<script src="{% static 'js/confirm.js' %}"></script>
{% block js_end %}{% endblock %}
</body>

View file

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

View file

@ -2,7 +2,6 @@
{% load humanize %}
{% load django_markdown %}
{% load bootstrap_tags %}
{% load issue_tags %}
{% block issuetab %} class="active"{% endblock %}

View file

@ -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 action="" method="post" role="form">
{{ form|as_bootstrap }}
{% bootstrap_form form %}
{% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button>
</form>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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,
}

View file

@ -1,5 +1,5 @@
django
django-markdown
django-colorful
git+git://github.com/bouttier/django-forms-bootstrap.git@master
django-bootstrap3
django-bootstrap3-datetimepicker