Various tweaks and fixes

This commit is contained in:
2014-04-25 22:17:48 +10:00
parent 596b64aa8d
commit 84ec125c80
6 changed files with 250 additions and 68 deletions

View File

@@ -22,6 +22,7 @@ define('BOOKING_PAYPAL_IPN_PATH', 'system/booking_paypal/ipn');
define('TIMEZONE', 'Australia/Sydney');
define('BOOKING_DEFAULT_STATE', 'NSW');
define('CUSTOM_EMAIL_COUNT', 5);
define('STUDYGROUP_COUNT', 7);
// Load the include for various constants
module_load_include('inc', 'booking', 'booking.constants');
@@ -319,7 +320,7 @@ function booking_menu() {
if (variable_get('booking_enable_studygroups', 0) == 1)
{
$items['admin/config/booking/studygroups'] = array(
$items['admin/booking/studygroups'] = array(
'title' => 'View Study Groups',
'description' => 'View Study Group memberships',
'page callback' => 'booking_studygroups_view_summary',
@@ -327,16 +328,25 @@ function booking_menu() {
'type' => MENU_NORMAL_ITEM,
);
$items['admin/config/booking/studygroups/%/view'] = array(
$items['admin/booking/studygroups/%/view'] = array(
'title' => 'View Study Group',
'description' => 'View Study Group memberships',
'page callback' => 'drupal_get_form',
'page arguments' => array('booking_studygroups_view_form', 4),
'page arguments' => array('booking_studygroups_view_form', 3),
'access arguments' => array('view study groups'),
//'type' => MENU_NORMAL_ITEM,
);
$items['admin/booking/studygroups/%/view/print'] = array(
'title' => 'Print Study Group',
'description' => 'Print Study Group memberships',
'page callback' => 'drupal_get_form',
'page arguments' => array('booking_studygroups_printview_form', 3),
'access arguments' => array('view study groups'),
//'type' => MENU_NORMAL_ITEM,
);
$items['admin/config/booking/studygroups/selectleaders'] = array(
$items['admin/booking/studygroups/selectleaders'] = array(
'title' => 'Select Study Group Leaders',
'description' => 'Define attendees to lead or help study groups',
'page callback' => 'drupal_get_form',
@@ -345,7 +355,7 @@ function booking_menu() {
'type' => MENU_LOCAL_ACTION,
);
$items['admin/config/booking/studygroups/calculate'] = array(
$items['admin/booking/studygroups/calculate'] = array(
'title' => 'Calculate Study Groups',
'description' => 'Calculate Study Group memberships',
'page callback' => 'drupal_get_form',
@@ -556,6 +566,19 @@ function booking_theme() {
);
}
/**
* Add custom templates to the list of theme hooks
* Don't use http://www.metachunk.com/comment/166#comment-166
* Use http://www.metachunk.com/blog/adding-module-path-drupal-7-theme-registry
*/
/*
function booking_preprocess_page(&$vars) {
watchdog('booking', "<pre>Preprocess hook:\n@info</pre>", array('@info' => print_r( $vars, true)));
//$vars['theme_hook_suggestions'][] = 'studygroups-print';
}
*/
/**
* Implementation of hook_mail().
*/