diff --git a/booking.module b/booking.module index 7b818c0..74bdd14 100644 --- a/booking.module +++ b/booking.module @@ -270,17 +270,6 @@ function booking_menu() { 'access arguments' => array('access booking form'), 'type' => MENU_SUGGESTED_ITEM, ); - - if (variable_get('booking_enable_variety_sessions', 0) == 1) - { - $items['variety'] = array( - 'title' => $bookingTitle . ' Variety Sessions', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_variety_regn_form'), - 'access arguments' => array('access booking form'), - 'type' => MENU_NORMAL_ITEM, - ); - } //Various reports $items['admin/booking/summary'] = array( @@ -360,6 +349,63 @@ function booking_menu() { 'type' => MENU_NORMAL_ITEM, ); } + + if (variable_get('booking_enable_variety_sessions', 0) == 1) + { + $items['variety'] = array( + 'title' => $bookingTitle . ' Variety Sessions', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('booking_variety_regn_form'), + 'access arguments' => array('access booking form'), + 'type' => MENU_NORMAL_ITEM, + ); + + //configure variety sessions + $items['admin/config/booking/variety/create'] = array( + 'title' => 'Add New Variety Session Timeslot', + 'description' => 'Add variety session timeslot for the Booking module', + 'page callback' => 'drupal_get_form', + //'page arguments' => array('booking_price_create'), + 'page arguments' => array('booking_variety_timeslot_form', true), + 'access arguments' => array('access administration pages'), + 'type' => MENU_LOCAL_ACTION, + ); + + $items['admin/config/booking/variety/%/edit'] = array( + 'title' => 'Edit Variety Session Timeslot', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('booking_variety_timeslot_form', false, 4), + 'access arguments' => array('access administration pages'), + 'type' => MENU_CALLBACK, + ); + + $items['admin/config/booking/variety/%/session/list'] = array( + 'title' => 'List Variety Sessions', + 'description' => 'List variety sessions for the specified timeslot', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('booking_variety_list_session_form', 4), + 'access arguments' => array('access administration pages'), + 'type' => MENU_CALLBACK, + ); + + $items['admin/config/booking/variety/%/session/create'] = array( + 'title' => 'Add New Variety Session', + 'description' => 'Add variety session to the specified timeslot', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('booking_variety_create_session_form', 4), + 'access arguments' => array('access administration pages'), + 'type' => MENU_CALLBACK, + ); + + $items['admin/config/booking/variety/session/%/edit'] = array( + 'title' => 'Edit Variety Session', + 'description' => 'Edit variety session for the specified timeslot', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('booking_variety_edit_session_form', 5), + 'access arguments' => array('access administration pages'), + 'type' => MENU_CALLBACK, + ); + } //configure study groups if (variable_get('booking_enable_studygroups', 0) == 1) @@ -597,52 +643,6 @@ function booking_menu() { 'access arguments' => array('access administration pages'), 'type' => MENU_CALLBACK, ); - - //configure variety sessions - $items['admin/config/booking/variety/create'] = array( - 'title' => 'Add New Variety Session Timeslot', - 'description' => 'Add variety session timeslot for the Booking module', - 'page callback' => 'drupal_get_form', - //'page arguments' => array('booking_price_create'), - 'page arguments' => array('booking_variety_timeslot_form', true), - 'access arguments' => array('access administration pages'), - 'type' => MENU_LOCAL_ACTION, - ); - - $items['admin/config/booking/variety/%/edit'] = array( - 'title' => 'Edit Variety Session Timeslot', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_variety_timeslot_form', false, 4), - 'access arguments' => array('access administration pages'), - 'type' => MENU_CALLBACK, - ); - - $items['admin/config/booking/variety/%/session/list'] = array( - 'title' => 'List Variety Sessions', - 'description' => 'List variety sessions for the specified timeslot', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_variety_list_session_form', 4), - 'access arguments' => array('access administration pages'), - 'type' => MENU_CALLBACK, - ); - - $items['admin/config/booking/variety/%/session/create'] = array( - 'title' => 'Add New Variety Session', - 'description' => 'Add variety session to the specified timeslot', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_variety_create_session_form', 4), - 'access arguments' => array('access administration pages'), - 'type' => MENU_CALLBACK, - ); - - $items['admin/config/booking/variety/session/%/edit'] = array( - 'title' => 'Edit Variety Session', - 'description' => 'Edit variety session for the specified timeslot', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_variety_edit_session_form', 5), - 'access arguments' => array('access administration pages'), - 'type' => MENU_CALLBACK, - ); //the paypal IPN $items[BOOKING_PAYPAL_IPN_PATH] = array( diff --git a/booking.tokens.inc b/booking.tokens.inc index 07cade7..8dd51d1 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -197,7 +197,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#title' => t('Text to use for landing page on return from paypal website'), '#type' => 'textarea', '#description' => t(''), - '#default_value' => variable_get('booking_regn_completed_page', ''), + '#default_value' => variable_get('booking_regn_completed_page', '

Thankyou for registering for [booking:eventname].

'), ); /*Text for the balance payment page*/ $form['balance'] = array(