bug fixes

app/controllers/ClientController.php

@@ -224,7 +224,7 @@ class ClientController extends \BaseController {
 			{
 				if (!in_array($contact->public_id, $contactIds))
 				{	
-					$contact->forceDelete();
+					$contact->delete();
 				}
 			}
 			

app/controllers/CreditController.php

@@ -68,10 +68,11 @@ class CreditController extends \BaseController {
     }
 
 
-    public function create($clientPublicId = null)
+    public function create($clientPublicId = 0, $invoicePublicId = 0)
     {       
         $data = array(
             'clientPublicId' => $clientPublicId,
+            'invoicePublicId' => $invoicePublicId,
             'credit' => null, 
             'method' => 'POST', 
             'url' => 'credits', 

app/controllers/HomeController.php

@@ -8,4 +8,24 @@ class HomeController extends BaseController {
 	{
 		return View::make('splash');
 	}
+
+	public function logError()
+	{
+		$count = Session::get('error_count', 0);
+		Session::put('error_count', ++$count);
+		if ($count > LOGGED_ERROR_LIMIT) return 'logged';
+
+		$data = [
+			'context' => 'JavaScript',
+			'user_id' => Auth::check() ? Auth::user()->id : 0,
+			'url' => Input::get('url'),
+			'user_agent' => $_SERVER['HTTP_USER_AGENT'],
+			'ip' => Request::getClientIp(),
+			'count' => $count
+		];
+
+		Log::error(Input::get('error'), $data);
+
+		return 'logged';
+	}
 }

app/controllers/InvoiceController.php

@@ -444,7 +444,7 @@ class InvoiceController extends \BaseController {
 				}				
 				else if (!in_array($contact->id, $sendInvoiceIds) && $invitation)
 				{
-					$invitation->forceDelete();
+					$invitation->delete();
 				}
 			}						
 

app/controllers/PaymentController.php

@@ -70,10 +70,11 @@ class PaymentController extends \BaseController
     }
 
 
-    public function create($clientPublicId = 0)
+    public function create($clientPublicId = 0, $invoicePublicId = 0)
     {       
         $data = array(
             'clientPublicId' => $clientPublicId,
+            'invoicePublicId' => $invoicePublicId,
             'invoice' => null,
             'invoices' => Invoice::scope()->with('client')->where('balance','>',0)->orderBy('invoice_number')->get(),
             'payment' => null, 

app/filters.php

@@ -74,6 +74,7 @@ Route::filter('guest', function()
 Route::filter('csrf', function()
 {
 	$token = Request::ajax() ? Request::header('X-CSRF-Token') : Input::get('_token');
+	
    	if (Session::token() != $token) {
 		throw new Illuminate\Session\TokenMismatchException;
    	}

app/ninja/repositories/ClientRepository.php

@@ -67,7 +67,7 @@ class ClientRepository
 		{
 			if (!in_array($contact->public_id, $contactIds))
 			{	
-				$contact->forceDelete();
+				$contact->delete();
 			}
 		}
 

app/routes.php

@@ -21,13 +21,14 @@
 include_once(app_path().'/libraries/utils.php');  // TODO_FIX
 include_once(app_path().'/handlers/UserEventHandler.php');  // TODO_FIX
 
-
+// TODO_FIX replace with cron
 Route::get('/send_emails', function() {
 	Artisan::call('ninja:send-invoices');	
 });
 
 
 Route::get('/', 'HomeController@showWelcome');
+Route::get('log_error', 'HomeController@logError');
 Route::post('get_started', 'AccountController@getStarted');
 
 Route::get('view/{invoice_key}', 'InvoiceController@view');
@@ -71,13 +72,13 @@ Route::group(array('before' => 'auth'), function()
 
 	Route::get('payments/{id}/edit', function() { return View::make('header'); });
 	Route::resource('payments', 'PaymentController');
-	Route::get('payments/create/{client_id?}', 'PaymentController@create');
+	Route::get('payments/create/{client_id?}/{invoice_id?}', 'PaymentController@create');
 	Route::get('api/payments/{client_id?}', array('as'=>'api.payments', 'uses'=>'PaymentController@getDatatable'));
 	Route::post('payments/bulk', 'PaymentController@bulk');
 	
 	Route::get('credits/{id}/edit', function() { return View::make('header'); });
 	Route::resource('credits', 'CreditController');
-	Route::get('credits/create/{client_id?}', 'CreditController@create');
+	Route::get('credits/create/{client_id?}/{invoice_id?}', 'CreditController@create');
 	Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable'));	
 	Route::post('credits/bulk', 'CreditController@bulk');
 	
@@ -147,6 +148,7 @@ define("ACCOUNT_EXPORT", "export");
 
 define("DEFAULT_INVOICE_NUMBER", "0001");
 define("RECENTLY_VIEWED_LIMIT", 8);
+define("LOGGED_ERROR_LIMIT", 100);
 
 define('INVOICE_STATUS_DRAFT', 1);
 define('INVOICE_STATUS_SENT', 2);

app/start/global.php

@@ -52,7 +52,16 @@ Log::useDailyFiles(storage_path().'/logs/'.$logFile);
 
 App::error(function(Exception $exception, $code)
 {
-	Log::error($exception);
+	$data = [
+		'context' => 'PHP',
+		'user_id' => Auth::check() ? Auth::user()->id : 0,
+		'code' => $code,
+		'url' => Request::url(),
+		'user_agent' => $_SERVER['HTTP_USER_AGENT'],
+		'ip' => Request::getClientIp()		
+	];
+
+	Log::error($exception, $data);
 });
 
 /*

app/views/credits/edit.blade.php

@@ -12,13 +12,6 @@
 		'client' => 'required',
   		'amount' => 'required',		
 	)); }}
-
-	@if ($credit)
-		{{ Former::populate($credit) }}
-	@else
-		{{ Former::populateField('credit_date', Utils::today()) }}
-	@endif
-
 	
 	<div class="row">
 		<div class="col-md-8">
@@ -57,20 +50,12 @@
 
 	$(function() {
 
-		@if ($clientPublicId)
+		populateInvoiceComboboxes({{ $clientPublicId }}, {{ $invoicePublicId }});
-			$('select#client').val({{ $clientPublicId }});
-		@endif		
-		
-		populateInvoiceComboboxes();
 
 
 		$('#currency_id').combobox();
 		
-		$('#credit_date').datepicker({
+		$('#credit_date').datepicker('update', new Date({{ strtotime(Utils::today()) * 1000 }}));
-			autoclose: true,
-			todayHighlight: true,
-			keyboardNavigation: false
-		});
 
 	});
 

app/views/header.blade.php

@@ -22,7 +22,8 @@
     <script type="text/javascript" src="{{ asset('js/knockout.mapping-latest.js') }}"></script>
     <script src="{{ asset('js/knockout-sortable.js') }}" type="text/javascript"></script>		
 	<link rel="stylesheet" type="text/css" href="{{ asset('css/font-awesome.css') }}"/>
-	<script src="{{ asset('js/underscore-min.js') }}" type="text/javascript"></script>		
+	<script src="{{ asset('js/underscore.js') }}" type="text/javascript"></script>		
+
 	
 	<script src="{{ asset('js/jspdf.source.js') }}" type="text/javascript"></script>		
 	<script src="{{ asset('js/jspdf.plugin.split_text_to_size.js') }}" type="text/javascript"></script>		
@@ -48,6 +49,7 @@
 	</style>
 
 	<script type="text/javascript">
+
 		var currencies = {{ Currency::remember(120)->get(); }};
 		var currencyMap = {};
 		for (var i=0; i<currencies.length; i++) {

app/views/invoices/edit.blade.php

@@ -61,13 +61,13 @@
 		<div class="col-md-4" id="col_2">
 			<div data-bind="visible: !is_recurring()">
 				{{ Former::text('invoice_number')->label('Invoice #')->data_bind("value: invoice_number, valueUpdate: 'afterkeydown'") }}
-				{{ Former::text('invoice_date')->data_bind("value: invoice_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
+				{{ Former::text('invoice_date')->data_bind("datePicker: invoice_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
-				{{ Former::text('due_date')->data_bind("value: due_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}							
+				{{ Former::text('due_date')->data_bind("datePicker: due_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}							
 			</div>
 			<div data-bind="visible: is_recurring">
 				{{ Former::select('frequency_id')->label('How often')->options($frequencies)->data_bind("value: frequency_id") }}
-				{{ Former::text('start_date')->data_bind("value: start_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
+				{{ Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
-				{{ Former::text('end_date')->data_bind("value: end_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
+				{{ Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT)) }}
 			</div>
 			@if ($invoice && $invoice->recurring_invoice_id)
 				<div class="pull-right" style="padding-top: 6px">
@@ -191,9 +191,18 @@
 		</div>
 
 
-		{{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }}	
-
 		@if ($invoice)		
+			{{ DropdownButton::normal('Download PDF',
+				  Navigation::links(
+				    array(
+				    	array('Download PDF', "javascript:onDownloadClick()"),
+				     	array(Navigation::DIVIDER),
+				     	array('Create Payment', "javascript:onPaymentClick()"),
+				     	array('Create Credit', "javascript:onCreditClick()"),
+				    )
+				  )
+				, array('id'=>'actionDropDown', 'style'=>'text-align:left', 'data-bind'=>'css: $root.enable.save'))->split(); }}				
+
 			{{ DropdownButton::primary('Save Invoice',
 				  Navigation::links(
 				    array(
@@ -206,6 +215,7 @@
 				  )
 				, array('id'=>'actionDropDown', 'style'=>'text-align:left', 'data-bind'=>'css: $root.enable.save'))->split(); }}				
 		@else
+			{{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }}	
 			{{ Button::primary_submit('Save Invoice', array('data-bind'=>'css: $root.enable.save')) }}			
 		@endif
 
@@ -361,11 +371,7 @@
 		$('#country_id').combobox();
 		$('[rel=tooltip]').tooltip();
 
-		$('#invoice_date, #due_date, #start_date, #end_date').datepicker({
+		$('#invoice_date, #due_date, #start_date, #end_date').datepicker();
-			autoclose: true,
-			todayHighlight: true,
-			keyboardNavigation: false
-		});
 
 		@if ($client && !$invoice)
 			$('input[name=client]').val({{ $client->public_id }});
@@ -525,6 +531,16 @@
 		$('.main_form').submit();
 	}
 
+	@if ($client && $invoice)
+	function onPaymentClick() {
+		window.location = '{{ URL::to('payments/create/' . $client->public_id . '/' . $invoice->public_id ) }}';
+	}
+
+	function onCreditClick() {
+		window.location = '{{ URL::to('credits/create/' . $client->public_id . '/' . $invoice->public_id ) }}';
+	}
+	@endif
+
 	function onArchiveClick() {
 		$('#action').val('archive');
 		$('.main_form').submit();

app/views/master.blade.php

@@ -9,6 +9,20 @@
     
     <title>Invoice Ninja {{ isset($title) ? $title : '' }}</title>
 
+    <script src="{{ asset('js/jquery.js') }}" type="text/javascript"></script>  
+    <script type="text/javascript">
+    window.onerror = function(e) {
+      try {
+        $.ajax({
+          type: 'GET',
+          url: '{{ URL::to('log_error') }}',
+          data: 'error='+e+'&url='+window.location
+        });     
+      } catch(err) {}
+      return false;
+    }
+    </script>
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -16,7 +30,6 @@
     <![endif]-->
     
     <!-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.js" type="text/javascript"></script>  -->
-    <script src="{{ asset('js/jquery.js') }}" type="text/javascript"></script>  
     <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.css') }}"/> 
 
 

app/views/payments/edit.blade.php

@@ -13,13 +13,6 @@
 		'invoice' => 'required',		
   		'amount' => 'required',		
 	)); }}
-
-	@if ($payment)
-		{{-- Former::populate($payment) --}}
-	@else
-		{{ Former::populateField('payment_date', Utils::today()) }}
-	@endif
-
 	
 	<div class="row">
 		<div class="col-md-8">
@@ -57,19 +50,12 @@
 
 	$(function() {
 
-		@if ($clientPublicId)
+		populateInvoiceComboboxes({{ $clientPublicId }}, {{ $invoicePublicId }});
-			$('select#client').val({{ $clientPublicId }});
-		@endif		
-		
-		populateInvoiceComboboxes();
 
 		$('#currency_id').combobox();
 
-		$('#payment_date').datepicker({
+		$('#payment_date').datepicker('update', new Date({{ strtotime(Utils::today()) * 1000 }}));
-			autoclose: true,
+
-			todayHighlight: true,
-			keyboardNavigation: false
-		});
 	});
 
 	</script>

public/css/datepicker.css

@@ -9,14 +9,11 @@
  */
 .datepicker {
   padding: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   direction: ltr;
   /*.dow {
 		border-top: 1px solid #ddd !important;
 	}*/
-
 }
 .datepicker-inline {
   width: 220px;
@@ -46,7 +43,7 @@
   display: inline-block;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
+  border-bottom: 6px solid #fff;
   border-top: 0;
   position: absolute;
 }
@@ -76,7 +73,7 @@
 .datepicker-dropdown.datepicker-orient-bottom:after {
   bottom: -6px;
   border-bottom: 0;
-  border-top: 6px solid #ffffff;
+  border-top: 6px solid #fff;
 }
 .datepicker > div {
   display: none;
@@ -99,13 +96,11 @@
   -ms-user-select: none;
   user-select: none;
 }
-.datepicker td,
+.datepicker table tr td,
-.datepicker th {
+.datepicker table tr th {
   text-align: center;
-  width: 20px;
+  width: 30px;
-  height: 20px;
+  height: 30px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   border: none;
 }
@@ -113,7 +108,8 @@
 .table-striped .datepicker table tr th {
   background-color: transparent;
 }
-.datepicker table tr td.day:hover {
+.datepicker table tr td.day:hover,
+.datepicker table tr td.day.focused {
   background: #eeeeee;
   cursor: pointer;
 }
@@ -131,24 +127,18 @@
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today.disabled,
 .datepicker table tr td.today.disabled:hover {
-  background-color: #fde19a;
+  color: #000000;
-  background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
+  background-color: #ffdb99;
-  background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
+  border-color: #ffb733;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
-  background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: linear-gradient(top, #fdd49a, #fdf59a);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
-  border-color: #fdf59a #fdf59a #fbed50;
-  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: #000;
 }
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today:hover:hover,
 .datepicker table tr td.today.disabled:hover,
 .datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:focus,
+.datepicker table tr td.today:hover:focus,
+.datepicker table tr td.today.disabled:focus,
+.datepicker table tr td.today.disabled:hover:focus,
 .datepicker table tr td.today:active,
 .datepicker table tr td.today:hover:active,
 .datepicker table tr td.today.disabled:active,
@@ -157,15 +147,13 @@
 .datepicker table tr td.today:hover.active,
 .datepicker table tr td.today.disabled.active,
 .datepicker table tr td.today.disabled:hover.active,
-.datepicker table tr td.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.today,
-.datepicker table tr td.today:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.today:hover,
-.datepicker table tr td.today.disabled.disabled,
+.open .dropdown-toggle.datepicker table tr td.today.disabled,
-.datepicker table tr td.today.disabled:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.today.disabled:hover {
-.datepicker table tr td.today[disabled],
+  color: #000000;
-.datepicker table tr td.today:hover[disabled],
+  background-color: #ffcd70;
-.datepicker table tr td.today.disabled[disabled],
+  border-color: #f59e00;
-.datepicker table tr td.today.disabled:hover[disabled] {
-  background-color: #fdf59a;
 }
 .datepicker table tr td.today:active,
 .datepicker table tr td.today:hover:active,
@@ -174,8 +162,75 @@
 .datepicker table tr td.today.active,
 .datepicker table tr td.today:hover.active,
 .datepicker table tr td.today.disabled.active,
-.datepicker table tr td.today.disabled:hover.active {
+.datepicker table tr td.today.disabled:hover.active,
-  background-color: #fbf069 \9;
+.open .dropdown-toggle.datepicker table tr td.today,
+.open .dropdown-toggle.datepicker table tr td.today:hover,
+.open .dropdown-toggle.datepicker table tr td.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.today.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.today,
+fieldset[disabled] .datepicker table tr td.today:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today:hover.disabled:hover,
+.datepicker table tr td.today.disabled.disabled:hover,
+.datepicker table tr td.today.disabled:hover.disabled:hover,
+.datepicker table tr td.today[disabled]:hover,
+.datepicker table tr td.today:hover[disabled]:hover,
+.datepicker table tr td.today.disabled[disabled]:hover,
+.datepicker table tr td.today.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.today:hover,
+fieldset[disabled] .datepicker table tr td.today:hover:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today.disabled:focus,
+.datepicker table tr td.today:hover.disabled:focus,
+.datepicker table tr td.today.disabled.disabled:focus,
+.datepicker table tr td.today.disabled:hover.disabled:focus,
+.datepicker table tr td.today[disabled]:focus,
+.datepicker table tr td.today:hover[disabled]:focus,
+.datepicker table tr td.today.disabled[disabled]:focus,
+.datepicker table tr td.today.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.today:focus,
+fieldset[disabled] .datepicker table tr td.today:hover:focus,
+fieldset[disabled] .datepicker table tr td.today.disabled:focus,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:focus,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today:hover.disabled:active,
+.datepicker table tr td.today.disabled.disabled:active,
+.datepicker table tr td.today.disabled:hover.disabled:active,
+.datepicker table tr td.today[disabled]:active,
+.datepicker table tr td.today:hover[disabled]:active,
+.datepicker table tr td.today.disabled[disabled]:active,
+.datepicker table tr td.today.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.today:active,
+fieldset[disabled] .datepicker table tr td.today:hover:active,
+fieldset[disabled] .datepicker table tr td.today.disabled:active,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today:hover.disabled.active,
+.datepicker table tr td.today.disabled.disabled.active,
+.datepicker table tr td.today.disabled:hover.disabled.active,
+.datepicker table tr td.today[disabled].active,
+.datepicker table tr td.today:hover[disabled].active,
+.datepicker table tr td.today.disabled[disabled].active,
+.datepicker table tr td.today.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.today.active,
+fieldset[disabled] .datepicker table tr td.today:hover.active,
+fieldset[disabled] .datepicker table tr td.today.disabled.active,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover.active {
+  background-color: #ffdb99;
+  border-color: #ffb733;
 }
 .datepicker table tr td.today:hover:hover {
   color: #000;
@@ -188,34 +243,25 @@
 .datepicker table tr td.range.disabled,
 .datepicker table tr td.range.disabled:hover {
   background: #eeeeee;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 .datepicker table tr td.range.today,
 .datepicker table tr td.range.today:hover,
 .datepicker table tr td.range.today.disabled,
 .datepicker table tr td.range.today.disabled:hover {
-  background-color: #f3d17a;
+  color: #000000;
-  background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
+  background-color: #f7ca77;
-  background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
+  border-color: #f1a417;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
-  background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: linear-gradient(top, #f3c17a, #f3e97a);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
-  border-color: #f3e97a #f3e97a #edde34;
-  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);
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 .datepicker table tr td.range.today:hover,
 .datepicker table tr td.range.today:hover:hover,
 .datepicker table tr td.range.today.disabled:hover,
 .datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:focus,
+.datepicker table tr td.range.today:hover:focus,
+.datepicker table tr td.range.today.disabled:focus,
+.datepicker table tr td.range.today.disabled:hover:focus,
 .datepicker table tr td.range.today:active,
 .datepicker table tr td.range.today:hover:active,
 .datepicker table tr td.range.today.disabled:active,
@@ -224,15 +270,13 @@
 .datepicker table tr td.range.today:hover.active,
 .datepicker table tr td.range.today.disabled.active,
 .datepicker table tr td.range.today.disabled:hover.active,
-.datepicker table tr td.range.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today,
-.datepicker table tr td.range.today:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today:hover,
-.datepicker table tr td.range.today.disabled.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled,
-.datepicker table tr td.range.today.disabled:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover {
-.datepicker table tr td.range.today[disabled],
+  color: #000000;
-.datepicker table tr td.range.today:hover[disabled],
+  background-color: #f4bb51;
-.datepicker table tr td.range.today.disabled[disabled],
+  border-color: #bf800c;
-.datepicker table tr td.range.today.disabled:hover[disabled] {
-  background-color: #f3e97a;
 }
 .datepicker table tr td.range.today:active,
 .datepicker table tr td.range.today:hover:active,
@@ -241,32 +285,93 @@
 .datepicker table tr td.range.today.active,
 .datepicker table tr td.range.today:hover.active,
 .datepicker table tr td.range.today.disabled.active,
-.datepicker table tr td.range.today.disabled:hover.active {
+.datepicker table tr td.range.today.disabled:hover.active,
-  background-color: #efe24b \9;
+.open .dropdown-toggle.datepicker table tr td.range.today,
+.open .dropdown-toggle.datepicker table tr td.range.today:hover,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.range.today,
+fieldset[disabled] .datepicker table tr td.range.today:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today:hover.disabled:hover,
+.datepicker table tr td.range.today.disabled.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover.disabled:hover,
+.datepicker table tr td.range.today[disabled]:hover,
+.datepicker table tr td.range.today:hover[disabled]:hover,
+.datepicker table tr td.range.today.disabled[disabled]:hover,
+.datepicker table tr td.range.today.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.range.today:hover,
+fieldset[disabled] .datepicker table tr td.range.today:hover:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today.disabled:focus,
+.datepicker table tr td.range.today:hover.disabled:focus,
+.datepicker table tr td.range.today.disabled.disabled:focus,
+.datepicker table tr td.range.today.disabled:hover.disabled:focus,
+.datepicker table tr td.range.today[disabled]:focus,
+.datepicker table tr td.range.today:hover[disabled]:focus,
+.datepicker table tr td.range.today.disabled[disabled]:focus,
+.datepicker table tr td.range.today.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.range.today:focus,
+fieldset[disabled] .datepicker table tr td.range.today:hover:focus,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:focus,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:focus,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today:hover.disabled:active,
+.datepicker table tr td.range.today.disabled.disabled:active,
+.datepicker table tr td.range.today.disabled:hover.disabled:active,
+.datepicker table tr td.range.today[disabled]:active,
+.datepicker table tr td.range.today:hover[disabled]:active,
+.datepicker table tr td.range.today.disabled[disabled]:active,
+.datepicker table tr td.range.today.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.range.today:active,
+fieldset[disabled] .datepicker table tr td.range.today:hover:active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today:hover.disabled.active,
+.datepicker table tr td.range.today.disabled.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.disabled.active,
+.datepicker table tr td.range.today[disabled].active,
+.datepicker table tr td.range.today:hover[disabled].active,
+.datepicker table tr td.range.today.disabled[disabled].active,
+.datepicker table tr td.range.today.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.range.today.active,
+fieldset[disabled] .datepicker table tr td.range.today:hover.active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled.active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #f7ca77;
+  border-color: #f1a417;
 }
 .datepicker table tr td.selected,
 .datepicker table tr td.selected:hover,
 .datepicker table tr td.selected.disabled,
 .datepicker table tr td.selected.disabled:hover {
-  background-color: #9e9e9e;
+  color: #ffffff;
-  background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
+  background-color: #999999;
-  background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
+  border-color: #555555;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
-  background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
-  background-image: -o-linear-gradient(top, #b3b3b3, #808080);
-  background-image: linear-gradient(top, #b3b3b3, #808080);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
-  border-color: #808080 #808080 #595959;
-  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 table tr td.selected:hover,
 .datepicker table tr td.selected:hover:hover,
 .datepicker table tr td.selected.disabled:hover,
 .datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:focus,
+.datepicker table tr td.selected:hover:focus,
+.datepicker table tr td.selected.disabled:focus,
+.datepicker table tr td.selected.disabled:hover:focus,
 .datepicker table tr td.selected:active,
 .datepicker table tr td.selected:hover:active,
 .datepicker table tr td.selected.disabled:active,
@@ -275,15 +380,13 @@
 .datepicker table tr td.selected:hover.active,
 .datepicker table tr td.selected.disabled.active,
 .datepicker table tr td.selected.disabled:hover.active,
-.datepicker table tr td.selected.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected,
-.datepicker table tr td.selected:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected:hover,
-.datepicker table tr td.selected.disabled.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled,
-.datepicker table tr td.selected.disabled:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover {
-.datepicker table tr td.selected[disabled],
+  color: #ffffff;
-.datepicker table tr td.selected:hover[disabled],
+  background-color: #858585;
-.datepicker table tr td.selected.disabled[disabled],
+  border-color: #373737;
-.datepicker table tr td.selected.disabled:hover[disabled] {
-  background-color: #808080;
 }
 .datepicker table tr td.selected:active,
 .datepicker table tr td.selected:hover:active,
@@ -292,32 +395,93 @@
 .datepicker table tr td.selected.active,
 .datepicker table tr td.selected:hover.active,
 .datepicker table tr td.selected.disabled.active,
-.datepicker table tr td.selected.disabled:hover.active {
+.datepicker table tr td.selected.disabled:hover.active,
-  background-color: #666666 \9;
+.open .dropdown-toggle.datepicker table tr td.selected,
+.open .dropdown-toggle.datepicker table tr td.selected:hover,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.selected,
+fieldset[disabled] .datepicker table tr td.selected:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected:hover.disabled:hover,
+.datepicker table tr td.selected.disabled.disabled:hover,
+.datepicker table tr td.selected.disabled:hover.disabled:hover,
+.datepicker table tr td.selected[disabled]:hover,
+.datepicker table tr td.selected:hover[disabled]:hover,
+.datepicker table tr td.selected.disabled[disabled]:hover,
+.datepicker table tr td.selected.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.selected:hover,
+fieldset[disabled] .datepicker table tr td.selected:hover:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected.disabled:focus,
+.datepicker table tr td.selected:hover.disabled:focus,
+.datepicker table tr td.selected.disabled.disabled:focus,
+.datepicker table tr td.selected.disabled:hover.disabled:focus,
+.datepicker table tr td.selected[disabled]:focus,
+.datepicker table tr td.selected:hover[disabled]:focus,
+.datepicker table tr td.selected.disabled[disabled]:focus,
+.datepicker table tr td.selected.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.selected:focus,
+fieldset[disabled] .datepicker table tr td.selected:hover:focus,
+fieldset[disabled] .datepicker table tr td.selected.disabled:focus,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:focus,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected:hover.disabled:active,
+.datepicker table tr td.selected.disabled.disabled:active,
+.datepicker table tr td.selected.disabled:hover.disabled:active,
+.datepicker table tr td.selected[disabled]:active,
+.datepicker table tr td.selected:hover[disabled]:active,
+.datepicker table tr td.selected.disabled[disabled]:active,
+.datepicker table tr td.selected.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.selected:active,
+fieldset[disabled] .datepicker table tr td.selected:hover:active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected:hover.disabled.active,
+.datepicker table tr td.selected.disabled.disabled.active,
+.datepicker table tr td.selected.disabled:hover.disabled.active,
+.datepicker table tr td.selected[disabled].active,
+.datepicker table tr td.selected:hover[disabled].active,
+.datepicker table tr td.selected.disabled[disabled].active,
+.datepicker table tr td.selected.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.selected.active,
+fieldset[disabled] .datepicker table tr td.selected:hover.active,
+fieldset[disabled] .datepicker table tr td.selected.disabled.active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover.active {
+  background-color: #999999;
+  border-color: #555555;
 }
 .datepicker table tr td.active,
 .datepicker table tr td.active:hover,
 .datepicker table tr td.active.disabled,
 .datepicker table tr td.active.disabled:hover {
-  background-color: #006dcc;
+  color: #ffffff;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-color: #428bca;
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  border-color: #357ebd;
-  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 table tr td.active:hover,
 .datepicker table tr td.active:hover:hover,
 .datepicker table tr td.active.disabled:hover,
 .datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:focus,
+.datepicker table tr td.active:hover:focus,
+.datepicker table tr td.active.disabled:focus,
+.datepicker table tr td.active.disabled:hover:focus,
 .datepicker table tr td.active:active,
 .datepicker table tr td.active:hover:active,
 .datepicker table tr td.active.disabled:active,
@@ -326,15 +490,13 @@
 .datepicker table tr td.active:hover.active,
 .datepicker table tr td.active.disabled.active,
 .datepicker table tr td.active.disabled:hover.active,
-.datepicker table tr td.active.disabled,
+.open .dropdown-toggle.datepicker table tr td.active,
-.datepicker table tr td.active:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.active:hover,
-.datepicker table tr td.active.disabled.disabled,
+.open .dropdown-toggle.datepicker table tr td.active.disabled,
-.datepicker table tr td.active.disabled:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td.active.disabled:hover {
-.datepicker table tr td.active[disabled],
+  color: #ffffff;
-.datepicker table tr td.active:hover[disabled],
+  background-color: #3276b1;
-.datepicker table tr td.active.disabled[disabled],
+  border-color: #285e8e;
-.datepicker table tr td.active.disabled:hover[disabled] {
-  background-color: #0044cc;
 }
 .datepicker table tr td.active:active,
 .datepicker table tr td.active:hover:active,
@@ -343,8 +505,75 @@
 .datepicker table tr td.active.active,
 .datepicker table tr td.active:hover.active,
 .datepicker table tr td.active.disabled.active,
-.datepicker table tr td.active.disabled:hover.active {
+.datepicker table tr td.active.disabled:hover.active,
-  background-color: #003399 \9;
+.open .dropdown-toggle.datepicker table tr td.active,
+.open .dropdown-toggle.datepicker table tr td.active:hover,
+.open .dropdown-toggle.datepicker table tr td.active.disabled,
+.open .dropdown-toggle.datepicker table tr td.active.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.active,
+fieldset[disabled] .datepicker table tr td.active:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active:hover.disabled:hover,
+.datepicker table tr td.active.disabled.disabled:hover,
+.datepicker table tr td.active.disabled:hover.disabled:hover,
+.datepicker table tr td.active[disabled]:hover,
+.datepicker table tr td.active:hover[disabled]:hover,
+.datepicker table tr td.active.disabled[disabled]:hover,
+.datepicker table tr td.active.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.active:hover,
+fieldset[disabled] .datepicker table tr td.active:hover:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active.disabled:focus,
+.datepicker table tr td.active:hover.disabled:focus,
+.datepicker table tr td.active.disabled.disabled:focus,
+.datepicker table tr td.active.disabled:hover.disabled:focus,
+.datepicker table tr td.active[disabled]:focus,
+.datepicker table tr td.active:hover[disabled]:focus,
+.datepicker table tr td.active.disabled[disabled]:focus,
+.datepicker table tr td.active.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.active:focus,
+fieldset[disabled] .datepicker table tr td.active:hover:focus,
+fieldset[disabled] .datepicker table tr td.active.disabled:focus,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:focus,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active:hover.disabled:active,
+.datepicker table tr td.active.disabled.disabled:active,
+.datepicker table tr td.active.disabled:hover.disabled:active,
+.datepicker table tr td.active[disabled]:active,
+.datepicker table tr td.active:hover[disabled]:active,
+.datepicker table tr td.active.disabled[disabled]:active,
+.datepicker table tr td.active.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.active:active,
+fieldset[disabled] .datepicker table tr td.active:hover:active,
+fieldset[disabled] .datepicker table tr td.active.disabled:active,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active:hover.disabled.active,
+.datepicker table tr td.active.disabled.disabled.active,
+.datepicker table tr td.active.disabled:hover.disabled.active,
+.datepicker table tr td.active[disabled].active,
+.datepicker table tr td.active:hover[disabled].active,
+.datepicker table tr td.active.disabled[disabled].active,
+.datepicker table tr td.active.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.active.active,
+fieldset[disabled] .datepicker table tr td.active:hover.active,
+fieldset[disabled] .datepicker table tr td.active.disabled.active,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover.active {
+  background-color: #428bca;
+  border-color: #357ebd;
 }
 .datepicker table tr td span {
   display: block;
@@ -354,8 +583,6 @@
   float: left;
   margin: 1%;
   cursor: pointer;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .datepicker table tr td span:hover {
@@ -371,25 +598,19 @@
 .datepicker table tr td span.active:hover,
 .datepicker table tr td span.active.disabled,
 .datepicker table tr td span.active.disabled:hover {
-  background-color: #006dcc;
+  color: #ffffff;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-color: #428bca;
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  border-color: #357ebd;
-  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 table tr td span.active:hover,
 .datepicker table tr td span.active:hover:hover,
 .datepicker table tr td span.active.disabled:hover,
 .datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:focus,
+.datepicker table tr td span.active:hover:focus,
+.datepicker table tr td span.active.disabled:focus,
+.datepicker table tr td span.active.disabled:hover:focus,
 .datepicker table tr td span.active:active,
 .datepicker table tr td span.active:hover:active,
 .datepicker table tr td span.active.disabled:active,
@@ -398,15 +619,13 @@
 .datepicker table tr td span.active:hover.active,
 .datepicker table tr td span.active.disabled.active,
 .datepicker table tr td span.active.disabled:hover.active,
-.datepicker table tr td span.active.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active,
-.datepicker table tr td span.active:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active:hover,
-.datepicker table tr td span.active.disabled.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled,
-.datepicker table tr td span.active.disabled:hover.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover {
-.datepicker table tr td span.active[disabled],
+  color: #ffffff;
-.datepicker table tr td span.active:hover[disabled],
+  background-color: #3276b1;
-.datepicker table tr td span.active.disabled[disabled],
+  border-color: #285e8e;
-.datepicker table tr td span.active.disabled:hover[disabled] {
-  background-color: #0044cc;
 }
 .datepicker table tr td span.active:active,
 .datepicker table tr td span.active:hover:active,
@@ -415,8 +634,75 @@
 .datepicker table tr td span.active.active,
 .datepicker table tr td span.active:hover.active,
 .datepicker table tr td span.active.disabled.active,
-.datepicker table tr td span.active.disabled:hover.active {
+.datepicker table tr td span.active.disabled:hover.active,
-  background-color: #003399 \9;
+.open .dropdown-toggle.datepicker table tr td span.active,
+.open .dropdown-toggle.datepicker table tr td span.active:hover,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td span.active,
+fieldset[disabled] .datepicker table tr td span.active:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active:hover.disabled:hover,
+.datepicker table tr td span.active.disabled.disabled:hover,
+.datepicker table tr td span.active.disabled:hover.disabled:hover,
+.datepicker table tr td span.active[disabled]:hover,
+.datepicker table tr td span.active:hover[disabled]:hover,
+.datepicker table tr td span.active.disabled[disabled]:hover,
+.datepicker table tr td span.active.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td span.active:hover,
+fieldset[disabled] .datepicker table tr td span.active:hover:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active.disabled:focus,
+.datepicker table tr td span.active:hover.disabled:focus,
+.datepicker table tr td span.active.disabled.disabled:focus,
+.datepicker table tr td span.active.disabled:hover.disabled:focus,
+.datepicker table tr td span.active[disabled]:focus,
+.datepicker table tr td span.active:hover[disabled]:focus,
+.datepicker table tr td span.active.disabled[disabled]:focus,
+.datepicker table tr td span.active.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td span.active:focus,
+fieldset[disabled] .datepicker table tr td span.active:hover:focus,
+fieldset[disabled] .datepicker table tr td span.active.disabled:focus,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active:hover.disabled:active,
+.datepicker table tr td span.active.disabled.disabled:active,
+.datepicker table tr td span.active.disabled:hover.disabled:active,
+.datepicker table tr td span.active[disabled]:active,
+.datepicker table tr td span.active:hover[disabled]:active,
+.datepicker table tr td span.active.disabled[disabled]:active,
+.datepicker table tr td span.active.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td span.active:active,
+fieldset[disabled] .datepicker table tr td span.active:hover:active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active:hover.disabled.active,
+.datepicker table tr td span.active.disabled.disabled.active,
+.datepicker table tr td span.active.disabled:hover.disabled.active,
+.datepicker table tr td span.active[disabled].active,
+.datepicker table tr td span.active:hover[disabled].active,
+.datepicker table tr td span.active.disabled[disabled].active,
+.datepicker table tr td span.active.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td span.active.active,
+fieldset[disabled] .datepicker table tr td span.active:hover.active,
+fieldset[disabled] .datepicker table tr td span.active.disabled.active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
+  background-color: #428bca;
+  border-color: #357ebd;
 }
 .datepicker table tr td span.old,
 .datepicker table tr td span.new {
@@ -443,9 +729,7 @@
   cursor: default;
   background-color: transparent;
 }
-.input-append.date .add-on i,
+.input-group.date .input-group-addon i {
-.input-prepend.date .add-on i {
-  display: block;
   cursor: pointer;
   width: 16px;
   height: 16px;
@@ -454,28 +738,53 @@
   text-align: center;
 }
 .input-daterange input:first-child {
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .input-daterange input:last-child {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
-.input-daterange .add-on {
+.input-daterange .input-group-addon {
-  display: inline-block;
   width: auto;
   min-width: 16px;
-  height: 18px;
   padding: 4px 5px;
   font-weight: normal;
-  line-height: 18px;
+  line-height: 1.428571429;
   text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #fff;
   vertical-align: middle;
   background-color: #eeeeee;
-  border: 1px solid #ccc;
+  border: solid #cccccc;
+  border-width: 1px 0;
   margin-left: -5px;
   margin-right: -5px;
 }
+.datepicker.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  color: #333333;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.428571429;
+}
+.datepicker.dropdown-menu th,
+.datepicker.dropdown-menu td {
+  padding: 4px 5px;
+}

public/js/script.js

@@ -665,7 +665,6 @@ ko.bindingHandlers.dropdown = {
 };
 
 
-/*
 ko.bindingHandlers.datePicker = {
     init: function (element, valueAccessor, allBindingsAccessor) {
        var value = ko.utils.unwrapObservable(valueAccessor());       
@@ -678,7 +677,6 @@ ko.bindingHandlers.datePicker = {
        console.log("datePicker-init: %s", value);
     }    
 };
-*/
 
 
 function wordWrapText(value, width)
@@ -724,11 +722,11 @@ function getClientDisplayName(client)
 }
 
 
-function populateInvoiceComboboxes() {
+function populateInvoiceComboboxes(clientId, invoiceId) {
 	var clientMap = {};
 	var invoiceMap = {};
 	var invoicesForClientMap = {};
-	var $input = $('select#client');		
+	var $clientSelect = $('select#client');		
 	
 	for (var i=0; i<invoices.length; i++) {
 		var invoice = invoices[i];
@@ -747,14 +745,18 @@ function populateInvoiceComboboxes() {
 		clientMap[client.public_id] = client;
 	}
 
-	$input.append(new Option('', ''));	
+	$clientSelect.append(new Option('', ''));	
 	for (var i=0; i<clients.length; i++) {
 		var client = clients[i];
-		$input.append(new Option(getClientDisplayName(client), client.public_id));
+		$clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
 	}	
 
-	$input.combobox();
+	if (clientId) {
-	$input.on('change', function(e) {						
+		$clientSelect.val(clientId);
+	}
+
+	$clientSelect.combobox();
+	$clientSelect.on('change', function(e) {						
 		console.log('client change');
 		var clientId = $('input[name=client]').val();
 		var invoiceId = $('input[name=invoice]').val();						
@@ -775,9 +777,9 @@ function populateInvoiceComboboxes() {
 			$invoiceCombobox.append(new Option(invoice.invoice_number + ' - ' + getClientDisplayName(client) + ' - ' + formatMoney(invoice.balance, invoice.currency_id),  invoice.public_id));
 		}
 		$('select#invoice').combobox('refresh');
-	}).trigger('change');
+	});
 
-	var $input = $('select#invoice').on('change', function(e) {			
+	var $invoiceSelect = $('select#invoice').on('change', function(e) {			
 		$clientCombobox = $('select#client');
 		var invoiceId = $('input[name=invoice]').val();						
 		if (invoiceId) {
@@ -789,7 +791,21 @@ function populateInvoiceComboboxes() {
 			}
 		}
 	});
-	$input.combobox();	
+
+	$invoiceSelect.combobox();	
+
+	if (invoiceId) {
+		var invoice = invoiceMap[invoiceId];
+		var client = clientMap[invoice.client.public_id];
+		setComboboxValue($('.invoice-select'), invoice.public_id, (invoice.invoice_number + ' - ' + getClientDisplayName(client) + ' - ' + formatMoney(invoice.balance, invoice.currency_id)));
+		$invoiceSelect.trigger('change');
+	} else if (clientId) {
+		var client = clientMap[clientId];
+		setComboboxValue($('.client-select'), client.public_id, getClientDisplayName(client));
+		$clientSelect.trigger('change');
+	} else {
+		$clientSelect.trigger('change');
+	}	
 }
 
 
@@ -799,3 +815,6 @@ CONSTS.INVOICE_STATUS_SENT = 2;
 CONSTS.INVOICE_STATUS_VIEWED = 3;
 CONSTS.INVOICE_STATUS_PARTIAL = 4;
 CONSTS.INVOICE_STATUS_PAID = 5;
+
+$.fn.datepicker.defaults.autoclose = true;
+$.fn.datepicker.defaults.todayHighlight = true;