Merge lp:~daker/loco-team-portal/fix.818373 into lp:loco-team-portal

[Adnane Belmadiaf]

Autopull the end date when the user choose the start date

[Nigel Babu (nigelbabu)]

Looks good. Ack

review: Approve

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2011-07-18 12:00:47 +0000
+++ loco_directory/events/forms.py	2011-07-30 18:32:46 +0000
@@ -51,8 +51,8 @@
               '/media/jquery-ui/jquery-ui.js',
               '/media/jquery-ui-timepicker/js/jquery.timepickr.min.js',
               '/media/jquery-ui-timepicker/js/ui.timepickr.min.js',
+              '/media/js/colortip-1.0-jquery.js',
               '/media/js/events-ui.js',
-              '/media/js/colortip-1.0-jquery.js',
               )
         
     def __init__(self, *args, **kargs):

=== modified file 'loco_directory/media/js/events-ui.js'
--- loco_directory/media/js/events-ui.js	2010-01-05 14:40:39 +0000
+++ loco_directory/media/js/events-ui.js	2011-07-30 18:32:46 +0000
@@ -1,14 +1,16 @@
 $(document).ready(function(){
 
-	$.datepicker.setDefaults({
-		showOn: 'focus',
-		dateFormat: 'yy-mm-dd'
-	});
-
-	$("#id_date_begin_0").datepicker();
-	$('#id_date_begin_1').timepickr({ trigger: 'focus', convention: 24 });
-	
-	$("#id_date_end_0").datepicker();
-	$('#id_date_end_1').timepickr({ trigger: 'focus', convention: 24 });
-	
+    $.datepicker.setDefaults({
+        showOn: 'focus',
+        dateFormat: 'yy-mm-dd',
+    });
+
+    $("#id_date_begin_0").datepicker({altField: "#id_date_end_0", altFormat: "yy-mm-dd"});
+    $('#id_date_begin_1').timepickr({ trigger: 'focus', convention: 24 });
+
+    $("#id_date_end_0").datepicker();
+    $('#id_date_end_1').timepickr({ trigger: 'focus', convention: 24 });
+
+    $('span[rel*=help]').colorTip({color:'orange'});
+
 });