--- event-node-day.tpl.php.org 2008-12-07 17:19:47.000000000 +0000
+++ event-node-day.tpl.php 2009-06-29 18:38:14.000000000 +0100
@@ -35,10 +35,10 @@
array('title' => t('view this event'))))?>
- ">
+ ">
- ">
+ ">
--- event-nodeapi.tpl.php.org 2008-12-17 23:00:20.000000000 +0000
+++ event-nodeapi.tpl.php 2009-06-29 18:21:13.000000000 +0100
@@ -21,11 +21,11 @@
*/
?>
t('Content type filter controls'),
'#default_value' => variable_get('event_type_control', 'all'),
'#options' => array('all' => t('Show content type filter control on calendar views'), 'request' => t('Only show content type filter control when content type filter view is requested'), 'never' => t('Never show content type filter control')));
+ $form['event_date_display'] = array(
+ '#type' => 'select',
+ '#default_value' => variable_get('event_date_display', 'small'),
+ '#options' => array(
+ 'small' => t('Small'),
+ 'medium' => t('Medium'),
+ 'large' => t('Large'),
+ ),
+ '#title' => t('Date display type'),
+ '#description' => t('Which type of date display to use'),);
return system_settings_form($form);
}
@@ -1074,10 +1084,10 @@
$node->event['end_exploded'] = event_explode_date($node->event['end']);
$format = event_strip_time(variable_get('date_format_short', 'm/d/Y - H:i'));
- $node->event['start_format'] = event_format_date($node->event['start_exploded'], 'small');
+ $node->event['start_format'] = event_format_date($node->event['start_exploded'], variable_get('event_date_display', 'small'));
$node->event['start_date_format'] = event_format_date($node->event['start_exploded'], 'custom', $format);
$node->event['start_time_format'] = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
- $node->event['end_format'] = event_format_date($node->event['end_exploded'], 'small');
+ $node->event['end_format'] = event_format_date($node->event['end_exploded'], variable_get('event_date_display', 'small'));
$node->event['end_date_format'] = event_format_date($node->event['end_exploded'], 'custom', $format);
$node->event['end_time_format'] = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
}
@@ -2328,10 +2338,10 @@
$node->event['end_exploded'] = event_explode_date($node->event['end']);
$format = event_strip_time(variable_get('date_format_short', 'm/d/Y - H:i'));
- $node->event['start_format'] = event_format_date($node->event['start_exploded'], 'small');
+ $node->event['start_format'] = event_format_date($node->event['start_exploded'], variable_get('event_date_display', 'small'));
$node->event['start_date_format'] = event_format_date($node->event['start_exploded'], 'custom', $format);
$node->event['start_time_format'] = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
- $node->event['end_format'] = event_format_date($node->event['end_exploded'], 'small');
+ $node->event['end_format'] = event_format_date($node->event['end_exploded'], variable_get('event_date_display', 'small'));
$node->event['end_date_format'] = event_format_date($node->event['end_exploded'], 'custom', $format);
$node->event['end_time_format'] = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
--- event.theme.org 2008-12-25 16:19:17.000000000 +0000
+++ event.theme 2009-06-29 18:39:17.000000000 +0100
@@ -96,6 +96,8 @@
$variables['end_date_utc'] = $variables['node']->event['end_utc'];
$variables['start_date_formatted'] = $variables['node']->event['start_date_format'];
$variables['end_date_formatted'] = $variables['node']->event['end_date_format'];
+ $variables['start_formatted'] = $variables['node']->event['start_format'];
+ $variables['end_formatted'] = $variables['node']->event['end_format'];
if ($variables['node']->event['has_time']) {
$variables['start_time_formatted'] = $variables['node']->event['start_time_format'];
$variables['end_time_formatted'] = $variables['node']->event['end_time_format'];
@@ -356,6 +358,8 @@
$variables['node_type'] = check_plain($variables['node']->type);
$variables['start_date_formatted'] = $variables['node']->event['start_date_format'];
$variables['end_date_formatted'] = $variables['node']->event['end_date_format'];
+ $variables['start_formatted'] = $variables['node']->event['start_format'];
+ $variables['end_formatted'] = $variables['node']->event['end_format'];
if ($variables['node']->event['has_time']) {
$variables['start_time_formatted'] = $variables['node']->event['start_time_format'];
$variables['end_time_formatted'] = $variables['node']->event['end_time_format'];