beautiful_scaffold 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 0.3.4
+
+* bugfix
+  * Show number element in table (i18n bug)
+  * Improve translation (keep manual translation and check previous translated string)
+  * alert-error -> alert-danger (bootstrap 3)
+  * Insert field to search-and-filter div before the accordion panel
+  * Columns and sort in table fixed (2 commits)
+
 == 0.3.3
 
 * enhancement

data/beautiful_scaffold.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "0.3.3"
+  s.version     = "0.3.4"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_devisecancan_generator.rb

@@ -39,7 +39,7 @@ class BeautifulDevisecancanGenerator < Rails::Generators::Base
 
 
     # Limited access (Must be commented if use cancan)
-    inject_into_file("app/controllers/beautiful_controller.rb","before_filter :authenticate_#{model}!, :except => [:dashboard]", :after => 'layout "beautiful_layout"' + "\n")
+    inject_into_file("app/controllers/beautiful_controller.rb","before_action :authenticate_#{model}!, :except => [:dashboard]", :after => 'layout "beautiful_layout"' + "\n")
 
     # Custom redirect
     inject_into_file("app/controllers/application_controller.rb","
@@ -123,6 +123,6 @@ class BeautifulDevisecancanGenerator < Rails::Generators::Base
   ", :after => "class ApplicationController < ActionController::Base\n")
 
     # Access controlled by CanCan (in beautiful_scaffold)
-    inject_into_file("app/controllers/application_controller.rb", "#", :before => "before_filter :authenticate_#{model}!, :except => [:dashboard]")
+    inject_into_file("app/controllers/application_controller.rb", "#", :before => "before_action :authenticate_#{model}!, :except => [:dashboard]")
   end
 end

data/lib/generators/beautiful_locale_generator.rb

@@ -60,12 +60,20 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
     begin
       hi18n                                   = YAML.load_file(filepath)
     rescue
+      puts "Error loading locale file : #{filepath}"
     end
+
     hi18n                                 ||= { name.downcase => {} }
     hi18n[name.downcase]                  ||= { 'app' => {} }
     hi18n[name.downcase]['app']           ||= { 'models' => {} }
     hi18n[name.downcase]['app']['models'] ||= {}
 
+    # Feed data already translated
+    hi18n[name.downcase]['app']['models'].each{ |modelname,hshtranslations|
+      hshtranslations['bs_attributes'].each{ |attr, translated_attr|
+        already_processed[name.downcase][attr] = translated_attr
+      }
+    }
 
     Dir.glob("app/models/**/*").each { |model_file|
       puts model_file
@@ -79,37 +87,42 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
         next
       end
 
+      newmodel = !hi18n[name.downcase]['app']['models'].has_key?(model)
+
       hi18n[name.downcase]['app']['models'][model] ||= {
           'bs_caption'            => model,
           'bs_caption_plural'     => model.pluralize,
           'bs_attributes'         => {},
       }
 
-      begin
-        bs_caption = translate_string(name.downcase, model)
-      rescue
-        bs_caption = model
-      end
-      hi18n[name.downcase]['app']['models'][model]['bs_caption'] = bs_caption
-      begin
-        bs_caption_plural = translate_string(name.downcase, model.pluralize)
-      rescue
-        bs_caption_plural = model.pluralize
+      if newmodel then
+        bs_caption          = (begin translate_string(name.downcase, model) rescue model end)
+        bs_caption_plural   = (begin translate_string(name.downcase, model.pluralize) rescue model.pluralize end)
+
+        hi18n[name.downcase]['app']['models'][model]['bs_caption'] = bs_caption
+        hi18n[name.downcase]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
       end
-      hi18n[name.downcase]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
+
       hi18n[name.downcase]['app']['models'][model]['bs_attributes'] ||= {}
 
       sorted_attr.each { |k|
-        if already_processed[name.downcase][k].nil? then
-          begin
-            attr_translate = translate_string(name.downcase, k)
-            already_processed[name.downcase][k] = attr_translate
-          rescue
-            puts "Plantage translate API"
-            attr_translate = k
+        # Si pas déjà renseigné
+        if hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k].blank? then
+          # Si pas déjà traduit
+          if already_processed[name.downcase][k].nil? then
+            begin
+              attr_translate = translate_string(name.downcase, k)
+              already_processed[name.downcase][k] = attr_translate
+            rescue
+              puts "Plantage translate API"
+              attr_translate = k
+            end
+          else
+            attr_translate = already_processed[name.downcase][k]
           end
         else
-          attr_translate = already_processed[name.downcase][k]
+          # Récupère l'attribut traduit
+          attr_translate = hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k]
         end
 
         hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k] = attr_translate

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -157,17 +157,20 @@ module BeautifulScaffoldCommonMethods
 
   def require_gems
     # for jquery-ui add "2.3.0" version for jquery-rails
-    say_status("Warning", "Set 2.0.1 version for jquery-rails (for a good compatibility with beautiful_scaffold)", :yellow)
+    #say_status("Warning", "Set 2.0.1 version for jquery-rails (for a good compatibility with beautiful_scaffold)", :yellow)
 
+    gem('less-rails', :github => "CQQL/less-rails", :branch => 'less-2.5')
     gem('will_paginate')
-    gem('ransack', :github => 'ernie/ransack', :branch => 'rails-4')
-    gem('prawn', '1.0.0.rc2')
+    gem('ransack', :github => 'activerecord-hackery/ransack', :branch => 'rails-4.1')
+    gem('polyamorous', :github => 'activerecord-hackery/polyamorous')
+    gem('jquery-ui-rails')
+    gem('prawn', '1.0.0')
     gem('RedCloth')
     gem('bb-ruby')
     gem('bluecloth')
     gem('rdiscount')
     gem('sanitize')
-    gem('twitter-bootstrap-rails')
+    gem('twitter-bootstrap-rails', :github => 'seyhunak/twitter-bootstrap-rails', :branch => 'bootstrap3')
     gem('chardinjs-rails')
   end
 

data/lib/generators/beautiful_scaffold_generator.rb

@@ -91,7 +91,11 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     dir_image = "app/assets/images"
     directory dir_image, dir_image
 
-    generate("bootstrap:install","static")
+    # Old method
+    #generate("bootstrap:install","static")
+    # New method
+    copy_file "#{stylesheetspath}bootstrap_and_overrides.css.less",
+              "#{stylesheetspath}bootstrap_and_overrides.css.less"
   end
   
   def generate_layout
@@ -205,7 +209,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def install_willpaginate_renderer_for_bootstrap
-    copy_file  "app/initializers/link_renderer.rb", "config/initializers/beautiful_helper.rb"
+    copy_file  "app/initializers/link_renderer.rb", "config/initializers/link_renderer.rb"
   end
 
   def routes

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -1,13 +1,7 @@
 //= require jquery
-//= require jquery-ui
+//= require jquery.ui.all
 //= require jquery_ujs
-//= require twitter/bootstrap/bootstrap-transition
-//= require twitter/bootstrap/bootstrap-alert
-//= require twitter/bootstrap/bootstrap-modal
-//= require twitter/bootstrap/bootstrap-button
-//= require twitter/bootstrap/bootstrap-collapse
-//= require twitter/bootstrap/bootstrap-dropdown
-//= require twitter/bootstrap/bootstrap-tooltip
+//= require twitter/bootstrap
 //= require jquery.livequery
 //= require turbolinks
 //= require a-wysihtml5-0.3.0.min

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -4,7 +4,7 @@ function bs_init(){
     $('.select-richtext').click(function(){
         $('.label-richtext-type[for=' + $(this).attr('id') + ']').trigger('click');
     });
-    $('.label-richtext-type').live("click", function(){
+    $(document).on("click", '.label-richtext-type', function(){
         elt = $('#' + $(this).attr('for'));
         newSet = elt.val();
         idspleditor = elt.attr('data-spleditor');
@@ -69,12 +69,12 @@ function bs_init(){
     $('.color').colorpicker({format: 'rgba'});
 
     // Processing
-    $('#checkall').click(function(){
+    $(document).on('click', '#checkall', function(){
         $('.cbbatch').attr('checked', ($(this).attr('checked') != undefined));
     });
 
     // Filter columns
-    $('#filter-columns').on('click', function(){
+    $(document).on('click', '#filter-columns', function(){
         var return_json = [];
         $.each($('input[name^="field"]:checked'), function(index, value) {
             return_json.push($(value).val());
@@ -84,20 +84,20 @@ function bs_init(){
             url: url,
             data: { 'fields' : return_json },
             success: function(data) {
-                $('table.table th[class^="col"], table.table td[class^="col"]').css('display', 'none');
+                $('table.table th[class^="bs-col"], table.table td[class^="bs-col"]').css('display', 'none');
                 $.each(return_json, function(index, value) {
-                    $('table.table th.col-' + value + ', table.table td.col-' + value).css('display', 'table-cell');
+                    $('table.table th.bs-col-' + value + ', table.table td.bs-col-' + value).css('display', 'table-cell');
                 });
-                $('div[class^="col"]').css('display', 'none');
+                $('div[class^="bs-col"]').css('display', 'none');
                 $.each(return_json, function(index, value) {
-                    $('div.col-' + value).css('display', 'inline');
+                    $('div.bs-col-' + value).css('display', 'inline');
                 });
                 $('#modal-columns').modal('hide');
             }
         });
         return false;
     });
-    $('#cancel-filter-columns').on('click', function(){
+    $(document).on('click', '#cancel-filter-columns', function(){
         $('#modal-columns').modal('hide');
         return false;
     });
@@ -148,14 +148,14 @@ function bs_init(){
     });
 
     // Chardinjs (overlay instructions)
-    $(".bs-chardinjs").on("click", function(){
+    $(document).on("click", ".bs-chardinjs", function(){
         var selector = $(this).attr("data-selector");
         $(selector).chardinJs('toggle');
         return false;
     });
 
     // Add Error Form style with bootstrap
-    $("div.control-group>div.field_with_errors").parent().addClass("error");
+    $("div.form-group>div.field_with_errors").parent().addClass("has-error");
     $("#error_explanation").addClass("text-error");
 
     // Collapse without IDS (next)
@@ -167,7 +167,7 @@ function bs_init(){
 
     // Mass inserting set focus
     $(function() {
-        var elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
+        var elt = $('form.mass-inserting div[style*="inline"][class*="bs-col"] input').first();
         if($('form.mass-inserting').hasClass('setfocus')){
             elt.focus();
         }

data/lib/generators/templates/app/assets/javascripts/bootstrap-colorpicker.js

@@ -135,7 +135,7 @@
 		var format = options.format||this.element.data('color-format')||'hex';
 		this.format = CPGlobal.translateFormats[format];
 		this.isInput = this.element.is('input');
-		this.component = this.element.is('.color') ? this.element.find('.add-on') : false;
+		this.component = this.element.is('.color') ? this.element.find('.input-group-addon') : false;
 		
 		this.picker = $(CPGlobal.template)
 							.appendTo('body')

data/lib/generators/templates/app/assets/javascripts/bootstrap-datepicker.js

@@ -22,56 +22,56 @@
 
 	// Picker object
 
-	var Datepicker = function(element, options){
-		this.element = $(element);
-		this.language = options.language||this.element.data('date-language')||"en";
-		this.language = this.language in dates ? this.language : "en";
-		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.component && this.component.length === 0)
-			this.component = false;
-
-		if (this.isInput) {
-			this.element.on({
-				focus: $.proxy(this.show, this),
-				blur: $.proxy(this._hide, this),
-				keyup: $.proxy(this.update, this),
-				keydown: $.proxy(this.keydown, this)
-			});
-		} else {
-			if (this.component){
-				// For components that are not readonly, allow keyboard nav
-				this.element.find('input').on({
-					focus: $.proxy(this.show, this),
-					blur: $.proxy(this._hide, this),
-					keyup: $.proxy(this.update, this),
-					keydown: $.proxy(this.keydown, this)
-				});
-
-				this.component.on('click', $.proxy(this.show, this));
-				var element = this.element.find('input');
-				element.on({
-					blur: $.proxy(this._hide, this)
-				})
-			} else {
-				this.element.on('click', $.proxy(this.show, this));
-			}
-		}
-
-		this.autoclose = false;
-		if ('autoclose' in options) {
-			this.autoclose = options.autoclose;
-		} else if ('dateAutoclose' in this.element.data()) {
-			this.autoclose = this.element.data('date-autoclose');
-		}
-        
+    var Datepicker = function(element, options){
+        this.element = $(element);
+        this.language = options.language||this.element.data('date-language')||"en";
+        this.language = this.language in dates ? this.language : "en";
+        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('.input-group-addon') : false;
+        if(this.component && this.component.length === 0)
+            this.component = false;
+
+        if (this.isInput) {
+            this.element.on({
+                focus: $.proxy(this.show, this),
+                blur: $.proxy(this._hide, this),
+                keyup: $.proxy(this.update, this),
+                keydown: $.proxy(this.keydown, this)
+            });
+        } else {
+            if (this.component){
+                // For components that are not readonly, allow keyboard nav
+                this.element.find('input').on({
+                    focus: $.proxy(this.show, this),
+                    blur: $.proxy(this._hide, this),
+                    keyup: $.proxy(this.update, this),
+                    keydown: $.proxy(this.keydown, this)
+                });
+
+                this.component.on('click', $.proxy(this.show, this));
+                var element = this.element.find('input');
+                element.on({
+                    blur: $.proxy(this._hide, this)
+                })
+            } else {
+                this.element.on('click', $.proxy(this.show, this));
+            }
+        }
+
+        this.autoclose = false;
+        if ('autoclose' in options) {
+            this.autoclose = options.autoclose;
+        } else if ('dateAutoclose' in this.element.data()) {
+            this.autoclose = this.element.data('date-autoclose');
+        }
+
         this.keyboardNavigation = true;
         if ('keyboardNavigation' in options) {
             this.keyboardNavigation = options.keyboardNavigation;
@@ -79,756 +79,756 @@
             this.keyboardNavigation = this.element.data('date-keyboard-navigation');
         }
 
-		switch(options.startView || this.element.data('date-start-view')){
-			case 2:
-			case 'decade':
-				this.viewMode = this.startViewMode = 2;
-				break;
-			case 1:
-			case 'year':
-				this.viewMode = this.startViewMode = 1;
-				break;
-			case 0:
-			case 'month':
-			default:
-				this.viewMode = this.startViewMode = 0;
-				break;
-		}
-
-		this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
-		this.weekEnd = ((this.weekStart + 6) % 7);
-		this.startDate = -Infinity;
-		this.endDate = Infinity;
-		this.setStartDate(options.startDate||this.element.data('date-startdate'));
-		this.setEndDate(options.endDate||this.element.data('date-enddate'));
-		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.update();
-			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(e){
-			// When going from the input to the picker, IE handles the blur/click
-			// events differently than other browsers, in such a way that the blur
-			// event triggers a hide before the click event can stop propagation.
-			if ($.browser.msie) {
-				var t = this, args = arguments;
-
-				function cancel_hide(){
-					clearTimeout(hide_timeout);
-					e.target.focus();
-					t.picker.off('click', cancel_hide);
-				}
-
-				function do_hide(){
-					t.hide.apply(t, args);
-					t.picker.off('click', cancel_hide);
-				}
-
-				this.picker.on('click', cancel_hide);
-				var hide_timeout = setTimeout(do_hide, 100);
-			} else {
-				return this.hide.apply(this, arguments);
-			}
-		},
-
-		hide: function(e){
-			this.picker.hide();
-			$(window).off('resize', this.place);
-			this.viewMode = this.startViewMode;
-			this.showMode();
-			if (!this.isInput) {
-				$(document).off('mousedown', this.hide);
-			}
-			if (e && e.currentTarget.value)
-				this.setValue();
-			this.element.trigger({
-				type: 'hide',
-				date: this.date
-			});
-		},
-
-		setValue: function() {
-			var formatted = DPGlobal.formatDate(this.date, this.format, this.language);
-			if (!this.isInput) {
-				if (this.component){
-					this.element.find('input').prop('value', formatted);
-				}
-				this.element.data('date', formatted);
-			} else {
-				this.element.prop('value', formatted);
-			}
-		},
-
-		setStartDate: function(startDate){
-			this.startDate = startDate||-Infinity;
-			if (this.startDate !== -Infinity) {
-				this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		setEndDate: function(endDate){
-			this.endDate = endDate||Infinity;
-			if (this.endDate !== Infinity) {
-				this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language);
-			}
-			this.update();
-			this.updateNavArrows();
-		},
-
-		place: function(){
-			var zIndex = parseInt(this.element.parents().filter(function() {
-                          	return $(this).css('z-index') != 'auto';
-                        }).first().css('z-index'))+10;		
-			var offset = this.component ? this.component.offset() : this.element.offset();
-			this.picker.css({
-				top: offset.top + this.height,
-				left: offset.left,
-				zIndex: zIndex
-			});
-		},
-
-		update: function(){
-			this.date = DPGlobal.parseDate(
-				this.isInput ? this.element.prop('value') : this.element.data('date') || this.element.find('input').prop('value'),
-				this.format, this.language
-			);
-			if (this.date < this.startDate) {
-				this.viewDate = new Date(this.startDate);
-			} else if (this.date > this.endDate) {
-				this.viewDate = new Date(this.endDate);
-			} else {
-				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">'+dates[this.language].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">'+dates[this.language].monthsShort[i++]+'</span>';
-			}
-			this.picker.find('.datepicker-months td').html(html);
-		},
-
-		fill: function() {
-			var d = new Date(this.viewDate),
-				year = d.getFullYear(),
-				month = d.getMonth(),
-				startYear = this.startDate !== -Infinity ? this.startDate.getFullYear() : -Infinity,
-				startMonth = this.startDate !== -Infinity ? this.startDate.getMonth() : -Infinity,
-				endYear = this.endDate !== Infinity ? this.endDate.getFullYear() : Infinity,
-				endMonth = this.endDate !== Infinity ? this.endDate.getMonth() : Infinity,
-				currentDate = this.date.valueOf();
-			this.picker.find('.datepicker-days th:eq(1)')
-						.text(dates[this.language].months[month]+' '+year);
-			this.updateNavArrows();
-			this.fillMonths();
-			var prevMonth = new Date(year, month-1, 28,0,0,0,0),
-				day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth()),
-				prevDate, dstDay = 0, date;
-			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();
-			var html = [];
-			var clsName;
-			while(prevMonth.valueOf() < nextMonth) {
-				if (prevMonth.getDay() == this.weekStart) {
-					html.push('<tr>');
-				}
-				clsName = '';
-				if (prevMonth.getFullYear() < year || (prevMonth.getFullYear() == year && prevMonth.getMonth() < month)) {
-					clsName += ' old';
-				} else if (prevMonth.getFullYear() > year || (prevMonth.getFullYear() == year && prevMonth.getMonth() > month)) {
-					clsName += ' new';
-				}
-				if (prevMonth.valueOf() == currentDate) {
-					clsName += ' active';
-				}
-				if (prevMonth.valueOf() < this.startDate || prevMonth.valueOf() > this.endDate) {
-					clsName += ' disabled';
-				}
-				date = prevMonth.getDate();
-				if (dstDay == -1) date++;
-				html.push('<td class="day'+clsName+'">'+date+ '</td>');
-				if (prevMonth.getDay() == this.weekEnd) {
-					html.push('</tr>');
-				}
-				prevDate = prevMonth.getDate();
-				prevMonth.setDate(prevMonth.getDate()+1);
-				if (prevMonth.getHours() != 0) {
-					// Fix for DST bug: if we are no longer at start of day, a DST jump probably happened
-					// We either fell back (eg, Jan 1 00:00 -> Jan 1 23:00)
-					// or jumped forward   (eg, Jan 1 00:00 -> Jan 2 01:00)
-					// Unfortunately, I can think of no way to test this in the unit tests, as it depends
-					// on the TZ of the client system.
-					if (!dstDay) {
-						// We are not currently handling a dst day (next round will deal with it)
-						if (prevMonth.getDate() == prevDate)
-							// We must compensate for fall-back
-							dstDay = -1;
-						else
-							// We must compensate for a jump-ahead
-							dstDay = +1;
-					}
-					else {
-						// The last round was our dst day (hours are still non-zero)
-						if (dstDay == -1)
-							// For a fall-back, fast-forward to next midnight
-							prevMonth.setHours(24);
-						else
-							// For a jump-ahead, just reset to 0
-							prevMonth.setHours(0);
-						// Reset minutes, as some TZs may be off by portions of an hour
-						prevMonth.setMinutes(0);
-						dstDay = 0;
-					}
-				}
-			}
-			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');
-			}
-			if (year < startYear || year > endYear) {
-				months.addClass('disabled');
-			}
-			if (year == startYear) {
-				months.slice(0, startMonth).addClass('disabled');
-			}
-			if (year == endYear) {
-				months.slice(endMonth+1).addClass('disabled');
-			}
-
-			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 < startYear || year > endYear ? ' disabled' : '')+'">'+year+'</span>';
-				year += 1;
-			}
-			yearCont.html(html);
-		},
-
-		updateNavArrows: function() {
-			var d = new Date(this.viewDate),
-				year = d.getFullYear(),
-				month = d.getMonth();
-			switch (this.viewMode) {
-				case 0:
-					if (this.startDate !== -Infinity && year <= this.startDate.getFullYear() && month <= this.startDate.getMonth()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getFullYear() && month >= this.endDate.getMonth()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-				case 1:
-				case 2:
-					if (this.startDate !== -Infinity && year <= this.startDate.getFullYear()) {
-						this.picker.find('.prev').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.prev').css({visibility: 'visible'});
-					}
-					if (this.endDate !== Infinity && year >= this.endDate.getFullYear()) {
-						this.picker.find('.next').css({visibility: 'hidden'});
-					} else {
-						this.picker.find('.next').css({visibility: 'visible'});
-					}
-					break;
-			}
-		},
-
-		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':
-								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
-								switch(this.viewMode){
-									case 0:
-										this.viewDate = this.moveMonth(this.viewDate, dir);
-										break;
-									case 1:
-									case 2:
-										this.viewDate = this.moveYear(this.viewDate, dir);
-										break;
-								}
-								this.fill();
-								break;
-						}
-						break;
-					case 'span':
-						if (!target.is('.disabled')) {
-							this.viewDate.setDate(1);
-							if (target.is('.month')) {
-								var month = target.parent().find('span').index(target);
-								this.viewDate.setMonth(month);
-								this.element.trigger({
-									type: 'changeMonth',
-									date: this.viewDate
-								});
-							} else {
-								var year = parseInt(target.text(), 10)||0;
-								this.viewDate.setFullYear(year);
-								this.element.trigger({
-									type: 'changeYear',
-									date: this.viewDate
-								});
-							}
-							this.showMode(-1);
-							this.fill();
-						}
-						break;
-					case 'td':
-						if (target.is('.day') && !target.is('.disabled')){
-							var day = parseInt(target.text(), 10)||1;
-							var year = this.viewDate.getFullYear(),
-								month = this.viewDate.getMonth();
-							if (target.is('.old')) {
-								if (month == 0) {
-									month = 11;
-									year -= 1;
-								} else {
-									month -= 1;
-								}
-							} else if (target.is('.new')) {
-								if (month == 11) {
-									month = 0;
-									year += 1;
-								} else {
-									month += 1;
-								}
-							}
-							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
-							});
-							var element;
-							if (this.isInput) {
-								element = this.element;
-							} else if (this.component){
-								element = this.element.find('input');
-							}
-							if (element) {
-								element.change();
-								if (this.autoclose) {
-									element.blur();
-								}
-							}
-						}
-						break;
-				}
-			}
-		},
-
-		mousedown: function(e){
-			e.stopPropagation();
-			e.preventDefault();
-		},
-
-		moveMonth: function(date, dir){
-			if (!dir) return date;
-			var new_date = new Date(date.valueOf()),
-				day = new_date.getDate(),
-				month = new_date.getMonth(),
-				mag = Math.abs(dir),
-				new_month, test;
-			dir = dir > 0 ? 1 : -1;
-			if (mag == 1){
-				test = dir == -1
-					// If going back one month, make sure month is not current month
-					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function(){ return new_date.getMonth() == month; }
-					// If going forward one month, make sure month is as expected
-					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function(){ return new_date.getMonth() != new_month; };
-				new_month = month + dir;
-				new_date.setMonth(new_month);
-				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
-				if (new_month < 0 || new_month > 11)
-					new_month = (new_month + 12) % 12;
-			} else {
-				// For magnitudes >1, move one month at a time...
-				for (var i=0; i<mag; i++)
-					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
-					new_date = this.moveMonth(new_date, dir);
-				// ...then reset the day, keeping it in the new month
-				new_month = new_date.getMonth();
-				new_date.setDate(day);
-				test = function(){ return new_month != new_date.getMonth(); };
-			}
-			// Common date-resetting loop -- if date is beyond end of month, make it
-			// end of month
-			while (test()){
-				new_date.setDate(--day);
-				new_date.setMonth(new_month);
-			}
-			return new_date;
-		},
-
-		moveYear: function(date, dir){
-			return this.moveMonth(date, dir*12);
-		},
-
-		dateWithinRange: function(date){
-			return date >= this.startDate && date <= this.endDate;
-		},
-
-		keydown: function(e){
-			if (this.picker.is(':not(:visible)')){
-				if (e.keyCode == 27) // allow escape to hide and re-show picker
-					this.show();
-				return;
-			}
-			var dateChanged = false,
-				dir, day, month,
-				newDate, newViewDate;
-			switch(e.keyCode){
-				case 27: // escape
-					this.hide();
-					e.preventDefault();
-					break;
-				case 37: // left
-				case 39: // right
+        switch(options.startView || this.element.data('date-start-view')){
+            case 2:
+            case 'decade':
+                this.viewMode = this.startViewMode = 2;
+                break;
+            case 1:
+            case 'year':
+                this.viewMode = this.startViewMode = 1;
+                break;
+            case 0:
+            case 'month':
+            default:
+                this.viewMode = this.startViewMode = 0;
+                break;
+        }
+
+        this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
+        this.weekEnd = ((this.weekStart + 6) % 7);
+        this.startDate = -Infinity;
+        this.endDate = Infinity;
+        this.setStartDate(options.startDate||this.element.data('date-startdate'));
+        this.setEndDate(options.endDate||this.element.data('date-enddate'));
+        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.update();
+            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(e){
+            // When going from the input to the picker, IE handles the blur/click
+            // events differently than other browsers, in such a way that the blur
+            // event triggers a hide before the click event can stop propagation.
+            if (false){ //TODO rivsc jquery 1.9 $.browser.msie) {
+                var t = this, args = arguments;
+
+                function cancel_hide(){
+                    clearTimeout(hide_timeout);
+                    e.target.focus();
+                    t.picker.off('click', cancel_hide);
+                }
+
+                function do_hide(){
+                    t.hide.apply(t, args);
+                    t.picker.off('click', cancel_hide);
+                }
+
+                this.picker.on('click', cancel_hide);
+                var hide_timeout = setTimeout(do_hide, 100);
+            } else {
+                return this.hide.apply(this, arguments);
+            }
+        },
+
+        hide: function(e){
+            this.picker.hide();
+            $(window).off('resize', this.place);
+            this.viewMode = this.startViewMode;
+            this.showMode();
+            if (!this.isInput) {
+                $(document).off('mousedown', this.hide);
+            }
+            if (e && e.currentTarget.value)
+                this.setValue();
+            this.element.trigger({
+                type: 'hide',
+                date: this.date
+            });
+        },
+
+        setValue: function() {
+            var formatted = DPGlobal.formatDate(this.date, this.format, this.language);
+            if (!this.isInput) {
+                if (this.component){
+                    this.element.find('input').prop('value', formatted);
+                }
+                this.element.data('date', formatted);
+            } else {
+                this.element.prop('value', formatted);
+            }
+        },
+
+        setStartDate: function(startDate){
+            this.startDate = startDate||-Infinity;
+            if (this.startDate !== -Infinity) {
+                this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language);
+            }
+            this.update();
+            this.updateNavArrows();
+        },
+
+        setEndDate: function(endDate){
+            this.endDate = endDate||Infinity;
+            if (this.endDate !== Infinity) {
+                this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language);
+            }
+            this.update();
+            this.updateNavArrows();
+        },
+
+        place: function(){
+            var zIndex = parseInt(this.element.parents().filter(function() {
+                return $(this).css('z-index') != 'auto';
+            }).first().css('z-index'))+10;
+            var offset = this.component ? this.component.offset() : this.element.offset();
+            this.picker.css({
+                top: offset.top + this.height,
+                left: offset.left,
+                zIndex: zIndex
+            });
+        },
+
+        update: function(){
+            this.date = DPGlobal.parseDate(
+                this.isInput ? this.element.prop('value') : this.element.data('date') || this.element.find('input').prop('value'),
+                this.format, this.language
+            );
+            if (this.date < this.startDate) {
+                this.viewDate = new Date(this.startDate);
+            } else if (this.date > this.endDate) {
+                this.viewDate = new Date(this.endDate);
+            } else {
+                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">'+dates[this.language].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">'+dates[this.language].monthsShort[i++]+'</span>';
+            }
+            this.picker.find('.datepicker-months td').html(html);
+        },
+
+        fill: function() {
+            var d = new Date(this.viewDate),
+                year = d.getFullYear(),
+                month = d.getMonth(),
+                startYear = this.startDate !== -Infinity ? this.startDate.getFullYear() : -Infinity,
+                startMonth = this.startDate !== -Infinity ? this.startDate.getMonth() : -Infinity,
+                endYear = this.endDate !== Infinity ? this.endDate.getFullYear() : Infinity,
+                endMonth = this.endDate !== Infinity ? this.endDate.getMonth() : Infinity,
+                currentDate = this.date.valueOf();
+            this.picker.find('.datepicker-days th:eq(1)')
+                .text(dates[this.language].months[month]+' '+year);
+            this.updateNavArrows();
+            this.fillMonths();
+            var prevMonth = new Date(year, month-1, 28,0,0,0,0),
+                day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth()),
+                prevDate, dstDay = 0, date;
+            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();
+            var html = [];
+            var clsName;
+            while(prevMonth.valueOf() < nextMonth) {
+                if (prevMonth.getDay() == this.weekStart) {
+                    html.push('<tr>');
+                }
+                clsName = '';
+                if (prevMonth.getFullYear() < year || (prevMonth.getFullYear() == year && prevMonth.getMonth() < month)) {
+                    clsName += ' old';
+                } else if (prevMonth.getFullYear() > year || (prevMonth.getFullYear() == year && prevMonth.getMonth() > month)) {
+                    clsName += ' new';
+                }
+                if (prevMonth.valueOf() == currentDate) {
+                    clsName += ' active';
+                }
+                if (prevMonth.valueOf() < this.startDate || prevMonth.valueOf() > this.endDate) {
+                    clsName += ' disabled';
+                }
+                date = prevMonth.getDate();
+                if (dstDay == -1) date++;
+                html.push('<td class="day'+clsName+'">'+date+ '</td>');
+                if (prevMonth.getDay() == this.weekEnd) {
+                    html.push('</tr>');
+                }
+                prevDate = prevMonth.getDate();
+                prevMonth.setDate(prevMonth.getDate()+1);
+                if (prevMonth.getHours() != 0) {
+                    // Fix for DST bug: if we are no longer at start of day, a DST jump probably happened
+                    // We either fell back (eg, Jan 1 00:00 -> Jan 1 23:00)
+                    // or jumped forward   (eg, Jan 1 00:00 -> Jan 2 01:00)
+                    // Unfortunately, I can think of no way to test this in the unit tests, as it depends
+                    // on the TZ of the client system.
+                    if (!dstDay) {
+                        // We are not currently handling a dst day (next round will deal with it)
+                        if (prevMonth.getDate() == prevDate)
+                        // We must compensate for fall-back
+                            dstDay = -1;
+                        else
+                        // We must compensate for a jump-ahead
+                            dstDay = +1;
+                    }
+                    else {
+                        // The last round was our dst day (hours are still non-zero)
+                        if (dstDay == -1)
+                        // For a fall-back, fast-forward to next midnight
+                            prevMonth.setHours(24);
+                        else
+                        // For a jump-ahead, just reset to 0
+                            prevMonth.setHours(0);
+                        // Reset minutes, as some TZs may be off by portions of an hour
+                        prevMonth.setMinutes(0);
+                        dstDay = 0;
+                    }
+                }
+            }
+            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');
+            }
+            if (year < startYear || year > endYear) {
+                months.addClass('disabled');
+            }
+            if (year == startYear) {
+                months.slice(0, startMonth).addClass('disabled');
+            }
+            if (year == endYear) {
+                months.slice(endMonth+1).addClass('disabled');
+            }
+
+            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 < startYear || year > endYear ? ' disabled' : '')+'">'+year+'</span>';
+                year += 1;
+            }
+            yearCont.html(html);
+        },
+
+        updateNavArrows: function() {
+            var d = new Date(this.viewDate),
+                year = d.getFullYear(),
+                month = d.getMonth();
+            switch (this.viewMode) {
+                case 0:
+                    if (this.startDate !== -Infinity && year <= this.startDate.getFullYear() && month <= this.startDate.getMonth()) {
+                        this.picker.find('.prev').css({visibility: 'hidden'});
+                    } else {
+                        this.picker.find('.prev').css({visibility: 'visible'});
+                    }
+                    if (this.endDate !== Infinity && year >= this.endDate.getFullYear() && month >= this.endDate.getMonth()) {
+                        this.picker.find('.next').css({visibility: 'hidden'});
+                    } else {
+                        this.picker.find('.next').css({visibility: 'visible'});
+                    }
+                    break;
+                case 1:
+                case 2:
+                    if (this.startDate !== -Infinity && year <= this.startDate.getFullYear()) {
+                        this.picker.find('.prev').css({visibility: 'hidden'});
+                    } else {
+                        this.picker.find('.prev').css({visibility: 'visible'});
+                    }
+                    if (this.endDate !== Infinity && year >= this.endDate.getFullYear()) {
+                        this.picker.find('.next').css({visibility: 'hidden'});
+                    } else {
+                        this.picker.find('.next').css({visibility: 'visible'});
+                    }
+                    break;
+            }
+        },
+
+        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':
+                                var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
+                                switch(this.viewMode){
+                                    case 0:
+                                        this.viewDate = this.moveMonth(this.viewDate, dir);
+                                        break;
+                                    case 1:
+                                    case 2:
+                                        this.viewDate = this.moveYear(this.viewDate, dir);
+                                        break;
+                                }
+                                this.fill();
+                                break;
+                        }
+                        break;
+                    case 'span':
+                        if (!target.is('.disabled')) {
+                            this.viewDate.setDate(1);
+                            if (target.is('.month')) {
+                                var month = target.parent().find('span').index(target);
+                                this.viewDate.setMonth(month);
+                                this.element.trigger({
+                                    type: 'changeMonth',
+                                    date: this.viewDate
+                                });
+                            } else {
+                                var year = parseInt(target.text(), 10)||0;
+                                this.viewDate.setFullYear(year);
+                                this.element.trigger({
+                                    type: 'changeYear',
+                                    date: this.viewDate
+                                });
+                            }
+                            this.showMode(-1);
+                            this.fill();
+                        }
+                        break;
+                    case 'td':
+                        if (target.is('.day') && !target.is('.disabled')){
+                            var day = parseInt(target.text(), 10)||1;
+                            var year = this.viewDate.getFullYear(),
+                                month = this.viewDate.getMonth();
+                            if (target.is('.old')) {
+                                if (month == 0) {
+                                    month = 11;
+                                    year -= 1;
+                                } else {
+                                    month -= 1;
+                                }
+                            } else if (target.is('.new')) {
+                                if (month == 11) {
+                                    month = 0;
+                                    year += 1;
+                                } else {
+                                    month += 1;
+                                }
+                            }
+                            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
+                            });
+                            var element;
+                            if (this.isInput) {
+                                element = this.element;
+                            } else if (this.component){
+                                element = this.element.find('input');
+                            }
+                            if (element) {
+                                element.change();
+                                if (this.autoclose) {
+                                    element.blur();
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+        },
+
+        mousedown: function(e){
+            e.stopPropagation();
+            e.preventDefault();
+        },
+
+        moveMonth: function(date, dir){
+            if (!dir) return date;
+            var new_date = new Date(date.valueOf()),
+                day = new_date.getDate(),
+                month = new_date.getMonth(),
+                mag = Math.abs(dir),
+                new_month, test;
+            dir = dir > 0 ? 1 : -1;
+            if (mag == 1){
+                test = dir == -1
+                    // If going back one month, make sure month is not current month
+                    // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
+                    ? function(){ return new_date.getMonth() == month; }
+                    // If going forward one month, make sure month is as expected
+                    // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
+                    : function(){ return new_date.getMonth() != new_month; };
+                new_month = month + dir;
+                new_date.setMonth(new_month);
+                // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
+                if (new_month < 0 || new_month > 11)
+                    new_month = (new_month + 12) % 12;
+            } else {
+                // For magnitudes >1, move one month at a time...
+                for (var i=0; i<mag; i++)
+                    // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
+                    new_date = this.moveMonth(new_date, dir);
+                // ...then reset the day, keeping it in the new month
+                new_month = new_date.getMonth();
+                new_date.setDate(day);
+                test = function(){ return new_month != new_date.getMonth(); };
+            }
+            // Common date-resetting loop -- if date is beyond end of month, make it
+            // end of month
+            while (test()){
+                new_date.setDate(--day);
+                new_date.setMonth(new_month);
+            }
+            return new_date;
+        },
+
+        moveYear: function(date, dir){
+            return this.moveMonth(date, dir*12);
+        },
+
+        dateWithinRange: function(date){
+            return date >= this.startDate && date <= this.endDate;
+        },
+
+        keydown: function(e){
+            if (this.picker.is(':not(:visible)')){
+                if (e.keyCode == 27) // allow escape to hide and re-show picker
+                    this.show();
+                return;
+            }
+            var dateChanged = false,
+                dir, day, month,
+                newDate, newViewDate;
+            switch(e.keyCode){
+                case 27: // escape
+                    this.hide();
+                    e.preventDefault();
+                    break;
+                case 37: // left
+                case 39: // right
                     if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 37 ? -1 : 1;
-					if (e.ctrlKey){
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setDate(this.date.getDate() + dir);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setDate(this.viewDate.getDate() + dir);
-					}
-					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 38: // up
-				case 40: // down
+                    dir = e.keyCode == 37 ? -1 : 1;
+                    if (e.ctrlKey){
+                        newDate = this.moveYear(this.date, dir);
+                        newViewDate = this.moveYear(this.viewDate, dir);
+                    } else if (e.shiftKey){
+                        newDate = this.moveMonth(this.date, dir);
+                        newViewDate = this.moveMonth(this.viewDate, dir);
+                    } else {
+                        newDate = new Date(this.date);
+                        newDate.setDate(this.date.getDate() + dir);
+                        newViewDate = new Date(this.viewDate);
+                        newViewDate.setDate(this.viewDate.getDate() + dir);
+                    }
+                    if (this.dateWithinRange(newDate)){
+                        this.date = newDate;
+                        this.viewDate = newViewDate;
+                        this.setValue();
+                        this.update();
+                        e.preventDefault();
+                        dateChanged = true;
+                    }
+                    break;
+                case 38: // up
+                case 40: // down
                     if (!this.keyboardNavigation) break;
-					dir = e.keyCode == 38 ? -1 : 1;
-					if (e.ctrlKey){
-						newDate = this.moveYear(this.date, dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date, dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setDate(this.date.getDate() + dir * 7);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setDate(this.viewDate.getDate() + dir * 7);
-					}
-					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
-						this.setValue();
-						this.update();
-						e.preventDefault();
-						dateChanged = true;
-					}
-					break;
-				case 13: // enter
-					this.hide();
-					e.preventDefault();
-					break;
-			}
-			if (dateChanged){
-				this.element.trigger({
-					type: 'changeDate',
-					date: this.date
-				});
-				var element;
-				if (this.isInput) {
-					element = this.element;
-				} else if (this.component){
-					element = this.element.find('input');
-				}
-				if (element) {
-					element.change();
-				}
-			}
-		},
-
-		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();
-			this.updateNavArrows();
-		}
-	};
-
-	$.fn.datepicker = function ( option ) {
-		var args = Array.apply(null, arguments);
-		args.shift();
-		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' && typeof data[option] == 'function') {
-				data[option].apply(data, args);
-			}
-		});
-	};
-
-	$.fn.datepicker.defaults = {
-	};
-	$.fn.datepicker.Constructor = Datepicker;
-	var dates = $.fn.datepicker.dates = {
-		en: {
-			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"]
-		}
-	}
-
-	var DPGlobal = {
-		modes: [
-			{
-				clsName: 'days',
-				navFnc: 'Month',
-				navStep: 1
-			},
-			{
-				clsName: 'months',
-				navFnc: 'FullYear',
-				navStep: 1
-			},
-			{
-				clsName: 'years',
-				navFnc: 'FullYear',
-				navStep: 10
-		}],
-		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]
-		},
-		validParts: /dd?|mm?|MM?|yy(?:yy)?/g,
-		nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\r]+/g,
-		parseFormat: function(format){
-			// IE treats \0 as a string end in inputs (truncating the value),
-			// so it's a bad format delimiter, anyway
-			var separators = format.replace(this.validParts, '\0').split('\0'),
-				parts = format.match(this.validParts);
-			if (!separators || !separators.length || !parts || parts.length == 0){
-				throw new Error("Invalid date format.");
-			}
-			return {separators: separators, parts: parts};
-		},
-		parseDate: function(date, format, language) {
-			if (date instanceof Date) return date;
-			if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) {
-				var part_re = /([-+]\d+)([dmwy])/,
-					parts = date.match(/([-+]\d+)([dmwy])/g),
-					part, dir;
-				date = new Date();
-				for (var i=0; i<parts.length; i++) {
-					part = part_re.exec(parts[i]);
-					dir = parseInt(part[1]);
-					switch(part[2]){
-						case 'd':
-							date.setDate(date.getDate() + dir);
-							break;
-						case 'm':
-							date = Datepicker.prototype.moveMonth.call(Datepicker.prototype, date, dir);
-							break;
-						case 'w':
-							date.setDate(date.getDate() + dir * 7);
-							break;
-						case 'y':
-							date = Datepicker.prototype.moveYear.call(Datepicker.prototype, date, dir);
-							break;
-					}
-				}
-				return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
-			}
-			var parts = date && date.match(this.nonpunctuation) || [],
-				date = new Date(),
-				parsed = {},
-				setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
-				setters_map = {
-					yyyy: function(d,v){ return d.setFullYear(v); },
-					yy: function(d,v){ return d.setFullYear(2000+v); },
-					m: function(d,v){
-						v -= 1;
-						while (v<0) v += 12;
-						v %= 12;
-						d.setMonth(v);
-						while (d.getMonth() != v)
-							d.setDate(d.getDate()-1);
-						return d;
-					},
-					d: function(d,v){ return d.setDate(v); }
-				},
-				val, filtered, part;
-			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
-			setters_map['dd'] = setters_map['d'];
-			date = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
-			if (parts.length == format.parts.length) {
-				for (var i=0, cnt = format.parts.length; i < cnt; i++) {
-					val = parseInt(parts[i], 10);
-					part = format.parts[i];
-					if (isNaN(val)) {
-						switch(part) {
-							case 'MM':
-								filtered = $(dates[language].months).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
-								val = $.inArray(filtered[0], dates[language].months) + 1;
-								break;
-							case 'M':
-								filtered = $(dates[language].monthsShort).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
-								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
-								break;
-						}
-					}
-					parsed[part] = val;
-				}
-				for (var i=0, s; i<setters_order.length; i++){
-					s = setters_order[i];
-					if (s in parsed)
-						setters_map[s](date, parsed[s])
-				}
-			}
-			return date;
-		},
-		formatDate: function(date, format, language){
-			var val = {
-				d: date.getDate(),
-				m: date.getMonth() + 1,
-				M: dates[language].monthsShort[date.getMonth()],
-				MM: dates[language].months[date.getMonth()],
-				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 = [],
-				seps = $.extend([], format.separators);
-			for (var i=0, cnt = format.parts.length; i < cnt; i++) {
-				if (seps.length)
-					date.push(seps.shift())
-				date.push(val[format.parts[i]]);
-			}
-			return date.join('');
-		},
-		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>';
+                    dir = e.keyCode == 38 ? -1 : 1;
+                    if (e.ctrlKey){
+                        newDate = this.moveYear(this.date, dir);
+                        newViewDate = this.moveYear(this.viewDate, dir);
+                    } else if (e.shiftKey){
+                        newDate = this.moveMonth(this.date, dir);
+                        newViewDate = this.moveMonth(this.viewDate, dir);
+                    } else {
+                        newDate = new Date(this.date);
+                        newDate.setDate(this.date.getDate() + dir * 7);
+                        newViewDate = new Date(this.viewDate);
+                        newViewDate.setDate(this.viewDate.getDate() + dir * 7);
+                    }
+                    if (this.dateWithinRange(newDate)){
+                        this.date = newDate;
+                        this.viewDate = newViewDate;
+                        this.setValue();
+                        this.update();
+                        e.preventDefault();
+                        dateChanged = true;
+                    }
+                    break;
+                case 13: // enter
+                    this.hide();
+                    e.preventDefault();
+                    break;
+            }
+            if (dateChanged){
+                this.element.trigger({
+                    type: 'changeDate',
+                    date: this.date
+                });
+                var element;
+                if (this.isInput) {
+                    element = this.element;
+                } else if (this.component){
+                    element = this.element.find('input');
+                }
+                if (element) {
+                    element.change();
+                }
+            }
+        },
+
+        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();
+            this.updateNavArrows();
+        }
+    };
+
+    $.fn.datepicker = function ( option ) {
+        var args = Array.apply(null, arguments);
+        args.shift();
+        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' && typeof data[option] == 'function') {
+                data[option].apply(data, args);
+            }
+        });
+    };
+
+    $.fn.datepicker.defaults = {
+    };
+    $.fn.datepicker.Constructor = Datepicker;
+    var dates = $.fn.datepicker.dates = {
+        en: {
+            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"]
+        }
+    }
+
+    var DPGlobal = {
+        modes: [
+            {
+                clsName: 'days',
+                navFnc: 'Month',
+                navStep: 1
+            },
+            {
+                clsName: 'months',
+                navFnc: 'FullYear',
+                navStep: 1
+            },
+            {
+                clsName: 'years',
+                navFnc: 'FullYear',
+                navStep: 10
+            }],
+        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]
+        },
+        validParts: /dd?|mm?|MM?|yy(?:yy)?/g,
+        nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\r]+/g,
+        parseFormat: function(format){
+            // IE treats \0 as a string end in inputs (truncating the value),
+            // so it's a bad format delimiter, anyway
+            var separators = format.replace(this.validParts, '\0').split('\0'),
+                parts = format.match(this.validParts);
+            if (!separators || !separators.length || !parts || parts.length == 0){
+                throw new Error("Invalid date format.");
+            }
+            return {separators: separators, parts: parts};
+        },
+        parseDate: function(date, format, language) {
+            if (date instanceof Date) return date;
+            if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) {
+                var part_re = /([-+]\d+)([dmwy])/,
+                    parts = date.match(/([-+]\d+)([dmwy])/g),
+                    part, dir;
+                date = new Date();
+                for (var i=0; i<parts.length; i++) {
+                    part = part_re.exec(parts[i]);
+                    dir = parseInt(part[1]);
+                    switch(part[2]){
+                        case 'd':
+                            date.setDate(date.getDate() + dir);
+                            break;
+                        case 'm':
+                            date = Datepicker.prototype.moveMonth.call(Datepicker.prototype, date, dir);
+                            break;
+                        case 'w':
+                            date.setDate(date.getDate() + dir * 7);
+                            break;
+                        case 'y':
+                            date = Datepicker.prototype.moveYear.call(Datepicker.prototype, date, dir);
+                            break;
+                    }
+                }
+                return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
+            }
+            var parts = date && date.match(this.nonpunctuation) || [],
+                date = new Date(),
+                parsed = {},
+                setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
+                setters_map = {
+                    yyyy: function(d,v){ return d.setFullYear(v); },
+                    yy: function(d,v){ return d.setFullYear(2000+v); },
+                    m: function(d,v){
+                        v -= 1;
+                        while (v<0) v += 12;
+                        v %= 12;
+                        d.setMonth(v);
+                        while (d.getMonth() != v)
+                            d.setDate(d.getDate()-1);
+                        return d;
+                    },
+                    d: function(d,v){ return d.setDate(v); }
+                },
+                val, filtered, part;
+            setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
+            setters_map['dd'] = setters_map['d'];
+            date = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
+            if (parts.length == format.parts.length) {
+                for (var i=0, cnt = format.parts.length; i < cnt; i++) {
+                    val = parseInt(parts[i], 10);
+                    part = format.parts[i];
+                    if (isNaN(val)) {
+                        switch(part) {
+                            case 'MM':
+                                filtered = $(dates[language].months).filter(function(){
+                                    var m = this.slice(0, parts[i].length),
+                                        p = parts[i].slice(0, m.length);
+                                    return m == p;
+                                });
+                                val = $.inArray(filtered[0], dates[language].months) + 1;
+                                break;
+                            case 'M':
+                                filtered = $(dates[language].monthsShort).filter(function(){
+                                    var m = this.slice(0, parts[i].length),
+                                        p = parts[i].slice(0, m.length);
+                                    return m == p;
+                                });
+                                val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
+                                break;
+                        }
+                    }
+                    parsed[part] = val;
+                }
+                for (var i=0, s; i<setters_order.length; i++){
+                    s = setters_order[i];
+                    if (s in parsed)
+                        setters_map[s](date, parsed[s])
+                }
+            }
+            return date;
+        },
+        formatDate: function(date, format, language){
+            var val = {
+                d: date.getDate(),
+                m: date.getMonth() + 1,
+                M: dates[language].monthsShort[date.getMonth()],
+                MM: dates[language].months[date.getMonth()],
+                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 = [],
+                seps = $.extend([], format.separators);
+            for (var i=0, cnt = format.parts.length; i < cnt; i++) {
+                if (seps.length)
+                    date.push(seps.shift())
+                date.push(val[format.parts[i]]);
+            }
+            return date.join('');
+        },
+        headTemplate: '<thead>'+
+            '<tr>'+
+            '<th class="prev"><i class="fa fa-arrow-left"/></th>'+
+            '<th colspan="5" class="switch"></th>'+
+            '<th class="next"><i class="fa fa-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 );