diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 4861c0244..248cb4c4d 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -151,6 +151,7 @@ class ProtocoloForm(forms.Form): ('', 'Ambos')], widget=forms.RadioSelect( renderer=HorizontalRadioRenderer) + ) tipo_documento = forms.ModelChoiceField( diff --git a/static/js/app.js b/static/js/app.js index 19ef780c4..7f00d4398 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -1,33 +1,22 @@ tinymce.init({selector:'textarea'}); -$(document).foundation(); -$(document).ready(function(){ - - - $('.dateinput').fdatepicker({ - // TODO localize - format: 'dd/mm/yyyy', - language: 'pt', - endDate: '31/12/2100', - todayBtn: true - }); +function refreshDatePicker() { + $.datepicker.setDefaults($.datepicker.regional['pt-BR']); + $('.dateinput').datepicker(); +} +function refreshMask() { $('.telefone').mask("(99) 9999-9999", {placeholder:"(__) ____ -____"}); $('.cpf').mask("000.000.000-00", {placeholder:"___.___.___-__"}); $('.cep').mask("00000-000", {placeholder:"_____-___"}); $('.rg').mask("0.000.000", {placeholder:"_.___.___"}); $('.titulo_eleitor').mask("0000.0000.0000.0000", {placeholder:"____.____.____.____"}); $('.hora').mask("00:00", {placeholder:"hh:mm"}); - $('.hora_hms').mask("00:00:00", {placeholder:"hh:mm:ss"}); - - var href = location.href.split('?') - $('.masthead .sub-nav a').each(function() { - - if (href.length >= 1) { - if (href[0].endsWith($(this).attr('href'))) - $(this).parent().addClass('active') - } - }); + $('.hora_hms').mask("00:00:00", {placeholder:"hh:mm:ss"}); +} +$(document).ready(function(){ + refreshDatePicker(); + refreshMask(); }); diff --git a/templates/base.html b/templates/base.html index 8fff5ecea..5d4a6d9d9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,11 +18,10 @@ + {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} - - {% endblock %} @@ -220,6 +219,11 @@ + + + + +