4 files changed, 28 insertions, 66 deletions
diff --git a/views/default/event_calendar/css.php b/views/default/event_calendar/css.php
index 9ef2ecfa1..00cfd6cbb 100644
--- a/views/default/event_calendar/css.php
+++ b/views/default/event_calendar/css.php
@@ -175,39 +175,12 @@ li.event-calendar-filter-menu-show-only {
 	margin-right: 10px;
 }
 
-.event-calendar-medium-text {
-	width: 500px !important;
-}
-
-.event-calendar-edit-form-block label {
-	float: left;
-	width: 90px;
-	margin-top: 5px;
-}
-
-.event-calendar-long-text {
-	width: 500px !important;
-}
-
-.event-calendar-edit-form-other-block .mceLayout  {
-	width: 500px !important;
-}
-
-.event-calendar-edit-form {
-	background-color: #FFFFFF;
-}
-
-.event-calendar-edit-form-block {
-	width: 90%;
-	background-color: #DDDDDD;
-	border-width:1px;
-	border-style:solid;
-	border-color:#bfbfbf;
-	padding: 5px;
-	margin-bottom: 10px;
-	clear: both;
+fieldset > legend {
+	font-weight: bold;
+	font-size: 1.2em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
 }
-
 .event-calendar-repeating-wrapper {
 	padding: 0;
 	margin-top: 5px;
diff --git a/views/default/event_calendar/datetime_edit.php b/views/default/event_calendar/datetime_edit.php
index 64af30f53..7abc3bb62 100644
--- a/views/default/event_calendar/datetime_edit.php
+++ b/views/default/event_calendar/datetime_edit.php
@@ -30,7 +30,7 @@ if ($event_calendar_times != 'no') {
 		$body .= elgg_view("input/timepicker",array('name' => 'end_time','value'=>$vars['end_time']));
 		$body .= '</span>';
 	}
-	$body .= '</p></span>';
+	$body .= '</p>';
 } else {
 
 	$body .= '<p><label>'.elgg_echo("event_calendar:start_date_label").'<br />';
diff --git a/views/default/event_calendar/repeat_form_element.php b/views/default/event_calendar/repeat_form_element.php
index 45fdabfa1..5de858caf 100644
--- a/views/default/event_calendar/repeat_form_element.php
+++ b/views/default/event_calendar/repeat_form_element.php
@@ -1,6 +1,8 @@
 <?php
 $event = $vars['event'];
 $fd = $vars['form_data'];
+$days = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
+
 if ($fd['repeats'] == 'yes') {
 	echo elgg_view('input/checkbox',array('name'=>'repeats','value'=>'yes','checked'=>'checked'));
 } else {
@@ -10,34 +12,21 @@ echo elgg_echo('event_calendar:repeat_interval_label').' ';
 echo elgg_view('input/dropdown',array('name'=>'repeat_interval','value'=>$fd['repeat_interval'],'options_values'=>array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6','7'=>'7','8'=>'8')));
 echo ' '.elgg_echo('event_calendar:repeat_weeks');
 echo ' '.elgg_echo('event_calendar:on_these_days');
-?>
-<div class="event-calendar-repeating-wrapper">
-<a id="event-calendar-repeating-monday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:monday'); ?>
+
+echo '<div class="event-calendar-repeating-wrapper">';
+
+foreach($days as $day) {
+	$label = elgg_echo("event_calendar:day_abbrev:$day");
+	echo <<<HTML
+<a id="event-calendar-repeating-$day" href="javascript:void(0);" class="event-calendar-repeating-unselected">
+	 $label
 </a>
-<a id="event-calendar-repeating-tuesday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:tuesday'); ?>
-</a>
-<a id="event-calendar-repeating-wednesday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:wednesday'); ?>
-</a>
-<a id="event-calendar-repeating-thursday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:thursday'); ?>
-</a>
-<a id="event-calendar-repeating-friday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:friday'); ?>
-</a>
-<a id="event-calendar-repeating-saturday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:saturday'); ?>
-</a>
-<a id="event-calendar-repeating-sunday" href="javascript:void(0);" class="event-calendar-repeating-unselected">
-	<?php echo elgg_echo('event_calendar:day_abbrev:sunday'); ?>
-</a>
-</div>
-<input type="hidden" name="event-calendar-repeating-monday-value" value="<?php echo $fd['event-calendar-repeating-monday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-tuesday-value" value="<?php echo $fd['event-calendar-repeating-tuesday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-wednesday-value" value="<?php echo $fd['event-calendar-repeating-wednesday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-thursday-value" value="<?php echo $fd['event-calendar-repeating-thursday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-friday-value" value="<?php echo $fd['event-calendar-repeating-friday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-saturday-value" value="<?php echo $fd['event-calendar-repeating-saturday-value']; ?>">
-<input type="hidden" name="event-calendar-repeating-sunday-value" value="<?php echo $fd['event-calendar-repeating-sunday-value']; ?>">
+HTML;
+
+}
+
+echo '</div>';
+
+foreach($days as $day) {
+	echo elgg_view('input/hidden', array('name' => "event-calendar-repeating-$day-value", 'value' => $fd["event-calendar-repeating-$day-value"]));
+}
+\ No newline at end of file
diff --git a/views/default/event_calendar/share_section.php b/views/default/event_calendar/share_section.php
index 134f07656..c4f6cf45f 100644
--- a/views/default/event_calendar/share_section.php
+++ b/views/default/event_calendar/share_section.php
@@ -1,8 +1,8 @@
 <?php
 $fd = $vars['form_data'];
 $event_calendar_hide_access = elgg_get_plugin_setting('hide_access', 'event_calendar');
-$body = '<div class="event-calendar-edit-form-block event-calendar-edit-form-share-block">';
-$body .= '<h2>'.elgg_echo('event_calendar:permissions:header').'</h2>';
+$body = '<fieldset>';
+$body .= '<legend>'.elgg_echo('event_calendar:permissions:header').'</legend>';
 if($event_calendar_hide_access == 'yes') {
 	$event_calendar_default_access = elgg_get_plugin_setting('default_access', 'event_calendar');
 	if($event_calendar_default_access) {
@@ -21,6 +21,6 @@ if (elgg_plugin_exists('entity_admins')) {
 	$body .= elgg_echo('event_calendar:share_ownership:description');
 	$body .= elgg_view('input/entity_admins_dropdown',array('entity'=>$vars['event']));
 }
-$body .= '</div>';
+$body .= '</fieldset>';
 
 echo $body;