From 2d19bfa232be5eff43bb6c1d1eef12e681552956 Mon Sep 17 00:00:00 2001
From: Kevin Jardine <kevinjardine@yahoo.com>
Date: Mon, 19 Mar 2012 17:09:30 +0100
Subject: full calendar click to view, time system revamp

---
 views/default/forms/event_calendar/edit.php | 41 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'views/default/forms/event_calendar/edit.php')

diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php
index 7613a79f1..3526627a7 100644
--- a/views/default/forms/event_calendar/edit.php
+++ b/views/default/forms/event_calendar/edit.php
@@ -128,29 +128,32 @@ $body .= '</label></p>';
 $body .= '<p class="description">'.$prefix['venue'].elgg_echo('event_calendar:venue_description').'</p>';
 
 if ($event_calendar_times != 'no') {
-	$body .= '<p><label>'.elgg_echo("event_calendar:start_time_label").'</label><br />';
+	$body .= '<div class="event-calendar-date-time-setter">';
+	if ($event_calendar_hide_end != 'yes') {
+		$body .= '<p><label>'.elgg_echo('event_calendar:from_label').'</label>';
+	}
+	$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE, 'autocomplete'=>'off','class'=>'event-calendar-compressed-date','name' => 'start_date','value'=>$start_date));
 	$body .= elgg_view("input/timepicker",array('name' => 'start_time','value'=>$start_time));
-	$body .= '</p>';
-	$body .= '<p class="description">'.$prefix['start_time'].elgg_echo('event_calendar:start_time_description').'</p>';
-}
-
-$body .= '<p><label>'.elgg_echo("event_calendar:start_date_label").'<br />';
-$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE, 'autocomplete'=>'off','name' => 'start_date','value'=>$start_date));
-$body .= '</label></p>';
-$body .= '<p class="description">'.$prefix['start_date'].elgg_echo('event_calendar:start_date_description').'</p>';
-
-if ($event_calendar_hide_end != 'yes') {
-	if ($event_calendar_times != 'no') {
-		$body .= '<p><label>'.elgg_echo("event_calendar:end_time_label").'</label><br />';
+	if ($event_calendar_hide_end != 'yes') {
+		$body .= '</p><p><label>'.elgg_echo('event_calendar:to_label').'</label>';
+		$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE,'autocomplete'=>'off','class'=>'event-calendar-compressed-date','name' => 'end_date','value'=>$end_date));
 		$body .= elgg_view("input/timepicker",array('name' => 'end_time','value'=>$end_time));
-		$body .= '</p>';
-		$body .= '<p class="description">'.$prefix['end_time'].elgg_echo('event_calendar:end_time_description').'</p>';
 	}
-	
-	$body .= '<p><label>'.elgg_echo("event_calendar:end_date_label").'<br />';
-	$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE,'autocomplete'=>'off','name' => 'end_date','value'=>$end_date));
+	$body .= '</p>';
+	$body .= '</div>';
+} else {
+
+	$body .= '<p><label>'.elgg_echo("event_calendar:start_date_label").'<br />';
+	$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE, 'autocomplete'=>'off','name' => 'start_date','value'=>$start_date));
 	$body .= '</label></p>';
-	$body .= '<p class="description">'.$prefix['end_date'].elgg_echo('event_calendar:end_date_description').'</p>';
+	$body .= '<p class="description">'.$prefix['start_date'].elgg_echo('event_calendar:start_date_description').'</p>';
+	
+	if ($event_calendar_hide_end != 'yes') {		
+		$body .= '<p><label>'.elgg_echo("event_calendar:end_date_label").'<br />';
+		$body .= elgg_view("event_calendar/input/date_local",array('timestamp'=>TRUE,'autocomplete'=>'off','name' => 'end_date','value'=>$end_date));
+		$body .= '</label></p>';
+		$body .= '<p class="description">'.$prefix['end_date'].elgg_echo('event_calendar:end_date_description').'</p>';
+	}
 }
 
 if ($event_calendar_spots_display == 'yes') {
-- 
cgit v1.2.3