inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

django-forms-bootstrap -> django-bootstrap3

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

16
issue/templates/base.html
View file

@ -1,4 +1,5 @@
{% load staticfiles %} {% load staticfiles %}
{% load bootstrap3 %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -17,11 +18,11 @@
<title>{% block title %}PonyTracker{% endblock %}</title> <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"> <link href="{% static 'css/issue.css' %}" rel="stylesheet">
{% block css %}{% endblock %} {% block css %}{% endblock %}
<script src="{% static 'js/jquery.min.js' %}"></script> <script src="{% bootstrap_jquery_url %}"></script>
{% block js %}{% endblock %} {% block js %}{% endblock %}
{% block media %}{% endblock %} {% block media %}{% endblock %}
@ -89,14 +90,7 @@
<div class="row"> <div class="row">
{% if messages %} {% bootstrap_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 %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
@ -122,7 +116,7 @@
</div> <!-- /container --> </div> <!-- /container -->
<script src="{% static 'js/bootstrap.min.js' %}"></script> {% bootstrap_javascript %}
<script src="{% static 'js/confirm.js' %}"></script> <script src="{% static 'js/confirm.js' %}"></script>
{% block js_end %}{% endblock %} {% block js_end %}{% endblock %}
</body> </body>

4
issue/templates/issue/global_permission_edit.html
View file

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

1
issue/templates/issue/issue.html
View file

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

4
issue/templates/issue/issue_comment.html
View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load bootstrap_tags %} {% load bootstrap3 %}
{% 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|as_bootstrap }} {% bootstrap_form form %}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

4
issue/templates/issue/issue_edit.html
View file

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

4
issue/templates/issue/label_edit.html
View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load bootstrap_tags %} {% load bootstrap3 %}
{% 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|as_bootstrap }} {% bootstrap_form form %}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

4
issue/templates/issue/milestone_edit.html
View file

@ -1,6 +1,6 @@
{% extends 'issue/project.html' %} {% extends 'issue/project.html' %}
{% load bootstrap_tags %} {% load bootstrap3 %}
{% 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|as_bootstrap }} {% bootstrap_form form %}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

4
issue/templates/issue/project_add.html
View file

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

4
issue/templates/issue/project_edit.html
View file

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

4
issue/templates/issue/project_permission_edit.html
View file

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

4
issue/templates/issue/team_edit.html
View file

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

4
issue/templates/login.html
View file

@ -1,6 +1,6 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load bootstrap_tags %} {% load bootstrap3 %}
{% block content %} {% block content %}
@ -18,7 +18,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|as_bootstrap }} {% bootstrap_form form %}
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</form> </form>

22
ponytracker/settings.py
View file

@ -42,7 +42,7 @@ INSTALLED_APPS = (
'django_markdown', 'django_markdown',
'bootstrap3_datetime', 'bootstrap3_datetime',
'django_forms_bootstrap', 'bootstrap3',
'colorful', 'colorful',
'issue', 'issue',
) )
@ -129,3 +129,23 @@ EMAIL_HOST = 'smtp'
#FROM_ADDR = 'ponytracker@example.com' #FROM_ADDR = 'ponytracker@example.com'
BASE_URL = 'http://localhost:8000' 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,
}

2
requirements.txt
View file

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