From 2374f4ca4b0b064118cd6cc33f8315a60715c3d4 Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 30 Aug 2012 04:01:58 +0200 Subject: Refactored edit form. --- languages/en.php | 1 + models/model.php | 1 - views/default/event_calendar/css.php | 37 +++------------- views/default/event_calendar/datetime_edit.php | 2 +- .../default/event_calendar/repeat_form_element.php | 49 +++++++++------------- views/default/event_calendar/share_section.php | 6 +-- views/default/forms/event_calendar/edit.php | 42 +++++++++---------- views/default/js/event_calendar/event_calendar.php | 4 +- 8 files changed, 52 insertions(+), 90 deletions(-) diff --git a/languages/en.php b/languages/en.php index 8e42580de..dfbe0cda4 100644 --- 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 e7f823d4c..4668f005a 100644 --- 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 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 .= ''; } - $body .= '

'; + $body .= '

'; } else { $body .= '

- - + +echo '
'; + +foreach($days as $day) { + $label = elgg_echo("event_calendar:day_abbrev:$day"); + echo << + $label - - - - - - - - - - - - - - - - - - -
- - - - - - - +HTML; + +} + +echo '
'; + +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 @@ '; -$body .= '

'.elgg_echo('event_calendar:permissions:header').'

'; +$body = '
'; +$body .= ''.elgg_echo('event_calendar:permissions:header').''; 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 .= ''; +$body .= '
'; echo $body; diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php index 33849962c..d45fb387b 100644 --- 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 = '
'; +$body = '
'; $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 .= '
'; +$body .= '
'; +$body .= '' . elgg_echo('event_calendar:basic:header') . ''; $body .= '

'; -$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 .= '

'; $body .= '

'.$prefix['title'].elgg_echo('event_calendar:title_description').'

'; $body .= '

'; -$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 .= '

'; $body .= '

'.$prefix['venue'].elgg_echo('event_calendar:venue_description').'

'; if ($event_calendar_fewer_fields != 'yes') { $body .= '

'; - $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 .= '

'; $body .= '

'.$prefix['brief_description'].elgg_echo('event_calendar:brief_description_description').'

'; } else { - $body .= '

'; - $body .= elgg_view("input/longtext",array('name' => 'long_description','class'=>'event-calendar-long-text','value'=>$long_description)); - $body .= '

'; + $body .= ''; + $body .= elgg_view("input/longtext",array('name' => 'long_description', 'value' => $long_description)); $body .= '

'.$prefix['long_description'].elgg_echo('event_calendar:long_description_description').'

'; } $body .= '

'; -$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 .= '

'; $body .= '

'.$prefix['event_tags'].elgg_echo('event_calendar:event_tags_description').'

'; @@ -125,11 +125,11 @@ if($event_calendar_bbb_server_url) { $body .= '

'; } -$body .= '
'; +$body .= ''; -$body .= '
'; -$body .= '

'.elgg_echo('event_calendar:schedule:header').'

'; -$body .= elgg_view('input/radio',array('id'=>'event-calendar-edit-schedule-type','name'=>'schedule_type','value'=>$schedule_type,'options'=>$schedule_options)); +$body .= '
'; +$body .= ''.elgg_echo('event_calendar:schedule:header').''; +$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 .= '

'; $body .= '

'.$prefix['spots'].elgg_echo('event_calendar:spots_description').'

'; } $body .= '
'; -$body .= '
'; +$body .= ''; $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 .= '
'; + $body .= '
'; 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 .= '

'; - $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 .= '

'; $body .= '

'.$prefix['fees'].elgg_echo('event_calendar:fees_description').'

'; $body .= '

'; - $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 .= '

'; $body .= '

'.$prefix['contact'].elgg_echo('event_calendar:contact_description').'

'; $body .= '

'; - $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 .= '

'; $body .= '

'.$prefix['organiser'].elgg_echo('event_calendar:organiser_description').'

'; $body .= '

'; - $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 .= '

'; $body .= '

'.$prefix['long_description'].elgg_echo('event_calendar:long_description_description').'

'; } - $body .= '
'; + $body .= ''; } $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 6150feb79..360f39f6c 100644 --- 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(); -- cgit v1.2.3