1 files changed, 29 insertions, 21 deletions

diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php
index c2210c5f8..747dae0f0 100644
--- a/views/default/forms/event_calendar/edit.php
+++ b/views/default/forms/event_calendar/edit.php
@@ -70,30 +70,38 @@ $all_day = $fd['all_day'];
 $schedule_type = $fd['schedule_type'];
 $long_description = $fd['long_description'];
 
-$body = '<div class="event-calendar-edit-form">';
+$body = '<div>';
 
 $body .= elgg_view('input/hidden',array('name'=>'event_action', 'value'=>$event_action));
 $body .= elgg_view('input/hidden',array('name'=>'event_guid', 'value'=>$event_guid));
 
-$body .= '<div class="event-calendar-edit-form-block event-calendar-edit-form-top-block">';
+$body .= '<fieldset>';
+$body .= '<legend>' . elgg_echo('event_calendar:basic:header') . '</legend>';
 
 $body .= '<p><label>'.elgg_echo("event_calendar:title_label").'</label>';
-$body .= elgg_view("input/text",array('name' => 'title','class'=>'event-calendar-medium-text','value'=>$title));
+$body .= elgg_view("input/text",array('name' => 'title', 'value' => $title));
 $body .= '</p>';
 $body .= '<p class="event-calendar-description">'.$prefix['title'].elgg_echo('event_calendar:title_description').'</p>';
 
 $body .= '<p><label>'.elgg_echo("event_calendar:venue_label").'</label>';
-$body .= elgg_view("input/text",array('name' => 'venue','class'=>'event-calendar-medium-text','value'=>$venue));
+$body .= elgg_view("input/text",array('name' => 'venue', 'value' => $venue));
 $body .= '</p>';
 $body .= '<p class="event-calendar-description">'.$prefix['venue'].elgg_echo('event_calendar:venue_description').'</p>';
 
-$body .= '<p><label>'.elgg_echo("event_calendar:brief_description_label").'</label>';
-$body .= elgg_view("input/text",array('name' => 'description','class'=>'event-calendar-medium-text','value'=>$brief_description));
-$body .= '</p>';
-$body .= '<p class="event-calendar-description">'.$prefix['brief_description'].elgg_echo('event_calendar:brief_description_description').'</p>';
+if ($event_calendar_fewer_fields != 'yes') {
+	$body .= '<p><label>'.elgg_echo("event_calendar:brief_description_label").'</label>';
+	$body .= elgg_view("input/text",array('name' => 'description', 'value' => $brief_description));
+	$body .= '</p>';
+	$body .= '<p class="event-calendar-description">'.$prefix['brief_description'].elgg_echo('event_calendar:brief_description_description').'</p>';
+	
+} else {
+	$body .= '<label>'.elgg_echo("event_calendar:long_description_label").'</label>';
+	$body .= elgg_view("input/longtext",array('name' => 'long_description', 'value' => $long_description));
+	$body .= '<p class="event-calendar-description">'.$prefix['long_description'].elgg_echo('event_calendar:long_description_description').'</p>';
+}
 
 $body .= '<p><label>'.elgg_echo("event_calendar:event_tags_label").'</label>';
-$body .= elgg_view("input/tags",array('name' => 'tags','class'=>'event-calendar-medium-text','value'=>$event_tags));
+$body .= elgg_view("input/tags",array('name' => 'tags', 'value' => $event_tags));
 $body .= '</p>';
 $body .= '<p class="event-calendar-description">'.$prefix['event_tags'].elgg_echo('event_calendar:event_tags_description').'</p>';
 
@@ -117,11 +125,11 @@ if($event_calendar_bbb_server_url) {
 	$body .= '</p>';
 }
 
-$body .= '</div>';
+$body .= '</fieldset>';
 
-$body .= '<div class="event-calendar-edit-form-block event-calendar-edit-form-schedule-block">';
-$body .= '<h2>'.elgg_echo('event_calendar:schedule:header').'</h2>';
-$body .= elgg_view('input/radio',array('id'=>'event-calendar-edit-schedule-type','name'=>'schedule_type','value'=>$schedule_type,'options'=>$schedule_options));
+$body .= '<fieldset>';
+$body .= '<legend>'.elgg_echo('event_calendar:schedule:header').'</legend>';
+$body .= elgg_view('input/radio',array('name'=>'schedule_type','value'=>$schedule_type,'options'=>$schedule_options));
 
 $vars['prefix'] = $prefix;
 
@@ -129,20 +137,20 @@ $body .= elgg_view('event_calendar/schedule_section',$vars);
 
 if ($event_calendar_spots_display == 'yes') {
 	$body .= '<p><label>'.elgg_echo("event_calendar:spots_label").'<br />';
-	$body .= elgg_view("input/text",array('name' => 'spots','class'=>'event-calendar-medium-text','value'=>$spots));
+	$body .= elgg_view("input/text",array('name' => 'spots', 'value' => $spots));
 	$body .= '</label></p>';
 	$body .= '<p class="event-calendar-description">'.$prefix['spots'].elgg_echo('event_calendar:spots_description').'</p>';
 }
 
 $body .= '<div class="event-calendar-edit-bottom"></div>';
-$body .= '</div>';
+$body .= '</fieldset>';
 
 $body .= elgg_view('event_calendar/personal_manage_section',$vars);
 
 $body .= elgg_view('event_calendar/share_section',$vars);
 
 if ($event_calendar_region_display == 'yes' || $event_calendar_type_display == 'yes' || $event_calendar_fewer_fields != 'yes') {
-	$body .= '<div class="event-calendar-edit-form-block event-calendar-edit-form-other-block">';
+	$body .= '<fieldset>';
 	
 	if ($event_calendar_region_display == 'yes') {
 		$region_list = trim(elgg_get_plugin_setting('region_list', 'event_calendar'));
@@ -195,27 +203,27 @@ if ($event_calendar_region_display == 'yes' || $event_calendar_type_display == '
 	if ($event_calendar_fewer_fields != 'yes') {
 	
 		$body .= '<p><label>'.elgg_echo("event_calendar:fees_label").'</label>';
-		$body .= elgg_view("input/text",array('name' => 'fees','class'=>'event-calendar-medium-text','value'=>$fees));
+		$body .= elgg_view("input/text",array('name' => 'fees', 'value' => $fees));
 		$body .= '</p>';
 		$body .= '<p class="event-calendar-description">'.$prefix['fees'].elgg_echo('event_calendar:fees_description').'</p>';
 		
 		$body .= '<p><label>'.elgg_echo("event_calendar:contact_label").'</label>';
-		$body .= elgg_view("input/text",array('name' => 'contact','class'=>'event-calendar-medium-text','value'=>$contact));
+		$body .= elgg_view("input/text",array('name' => 'contact', 'value' => $contact));
 		$body .= '</p>';
 		$body .= '<p class="event-calendar-description">'.$prefix['contact'].elgg_echo('event_calendar:contact_description').'</p>';
 		
 		$body .= '<p><label>'.elgg_echo("event_calendar:organiser_label").'</label>';
-		$body .= elgg_view("input/text",array('name' => 'organiser','class'=>'event-calendar-medium-text','value'=>$organiser));
+		$body .= elgg_view("input/text",array('name' => 'organiser', 'value' => $organiser));
 		$body .= '</p>';
 		$body .= '<p class="event-calendar-description">'.$prefix['organiser'].elgg_echo('event_calendar:organiser_description').'</p>';
 		
 		$body .= '<p><label>'.elgg_echo("event_calendar:long_description_label").'</label>';
-		$body .= elgg_view("input/longtext",array('name' => 'long_description','class'=>'event-calendar-long-text','value'=>$long_description));
+		$body .= elgg_view("input/longtext",array('name' => 'long_description', 'value' => $long_description));
 		$body .= '</p>';
 		$body .= '<p class="event-calendar-description">'.$prefix['long_description'].elgg_echo('event_calendar:long_description_description').'</p>';
 	}
 	
-	$body .= '</div>';
+	$body .= '</fieldset>';
 }
 
 $body .= elgg_view('input/submit', array('name'=>'submit','value'=>elgg_echo('event_calendar:submit')));