Permalink
Browse files

Merge remote-tracking branch 'stevangoode/JOINDIN-154' into edit-even…

…t-form

Conflicts:
	src/system/application/controllers/event.php
  • Loading branch information...
2 parents 989edcc + b65e2ba commit 1c6c0f26e12ce1704574b3377541688c5a482b50 @lornajane lornajane committed Feb 14, 2013
Showing with 420 additions and 350 deletions.
  1. +40 −37 src/system/application/controllers/event.php
  2. +380 −313 src/system/application/views/event/add.php
@@ -315,47 +315,50 @@ function add($id = null)
$this->load->library('upload', $config);
$rules = array(
- 'event_name' => 'required',
- 'event_loc' => 'required',
- 'event_tz_cont' => 'required',
- 'event_tz_place' => 'required',
- 'start_mo' => 'callback_start_mo_check',
- 'end_mo' => 'callback_end_mo_check',
- 'event_stub' => 'callback_stub_check',
- 'cfp_end_mo' => 'callback_cfp_end_mo_check',
- 'cfp_start_mo' => 'callback_cfp_start_mo_check',
- 'cfp_url' => 'callback_cfp_url_check',
- 'tagged' => 'callback_tagged_check'
+ 'event_name' => 'required',
+ 'event_loc' => 'required',
+ 'event_contact_name' => 'required',
+ 'event_contact_email' => 'required|valid_email',
+ 'event_tz_cont' => 'required',
+ 'event_tz_place' => 'required',
+ 'start_mo' => 'callback_start_mo_check',
+ 'end_mo' => 'callback_end_mo_check',
+ 'cfp_start_mo' => 'callback_cfp_start_mo_check',
+ 'cfp_end_mo' => 'callback_cfp_end_mo_check',
+ 'event_stub' => 'callback_stub_check',
+ 'cfp_url' => 'callback_cfp_url_check',
+ 'event_desc' => 'required'
);
$this->validation->set_rules($rules);
$fields = array(
- 'event_name' => 'Event Name',
- 'start_mo' => 'Start Month',
- 'start_day' => 'Start Day',
- 'start_yr' => 'Start Year',
- 'end_mo' => 'End Month',
- 'end_day' => 'End Day',
- 'end_yr' => 'End Year',
- 'event_loc' => 'Event Venue Name',
- 'event_lat' => 'Latitude',
- 'event_long' => 'Longitude',
- 'event_desc' => 'Event Description',
- 'event_tz_cont' => 'Event Timezone (Continent)',
- 'event_tz_place' => 'Event Timezone (Place)',
- 'event_href' => 'Event Link(s)',
- 'event_hashtag' => 'Event Hashtag',
- 'event_private' => 'Private Event',
- 'event_stub' => 'Event Stub',
- 'addr' => 'Google address',
- 'cfp_start_mo' => 'Event Call for Papers Start Date',
- 'cfp_start_day' => 'Event Call for Papers Start Date',
- 'cfp_start_yr' => 'Event Call for Papers Start Date',
- 'cfp_end_mo' => 'Event Call for Papers End Date',
- 'cfp_end_day' => 'Event Call for Papers End Date',
- 'cfp_end_yr' => 'Event Call for Papers End Date',
- 'cfp_url' => 'Event Call for Papers URL',
- 'tagged' => 'Tagged With'
+ 'event_name' => 'Event Title',
+ 'event_contact_name' => 'Event Contact Name',
+ 'event_contact_email' => 'Event Contact Email',
+ 'event_desc' => 'Event Description',
+ 'start_mo' => 'Event Start Month',
+ 'start_day' => 'Event Start Day',
+ 'start_yr' => 'Event Start Year',
+ 'is_cfp' => 'Is CfP',
+ 'is_private' => 'Is this event private?',
+ 'is_admin' => 'I\'m an event admin?',
+ 'cfp_start_day' => 'CfP Start Day',
+ 'cfp_start_mo' => 'CfP Start Month',
+ 'cfp_start_yr' => 'CfP Start Year',
+ 'cfp_end_day' => 'CfP End Day',
+ 'cfp_end_mo' => 'CfP End Month',
+ 'cfp_end_yr' => 'CfP End Year',
+ 'cfp_url' => 'CfP URL',
+ 'end_mo' => 'Event End Month',
+ 'end_day' => 'Event End Day',
+ 'end_yr' => 'Event End Year',
+ 'event_loc' => 'Event Location',
+ 'event_tz_cont' => 'Event Timezone (Continent)',
+ 'event_tz_place' => 'Event Timezone (Place)',
+ 'event_lat' => 'Event Latitude',
+ 'event_long' => 'Event Longitude',
+ 'event_stub' => 'Event Stub',
+ 'addr' => 'Event Address'
);
$this->validation->set_fields($fields);
Oops, something went wrong.

0 comments on commit 1c6c0f2

Please sign in to comment.