Refactored edit form.

diff --git a/languages/en.php b/languages/en.php
index 8e42580ded6bb5caf513580750e9c82bb868cfab..dfbe0cda43a85ef7399f8bbf9261a450d58cf363 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -291,6 +291,7 @@ You can manage calendar requests for this event here:
        'event_calendar:calendar_label' => "Calendar",
        'event_calendar:calendar_description' => "Calendar for this event.",
        'event_calendar:are_you_sure' => "Are you sure about this change?",
+       'event_calendar:basic:header' => "Basic info",
        'event_calendar:schedule:header' => "Schedule",
        'event_calendar:permissions:header' => "Permissions",
        'event_calendar:read_access' => "Read access",

diff --git a/models/model.php b/models/model.php
index e7f823d4c7e18ac9e85ca83e5e6d8f30ee011952..4668f005ac1827035f1bd93574af8c76727f2bc0 100644 (file)
--- a/models/model.php
+++ b/models/model.php
@@ -1541,7 +1541,6 @@ function event_calendar_get_page_content_edit($page_type,$guid,$start_date='') {
        elgg_load_js('elgg.event_calendar');
        $vars = array();
        $vars['id'] = 'event-calendar-edit';
-       $vars['name'] = 'event_calendar_edit';
        // just in case a feature adds an image upload
        $vars['enctype'] = 'multipart/form-data';
 

diff --git a/views/default/event_calendar/css.php b/views/default/event_calendar/css.php
index 9ef2ecfa1ee5fdf9621f7fdf77962b4948fa21d2..00cfd6cbbdc80761570dd69d566201cb8331119d 100644 (file)
--- 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 64af30f53c19e8b693954d4b3ca79aed6d1af804..7abc3bb626282e1c6d015621341eac04d6120c39 100644 (file)
--- 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 45fdabfa1d95fe7df7ad6c73e5b01fcc994fbe93..5de858caf168ea5eef149d9c107275989fd40876 100644 (file)
--- 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 134f07656f4fede0ef7c3f57ecd9df395258c7bf..c4f6cf45fe71b5e34e9aee7238dcc1d67e355df0 100644 (file)
--- 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;

diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php
index 33849962c4dfe89a25bad3610fc4f0f0b1e8ad63..d45fb387b1885379cdc341f56bf2d58f96e85562 100644 (file)
--- a/views/default/forms/event_calendar/edit.php
+++ b/views/default/forms/event_calendar/edit.php
@@ -70,38 +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>';
 
 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','class'=>'event-calendar-medium-text','value'=>$brief_description));
+       $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 .= '<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 .= '</p>';
+       $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>';
 
@@ -125,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;
 
@@ -137,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'));
@@ -203,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')));

diff --git a/views/default/js/event_calendar/event_calendar.php b/views/default/js/event_calendar/event_calendar.php
index 6150feb79a92527233d2807c2c967d37ed92f8be..360f39f6cedd7539109a0e35d964918d9b0b2da3 100644 (file)
--- a/views/default/js/event_calendar/event_calendar.php
+++ b/views/default/js/event_calendar/event_calendar.php
@@ -10,7 +10,7 @@ elgg.event_calendar.init = function () {
        $('.event-calendar-repeating-unselected').live('click',elgg.event_calendar.handleRepeatingSelect);
        $('.event-calendar-repeating-selected').live('click',elgg.event_calendar.handleRepeatingUnselect);
        $('#event-calendar-edit').submit(elgg.event_calendar.handleEditFormSubmit);
-       $('#event-calendar-edit-schedule-type').click(elgg.event_calendar.handleScheduleType);
+       $('input.elgg-input-radio[name="schedule_type"]').click(elgg.event_calendar.handleScheduleType);
        elgg.event_calendar.handleScheduleType();
 
        var all_day_field = $('[name="all_day"][type="checkbox"]');
@@ -24,7 +24,7 @@ elgg.event_calendar.init = function () {
 }
 
 elgg.event_calendar.handleScheduleType = function(e) {
-       var st = $('#event-calendar-edit-schedule-type:checked').val();
+       var st = $('input.elgg-input-radio[name="schedule_type"]:checked').val();
        if (st == 'poll') {
                $(".event-calendar-edit-date-wrapper").hide();
                $(".event-calendar-edit-reminder-wrapper").hide();