Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adding BootstrapDateInput

  • Loading branch information...
commit a83fff715c46b5072a085b44817d007fbd263982 1 parent 27c1a38
@dyve authored
View
9 COMPONENTS
@@ -0,0 +1,9 @@
+Bootstrap (linked)
+Twitter
+http://twitter.github.com/bootstrap/
+Apache 2.0
+
+Bootstrap datepicker (included)
+Stefan Petre
+http://www.eyecon.ro/bootstrap-datepicker/
+Apache 2.0
View
1  README.md
@@ -62,3 +62,4 @@ Thanks
* to Twitter for building and releasing Bootstrap
* to the Django community for Django
* to the authors of django-bootstrap-form for the inspiration
+* to Stefan Petre
View
5 bootstrap_toolkit/static/bootstrap_toolkit/js/init_datepicker.js
@@ -0,0 +1,5 @@
+(function($){
+ $(function() {
+ $(".datepicker").datepicker({ format: "dd-mm-yyyy" })
+ })
+})(jQuery)
View
156 bootstrap_toolkit/static/datepicker/css/datepicker.css
@@ -0,0 +1,156 @@
+/*!
+* Datepicker for Bootstrap
+*
+* Copyright 2012 Stefan Petre
+* Licensed under the Apache License v2.0
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+*/
+.datepicker {
+top: 0;
+left: 0;
+padding: 4px;
+margin-top: 1px;
+-webkit-border-radius: 4px;
+-moz-border-radius: 4px;
+border-radius: 4px;
+/*.dow {
+border-top: 1px solid #ddd !important;
+}*/
+}
+.datepicker:before {
+content: '';
+display: inline-block;
+border-left: 7px solid transparent;
+border-right: 7px solid transparent;
+border-bottom: 7px solid #ccc;
+border-bottom-color: rgba(0, 0, 0, 0.2);
+position: absolute;
+top: -7px;
+left: 6px;
+}
+.datepicker:after {
+content: '';
+display: inline-block;
+border-left: 6px solid transparent;
+border-right: 6px solid transparent;
+border-bottom: 6px solid #ffffff;
+position: absolute;
+top: -6px;
+left: 7px;
+}
+.datepicker > div {
+display: none;
+}
+.datepicker table {
+width: 100%;
+margin: 0;
+}
+.datepicker td, .datepicker th {
+text-align: center;
+width: 20px;
+height: 20px;
+-webkit-border-radius: 4px;
+-moz-border-radius: 4px;
+border-radius: 4px;
+}
+.datepicker td.day:hover {
+background: #eeeeee;
+cursor: pointer;
+}
+.datepicker td.old, .datepicker td.new {
+color: #999999;
+}
+.datepicker td.active, .datepicker td.active:hover {
+background-color: #006dcc;
+background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+background-image: linear-gradient(top, #0088cc, #0044cc);
+background-repeat: repeat-x;
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+border-color: #0044cc #0044cc #002a80;
+border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+color: #fff;
+text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker td.active:hover,
+.datepicker td.active:hover:hover,
+.datepicker td.active:active,
+.datepicker td.active:hover:active,
+.datepicker td.active.active,
+.datepicker td.active:hover.active,
+.datepicker td.active.disabled,
+.datepicker td.active:hover.disabled,
+.datepicker td.active[disabled],
+.datepicker td.active:hover[disabled] {
+background-color: #0044cc;
+}
+.datepicker td.active:active,
+.datepicker td.active:hover:active,
+.datepicker td.active.active,
+.datepicker td.active:hover.active {
+background-color: #003399 \9;
+}
+.datepicker td span {
+display: block;
+width: 47px;
+height: 54px;
+line-height: 54px;
+float: left;
+margin: 2px;
+cursor: pointer;
+-webkit-border-radius: 4px;
+-moz-border-radius: 4px;
+border-radius: 4px;
+}
+.datepicker td span:hover {
+background: #eeeeee;
+}
+.datepicker td span.active {
+background-color: #006dcc;
+background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+background-image: linear-gradient(top, #0088cc, #0044cc);
+background-repeat: repeat-x;
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+border-color: #0044cc #0044cc #002a80;
+border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+color: #fff;
+text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker td span.active:hover,
+.datepicker td span.active:active,
+.datepicker td span.active.active,
+.datepicker td span.active.disabled,
+.datepicker td span.active[disabled] {
+background-color: #0044cc;
+}
+.datepicker td span.active:active, .datepicker td span.active.active {
+background-color: #003399 \9;
+}
+.datepicker td span.old {
+color: #999999;
+}
+.datepicker th.switch {
+width: 145px;
+}
+.datepicker thead tr:first-child th {
+cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover {
+background: #eeeeee;
+}
+.input-append.date .add-on i, .input-prepend.date .add-on i {
+display: block;
+cursor: pointer;
+width: 16px;
+height: 16px;
+}
View
401 bootstrap_toolkit/static/datepicker/js/bootstrap-datepicker.js
@@ -0,0 +1,401 @@
+/* =========================================================
+ * bootstrap-datepicker.js
+ * http://www.eyecon.ro/bootstrap-datepicker
+ * =========================================================
+ * Copyright 2012 Stefan Petre
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+!function( $ ) {
+
+ // Picker object
+
+ var Datepicker = function(element, options){
+ this.element = $(element);
+ this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy');
+ this.picker = $(DPGlobal.template)
+ .appendTo('body')
+ .on({
+ click: $.proxy(this.click, this),
+ mousedown: $.proxy(this.mousedown, this)
+ });
+ this.isInput = this.element.is('input');
+ this.component = this.element.is('.date') ? this.element.find('.add-on') : false;
+
+ if (this.isInput) {
+ this.element.on({
+ focus: $.proxy(this.show, this),
+ blur: $.proxy(this.hide, this),
+ keyup: $.proxy(this.update, this)
+ });
+ } else {
+ if (this.component){
+ this.component.on('click', $.proxy(this.show, this));
+ } else {
+ this.element.on('click', $.proxy(this.show, this));
+ }
+ }
+
+ this.viewMode = 0;
+ this.weekStart = options.weekStart||this.element.data('date-weekstart')||0;
+ this.weekEnd = this.weekStart == 0 ? 6 : this.weekStart - 1;
+ this.fillDow();
+ this.fillMonths();
+ this.update();
+ this.showMode();
+ };
+
+ Datepicker.prototype = {
+ constructor: Datepicker,
+
+ show: function(e) {
+ this.picker.show();
+ this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
+ this.place();
+ $(window).on('resize', $.proxy(this.place, this));
+ if (e ) {
+ e.stopPropagation();
+ e.preventDefault();
+ }
+ if (!this.isInput) {
+ $(document).on('mousedown', $.proxy(this.hide, this));
+ }
+ this.element.trigger({
+ type: 'show',
+ date: this.date
+ });
+ },
+
+ hide: function(){
+ this.picker.hide();
+ $(window).off('resize', this.place);
+ this.viewMode = 0;
+ this.showMode();
+ if (!this.isInput) {
+ $(document).off('mousedown', this.hide);
+ }
+ this.setValue();
+ this.element.trigger({
+ type: 'hide',
+ date: this.date
+ });
+ },
+
+ setValue: function() {
+ var formated = DPGlobal.formatDate(this.date, this.format);
+ if (!this.isInput) {
+ if (this.component){
+ this.element.find('input').prop('value', formated);
+ }
+ this.element.data('date', formated);
+ } else {
+ this.element.prop('value', formated);
+ }
+ },
+
+ place: function(){
+ var offset = this.component ? this.component.offset() : this.element.offset();
+ this.picker.css({
+ top: offset.top + this.height,
+ left: offset.left
+ });
+ },
+
+ update: function(){
+ this.date = DPGlobal.parseDate(
+ this.isInput ? this.element.prop('value') : this.element.data('date'),
+ this.format
+ );
+ this.viewDate = new Date(this.date);
+ this.fill();
+ },
+
+ fillDow: function(){
+ var dowCnt = this.weekStart;
+ var html = '<tr>';
+ while (dowCnt < this.weekStart + 7) {
+ html += '<th class="dow">'+DPGlobal.dates.daysMin[(dowCnt++)%7]+'</th>';
+ }
+ html += '</tr>';
+ this.picker.find('.datepicker-days thead').append(html);
+ },
+
+ fillMonths: function(){
+ var html = '';
+ var i = 0
+ while (i < 12) {
+ html += '<span class="month">'+DPGlobal.dates.monthsShort[i++]+'</span>';
+ }
+ this.picker.find('.datepicker-months td').append(html);
+ },
+
+ fill: function() {
+ var d = new Date(this.viewDate),
+ year = d.getFullYear(),
+ month = d.getMonth(),
+ currentDate = this.date.valueOf();
+ this.picker.find('.datepicker-days th:eq(1)')
+ .text(DPGlobal.dates.months[month]+' '+year);
+ var prevMonth = new Date(year, month-1, 28,0,0,0,0),
+ day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth());
+ prevMonth.setDate(day);
+ prevMonth.setDate(day - (prevMonth.getDay() - this.weekStart + 7)%7);
+ var nextMonth = new Date(prevMonth);
+ nextMonth.setDate(nextMonth.getDate() + 42);
+ nextMonth = nextMonth.valueOf();
+ html = [];
+ var clsName;
+ while(prevMonth.valueOf() < nextMonth) {
+ if (prevMonth.getDay() == this.weekStart) {
+ html.push('<tr>');
+ }
+ clsName = '';
+ if (prevMonth.getMonth() < month) {
+ clsName += ' old';
+ } else if (prevMonth.getMonth() > month) {
+ clsName += ' new';
+ }
+ if (prevMonth.valueOf() == currentDate) {
+ clsName += ' active';
+ }
+ html.push('<td class="day'+clsName+'">'+prevMonth.getDate() + '</td>');
+ if (prevMonth.getDay() == this.weekEnd) {
+ html.push('</tr>');
+ }
+ prevMonth.setDate(prevMonth.getDate()+1);
+ }
+ this.picker.find('.datepicker-days tbody').empty().append(html.join(''));
+ var currentYear = this.date.getFullYear();
+
+ var months = this.picker.find('.datepicker-months')
+ .find('th:eq(1)')
+ .text(year)
+ .end()
+ .find('span').removeClass('active');
+ if (currentYear == year) {
+ months.eq(this.date.getMonth()).addClass('active');
+ }
+
+ html = '';
+ year = parseInt(year/10, 10) * 10;
+ var yearCont = this.picker.find('.datepicker-years')
+ .find('th:eq(1)')
+ .text(year + '-' + (year + 9))
+ .end()
+ .find('td');
+ year -= 1;
+ for (var i = -1; i < 11; i++) {
+ html += '<span class="year'+(i == -1 || i == 10 ? ' old' : '')+(currentYear == year ? ' active' : '')+'">'+year+'</span>';
+ year += 1;
+ }
+ yearCont.html(html);
+ },
+
+ click: function(e) {
+ e.stopPropagation();
+ e.preventDefault();
+ var target = $(e.target).closest('span, td, th');
+ if (target.length == 1) {
+ switch(target[0].nodeName.toLowerCase()) {
+ case 'th':
+ switch(target[0].className) {
+ case 'switch':
+ this.showMode(1);
+ break;
+ case 'prev':
+ case 'next':
+ this.viewDate['set'+DPGlobal.modes[this.viewMode].navFnc].call(
+ this.viewDate,
+ this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) +
+ DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1)
+ );
+ this.fill();
+ break;
+ }
+ break;
+ case 'span':
+ if (target.is('.month')) {
+ var month = target.parent().find('span').index(target);
+ this.viewDate.setMonth(month);
+ } else {
+ var year = parseInt(target.text(), 10)||0;
+ this.viewDate.setFullYear(year);
+ }
+ this.showMode(-1);
+ this.fill();
+ break;
+ case 'td':
+ if (target.is('.day')){
+ var day = parseInt(target.text(), 10)||1;
+ var month = this.viewDate.getMonth();
+ if (target.is('.old')) {
+ month -= 1;
+ } else if (target.is('.new')) {
+ month += 1;
+ }
+ var year = this.viewDate.getFullYear();
+ this.date = new Date(year, month, day,0,0,0,0);
+ this.viewDate = new Date(year, month, day,0,0,0,0);
+ this.fill();
+ this.setValue();
+ this.element.trigger({
+ type: 'changeDate',
+ date: this.date
+ });
+ }
+ break;
+ }
+ }
+ },
+
+ mousedown: function(e){
+ e.stopPropagation();
+ e.preventDefault();
+ },
+
+ showMode: function(dir) {
+ if (dir) {
+ this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir));
+ }
+ this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
+ }
+ };
+
+ $.fn.datepicker = function ( option ) {
+ return this.each(function () {
+ var $this = $(this),
+ data = $this.data('datepicker'),
+ options = typeof option == 'object' && option;
+ if (!data) {
+ $this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options))));
+ }
+ if (typeof option == 'string') data[option]();
+ });
+ };
+
+ $.fn.datepicker.defaults = {
+ };
+ $.fn.datepicker.Constructor = Datepicker;
+
+ var DPGlobal = {
+ modes: [
+ {
+ clsName: 'days',
+ navFnc: 'Month',
+ navStep: 1
+ },
+ {
+ clsName: 'months',
+ navFnc: 'FullYear',
+ navStep: 1
+ },
+ {
+ clsName: 'years',
+ navFnc: 'FullYear',
+ navStep: 10
+ }],
+ dates:{
+ days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
+ daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+ daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
+ months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+ monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+ },
+ isLeapYear: function (year) {
+ return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0))
+ },
+ getDaysInMonth: function (year, month) {
+ return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
+ },
+ parseFormat: function(format){
+ var separator = format.match(/[.\/-].*?/),
+ parts = format.split(/\W+/);
+ if (!separator || !parts || parts.length == 0){
+ throw new Error("Invalid date format.");
+ }
+ return {separator: separator, parts: parts};
+ },
+ parseDate: function(date, format) {
+ var parts = date.split(format.separator),
+ date = new Date(1970, 1, 1, 0, 0, 0),
+ val;
+ if (parts.length == format.parts.length) {
+ for (var i=0, cnt = format.parts.length; i < cnt; i++) {
+ val = parseInt(parts[i], 10)||1;
+ switch(format.parts[i]) {
+ case 'dd':
+ case 'd':
+ date.setDate(val);
+ break;
+ case 'mm':
+ case 'm':
+ date.setMonth(val - 1);
+ break;
+ case 'yy':
+ date.setFullYear(2000 + val);
+ break;
+ case 'yyyy':
+ date.setFullYear(val);
+ break;
+ }
+ }
+ }
+ return date;
+ },
+ formatDate: function(date, format){
+ var val = {
+ d: date.getDate(),
+ m: date.getMonth() + 1,
+ yy: date.getFullYear().toString().substring(2),
+ yyyy: date.getFullYear()
+ };
+ val.dd = (val.d < 10 ? '0' : '') + val.d;
+ val.mm = (val.m < 10 ? '0' : '') + val.m;
+ var date = [];
+ for (var i=0, cnt = format.parts.length; i < cnt; i++) {
+ date.push(val[format.parts[i]]);
+ }
+ return date.join(format.separator);
+ },
+ headTemplate: '<thead>'+
+ '<tr>'+
+ '<th class="prev"><i class="icon-arrow-left"/></th>'+
+ '<th colspan="5" class="switch"></th>'+
+ '<th class="next"><i class="icon-arrow-right"/></th>'+
+ '</tr>'+
+ '</thead>',
+ contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>'
+ };
+ DPGlobal.template = '<div class="datepicker dropdown-menu">'+
+ '<div class="datepicker-days">'+
+ '<table class=" table-condensed">'+
+ DPGlobal.headTemplate+
+ '<tbody></tbody>'+
+ '</table>'+
+ '</div>'+
+ '<div class="datepicker-months">'+
+ '<table class="table-condensed">'+
+ DPGlobal.headTemplate+
+ DPGlobal.contTemplate+
+ '</table>'+
+ '</div>'+
+ '<div class="datepicker-years">'+
+ '<table class="table-condensed">'+
+ DPGlobal.headTemplate+
+ DPGlobal.contTemplate+
+ '</table>'+
+ '</div>'+
+ '</div>';
+
+}( window.jQuery )
View
122 bootstrap_toolkit/static/datepicker/less/datepicker.less
@@ -0,0 +1,122 @@
+/*!
+ * Datepicker for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+
+.datepicker {
+ top: 0;
+ left: 0;
+ padding: 4px;
+ margin-top: 1px;
+ .border-radius(4px);
+ &:before {
+ content: '';
+ display: inline-block;
+ border-left: 7px solid transparent;
+ border-right: 7px solid transparent;
+ border-bottom: 7px solid #ccc;
+ border-bottom-color: rgba(0,0,0,.2);
+ position: absolute;
+ top: -7px;
+ left: 6px;
+ }
+ &:after {
+ content: '';
+ display: inline-block;
+ border-left: 6px solid transparent;
+ border-right: 6px solid transparent;
+ border-bottom: 6px solid @white;
+ position: absolute;
+ top: -6px;
+ left: 7px;
+ }
+ >div {
+ display: none;
+ }
+ &.days div.datepicker-days {
+ display: block;
+ }
+ &.months div.datepicker-months {
+ display: block;
+ }
+ &.years div.datepicker-years {
+ display: block;
+ }
+ table{
+ width: 100%;
+ margin: 0;
+ }
+ td,
+ th{
+ text-align: center;
+ width: 20px;
+ height: 20px;
+ .border-radius(4px);
+ }
+ td {
+ &.day:hover {
+ background: @grayLighter;
+ cursor: pointer;
+ }
+ &.old,
+ &.new {
+ color: @grayLight;
+ }
+ &.active,
+ &.active:hover {
+ .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
+ color: #fff;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ }
+ span {
+ display: block;
+ width: 47px;
+ height: 54px;
+ line-height: 54px;
+ float: left;
+ margin: 2px;
+ cursor: pointer;
+ .border-radius(4px);
+ &:hover {
+ background: @grayLighter;
+ }
+ &.active {
+ .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
+ color: #fff;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ }
+ &.old {
+ color: @grayLight;
+ }
+ }
+ }
+
+ th.switch {
+ width: 145px;
+ }
+
+ thead tr:first-child th {
+ cursor: pointer;
+ &:hover{
+ background: @grayLighter;
+ }
+ }
+ /*.dow {
+ border-top: 1px solid #ddd !important;
+ }*/
+}
+.input-append,
+.input-prepend {
+ &.date {
+ .add-on i {
+ display: block;
+ cursor: pointer;
+ width: 16px;
+ height: 16px;
+ }
+ }
+}
View
6 bootstrap_toolkit/templatetags/bootstrap_toolkit.py
@@ -5,12 +5,6 @@
from django import template
from django.conf import settings
-BOOTSTRAP_DEFAULT_VERSION = '2.0.1'
-
-BOOTSTRAP_VERSION = getattr(settings, 'BOOTSTRAP_VERSION',
- BOOTSTRAP_DEFAULT_VERSION
-)
-
BOOTSTRAP_BASE_URL = getattr(settings, 'BOOTSTRAP_BASE_URL',
'http://twitter.github.com/bootstrap/assets/'
)
View
1  bootstrap_toolkit/urls.py
@@ -0,0 +1 @@
+from templatetags.bootstrap_toolkit import BOOTSTRAP_BASE_URL, BOOTSTRAP_JS_BASE_URL, BOOTSTRAP_CSS_BASE_URL, BOOTSTRAP_CSS_URL
View
42 bootstrap_toolkit/widgets.py
@@ -0,0 +1,42 @@
+from django import forms
+from django.conf import settings
+from django.utils.safestring import mark_safe
+from urls import *
+
+def add_to_css_class(classes, new_class):
+ new_class = new_class.strip()
+ if new_class:
+ # Turn string into list of classes
+ classes = classes.split(" ")
+ # Strip whitespace
+ classes = [c.strip() for c in classes]
+ # Remove empty elements
+ classes = filter(None, classes)
+ # Test for existing
+ if not new_class in classes:
+ classes.append(new_class)
+ # Convert to string
+ classes = u" ".join(classes)
+ return classes
+
+class BootstrapDateInput(forms.TextInput):
+
+ class Media:
+ js = (
+ settings.STATIC_URL + 'datepicker/js/bootstrap-datepicker.js',
+ settings.STATIC_URL + 'bootstrap_toolkit/js/init_datepicker.js',
+ )
+ css = {
+ 'screen': (
+ settings.STATIC_URL + 'datepicker/css/datepicker.css',
+ )
+ }
+
+ def render(self, name, value, attrs=None):
+ if not attrs:
+ attrs = {}
+ if 'class' in attrs:
+ attrs['class'] = add_to_css_class(attrs['class'], 'datepicker')
+ else:
+ attrs['class'] = 'datepicker'
+ return super(BootstrapDateInput, self).render(name, value, attrs)
View
2  setup.py
@@ -2,7 +2,7 @@
setup(
name='django-bootstrap-toolkit',
- version='2.4.0',
+ version='2.5.0',
url='https://github.com/dyve/django-bootstrap-toolkit',
author='Dylan Verheul',
author_email='dylan@dyve.net',
View
6 test_project/test_bootstrap/forms.py
@@ -1,5 +1,6 @@
from django import forms
from django.contrib.auth.models import User
+from bootstrap_toolkit.widgets import BootstrapDateInput
class TestForm(forms.Form):
title = forms.CharField(
@@ -67,4 +68,7 @@ class TestInlineForm(forms.Form):
('active', 'active'),
('inactive', 'inactive')
), initial='all')
- mine = forms.BooleanField(required=False, label='Mine only', initial=False)
+ mine = forms.BooleanField(required=False, label='Mine only', initial=False)
+
+class WidgetsForm(forms.Form):
+ date = forms.DateField(widget=BootstrapDateInput)
View
1  test_project/test_bootstrap/templates/base.html
@@ -17,6 +17,7 @@
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
{% bootstrap_javascript_tag "dropdown" %}
+ {% block extra_head %}{% endblock %}
</head>
<body>
View
4 test_project/test_bootstrap/templates/form.html
@@ -2,6 +2,10 @@
{% load bootstrap_toolkit %}
+{% block extra_head %}
+ {{ form.media }}
+{% endblock %}
+
{% block content %}
<h1>This is a <em>{{ layout }}</em> Django form, bootstrapped</h1>
View
10 test_project/test_bootstrap/views.py
@@ -1,7 +1,7 @@
from django.shortcuts import render_to_response
from django.template.context import RequestContext
from test_bootstrap.forms import TestForm
-from test_project.test_bootstrap.forms import TestModelForm, TestInlineForm
+from test_project.test_bootstrap.forms import TestModelForm, TestInlineForm, WidgetsForm
def test_form_with_template(request):
layout = request.GET.get('layout')
@@ -60,4 +60,12 @@ def test_tabs(request):
return render_to_response('tabs.html', RequestContext(request, {
'tabs': tabs,
'layout': layout,
+ }))
+
+def test_widgets(request):
+ layout = request.GET.get('layout', 'vertical')
+ form = WidgetsForm()
+ return render_to_response('form.html', RequestContext(request, {
+ 'form': form,
+ 'layout': layout,
}))
View
1  test_project/urls.py
@@ -22,4 +22,5 @@
(r'^form_template$', 'test_bootstrap.views.test_form_with_template'),
(r'^form_inline$', 'test_bootstrap.views.test_form_inline'),
(r'^tabs$', 'test_bootstrap.views.test_tabs', {}, "tabs"),
+ (r'^widgets$', 'test_bootstrap.views.test_widgets', {}, "widgets"),
)
Please sign in to comment.
Something went wrong with that request. Please try again.