Removed obsolete $ in source files

This commit is contained in:
Manuel Cillero 2017-08-29 14:13:02 +02:00
parent a39c010e06
commit e5f2b64d98
146 changed files with 836 additions and 1081 deletions

View file

@ -1,7 +1,6 @@
<?php
// $Id: calendar-datebox.tpl.php,v 1.2.2.3 2010/11/21 14:15:32 karens Exp $
/**
* @file
* @file
* Template to display the date box in a calendar.
*
* - $view: The view.
@ -16,4 +15,4 @@
* - $items: An array of items for this day.
*/
?>
<div class="<?php print $granularity ?> <?php print $class; ?>"> <?php print $selected ? $link : $day; ?> </div>
<div class="<?php print $granularity ?> <?php print $class; ?>"> <?php print $selected ? $link : $day; ?> </div>

View file

@ -1,19 +1,18 @@
<?php
// $Id: calendar-day-node.tpl.php,v 1.2.2.4 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a view item as a calendar day node.
*
* $node
*
* $node
* A node object for this calendar item. Note this is
* not a complete node object, but it will have $node->nid
* that you can use to load the full object, and
* $node->type to tell the content type of the node.
*
*
* $fields
* An array of information for every field selected in the 'Fields'
* section of this view, formatted as requested in the View setup.
*
*
* Calendar info for this individual calendar item is in local time --
* the user timezone where configurable timezones are allowed and set,
* otherwise the site timezone. If this item has extends over more than
@ -21,20 +20,20 @@
* date and calendar_start will be no earlier than the start of
* the current day and calendar_end will be no later than the end
* of the current day.
*
*
* $calendar_start - A formatted datetime start date for this item.
* i.e. '2008-05-12 05:26:15'.
* $calendar_end - A formatted datetime end date for this item,
* the same as the start date except for fields that have from/to
* fields defined, like Date module dates.
* fields defined, like Date module dates.
* $calendar_start_date - a PHP date object for the start time.
* $calendar_end_date - a PHP date object for the end time.
*
*
* You can use PHP date functions on the date object to display date
* information in other ways, like:
*
*
* print date_format($calendar_start_date, 'l, j F Y - g:ia');
*
*
* @see template_preprocess_calendar_day_node.
*/
?>
@ -45,9 +44,9 @@
<div class="view-field view-data-<?php print $field['id']; ?> <?php print $field['id']; ?>">
<?php if ($field['label']): ?>
<div class="view-label-<?php print $field['id'] ?>"><?php print $field['label'] ?></div>
<?php endif; ?>
<?php endif; ?>
<?php print $field['data']; ?>
</div>
</div>
<?php endforeach; ?>
</div>
</div>
</div>

View file

@ -1,10 +1,9 @@
<?php
// $Id: calendar-day.tpl.php,v 1.7.2.10 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a view as a calendar day, grouped by time
* and optionally organized into columns by a field value.
*
*
* @see template_preprocess_calendar_day.
*
* $rows: The rendered data for this day.
@ -15,17 +14,17 @@
* $rows['items'] - an array of timed items for the day.
* $rows['items'][$time_period]['hour'] - the formatted hour for a time period.
* $rows['items'][$time_period]['ampm'] - the formatted ampm value, if any for a time period.
* $rows['items'][$time_period][$column]['values'] - An array of formatted
* $rows['items'][$time_period][$column]['values'] - An array of formatted
* items for a time period and field column.
*
*
* $view: The view.
* $columns: an array of column names.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
*
* The width of the columns is dynamically set using <col></col>
*
* The width of the columns is dynamically set using <col></col>
* based on the number of columns presented. The values passed in will
* work to set the 'hour' column to 10% and split the remaining columns
* work to set the 'hour' column to 10% and split the remaining columns
* evenly over the remaining 90% of the table.
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
@ -57,7 +56,7 @@
</div>
</div>
</td>
<?php endforeach; ?>
<?php endforeach; ?>
</tr>
<?php foreach ($rows['items'] as $hour): ?>
<tr>
@ -73,9 +72,9 @@
</div>
</div>
</td>
<?php endforeach; ?>
<?php endforeach; ?>
</tr>
<?php endforeach; ?>
<?php endforeach; ?>
</tbody>
</table>
</div></div>
</div></div>

View file

@ -1,9 +1,8 @@
<?php
// $Id: calendar-main.tpl.php,v 1.2.2.4 2009/01/10 20:04:18 karens Exp $
/**
* @file
* Template to display calendar navigation and links.
*
*
* @see template_preprocess_calendar_main.
*
* $view: The view.
@ -13,7 +12,7 @@
* $mini: Whether this is a mini view.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
*
*
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
?>
@ -23,4 +22,4 @@
<?php if (!empty($calendar_add_date)) print $calendar_add_date; ?>
<?php if (empty($block)) print theme('links', $calendar_links);?>
<?php print theme('date_navigation', $view) ?>
</div>
</div>

View file

@ -1,9 +1,8 @@
<?php
// $Id: calendar-mini.tpl.php,v 1.1.2.7 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a view as a mini calendar month.
*
*
* @see template_preprocess_calendar_mini.
*
* $day_names: An array of the day of week names for the table header.
@ -11,17 +10,17 @@
* $view: The view.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
*
*
* $show_title: If the title should be displayed. Normally false since the title is incorporated
* into the navigation, but sometimes needed, like in the year view of mini calendars.
*
*
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
?>
<div class="calendar-calendar"><div class="month-view">
<?php if ($view->date_info->show_title): ?>
<?php print theme('date_navigation', $view); ?>
<?php endif; ?>
<?php endif; ?>
<table class="mini">
<thead>
<tr>
@ -44,4 +43,4 @@
<?php endforeach; ?>
</tbody>
</table>
</div></div>
</div></div>

View file

@ -1,10 +1,9 @@
<?php
// $Id: calendar-month-multiple-node.tpl.php,v 1.1.2.6 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a summary of the days items as a calendar month node.
*
*
*
*
* @see template_preprocess_calendar_month_multiple_node.
*/
?>
@ -17,12 +16,12 @@
<?php endforeach; ?>
<div class="view-item <?php print views_css_safe('view-item-'. $view->name) ?>">
<?php if ($view->date_info->style_max_items_behavior != 'more'): ?>
<div class="multiple-events">
<div class="multiple-events">
<?php print l(t('Click to see all @count events', array('@count' => $count)), $link) ?>
</div>
</div>
</div>
<?php else: ?>
<div class="calendar-more"><?php print l(t('more'), $link) ?>»</div>
<?php endif; ?>
</div>
</div>
</div>

View file

@ -1,19 +1,18 @@
<?php
// $Id: calendar-month-node.tpl.php,v 1.2.2.6 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a view item as a calendar month node.
*
* $node
*
* $node
* A node object for this calendar item. Note this is
* not a complete node object, but it will have $node->nid
* that you can use to load the full object, and
* $node->type to tell the content type of the node.
*
*
* $fields
* An array of information for every field selected in the 'Fields'
* section of this view, formatted as requested in the View setup.
*
*
* Calendar info for this individual calendar item is in local time --
* the user timezone where configurable timezones are allowed and set,
* otherwise the site timezone. If this item has extends over more than
@ -21,20 +20,20 @@
* date and calendar_start will be no earlier than the start of
* the current day and calendar_end will be no later than the end
* of the current day.
*
*
* $calendar_start - A formatted datetime start date for this item.
* i.e. '2008-05-12 05:26:15'.
* $calendar_end - A formatted datetime end date for this item,
* the same as the start date except for fields that have from/to
* fields defined, like Date module dates.
* fields defined, like Date module dates.
* $calendar_start_date - a PHP date object for the start time.
* $calendar_end_date - a PHP date object for the end time.
*
*
* You can use PHP date functions on the date object to display date
* information in other ways, like:
*
*
* print date_format($calendar_start_date, 'l, j F Y - g:ia');
*
*
* @see template_preprocess_calendar_month_node.
*/
?>
@ -45,9 +44,9 @@
<div class="view-field view-data-<?php print $field['id']; ?> <?php print $field['id']; ?>">
<?php if ($field['label']): ?>
<div class="view-label-<?php print $field['id'] ?>"><?php print $field['label'] ?></div>
<?php endif; ?>
<?php endif; ?>
<?php print $field['data']; ?>
</div>
</div>
<?php endforeach; ?>
</div>
</div>
</div>

View file

@ -1,9 +1,8 @@
<?php
// $Id: calendar-month.tpl.php,v 1.6.2.3 2008/06/19 22:55:56 karens Exp $
/**
* @file
* Template to display a view as a calendar month.
*
*
* @see template_preprocess_calendar_month.
*
* $day_names: An array of the day of week names for the table header.
@ -14,9 +13,9 @@
* $block: Whether or not this calendar is in a block.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $date_id: a css id that is unique for this date,
* $date_id: a css id that is unique for this date,
* it is in the form: calendar-nid-field_name-delta
*
*
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
?>
@ -43,4 +42,4 @@
<?php endforeach; ?>
</tbody>
</table>
</div></div>
</div></div>

View file

@ -1,11 +1,10 @@
<?php
// $Id: calendar-week-multiple-node.tpl.php,v 1.1.2.5 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a summary of the days items as a calendar week node.
*
*
* @see template_preprocess_calendar_week_multiple_node.
*/
*/
?>
<div class="view-item view-item-<?php print $view->name ?>">
<div class="<?php print $curday; ?> calendar weekview">
@ -16,12 +15,12 @@
<?php endforeach; ?>
<div class="view-item <?php print views_css_safe('view-item-'. $view->name) ?>">
<?php if ($view->date_info->style_max_items_behavior != 'more'): ?>
<div class="multiple-events">
<div class="multiple-events">
<?php print l(t('Click to see all @count events', array('@count' => $count)), $link) ?>
</div>
</div>
</div>
<?php else: ?>
<div class="calendar-more"><?php print l(t('more'), $link) ?>»</div>
<?php endif; ?>
</div>
</div>
</div>

View file

@ -1,19 +1,18 @@
<?php
// $Id: calendar-week-node.tpl.php,v 1.2.2.3 2010/11/21 13:19:37 karens Exp $
/**
* @file
* Template to display a view item as a calendar week node.
*
* $node
*
* $node
* A node object for this calendar item. Note this is
* not a complete node object, but it will have $node->nid
* that you can use to load the full object, and
* $node->type to tell the content type of the node.
*
*
* $fields
* An array of information for every field selected in the 'Fields'
* section of this view, formatted as requested in the View setup.
*
*
* Calendar info for this individual calendar item is in local time --
* the user timezone where configurable timezones are allowed and set,
* otherwise the site timezone. If this item has extends over more than
@ -21,22 +20,22 @@
* date and calendar_start will be no earlier than the start of
* the current day and calendar_end will be no later than the end
* of the current day.
*
*
* $calendar_start - A formatted datetime start date for this item.
* i.e. '2008-05-12 05:26:15'.
* $calendar_end - A formatted datetime end date for this item,
* the same as the start date except for fields that have from/to
* fields defined, like Date module dates.
* fields defined, like Date module dates.
* $calendar_start_date - a PHP date object for the start time.
* $calendar_end_date - a PHP date object for the end time.
*
*
* You can use PHP date functions on the date object to display date
* information in other ways, like:
*
*
* print date_format($calendar_start_date, 'l, j F Y - g:ia');
*
*
* @see template_preprocess_calendar_week_node.
*/
*/
?>
<div class="view-item view-item-<?php print $view->name ?>">
<div class="<?php print $node->date_id; ?> calendar weekview">
@ -45,9 +44,9 @@
<div class="view-field view-data-<?php print $field['id']; ?> <?php print $field['id']; ?>">
<?php if ($field['label']): ?>
<div class="view-label-<?php print $field['id'] ?>"><?php print $field['label'] ?></div>
<?php endif; ?>
<?php endif; ?>
<?php print $field['data']; ?>
</div>
</div>
<?php endforeach; ?>
</div>
</div>
</div>

View file

@ -1,14 +1,13 @@
<?php
// $Id: calendar-week.tpl.php,v 1.5.2.6 2009/02/16 23:46:22 karens Exp $
/**
* @file
* Template to display a view as a calendar week.
*
*
* @see template_preprocess_calendar_week.
*
* $day_names: An array of the day of week names for the table header.
* $rows: The rendered data for this week.
*
*
* For each day of the week, you have:
* $rows['date'] - the date for this day, formatted as YYYY-MM-DD.
* $rows['datebox'] - the formatted datebox for this day.
@ -18,11 +17,11 @@
* $rows['items'][$time_period]['hour'] - the formatted hour for a time period.
* $rows['items'][$time_period]['ampm'] - the formatted ampm value, if any for a time period.
* $rows['items'][$time_period]['values'] - An array of formatted items for a time period.
*
*
* $view: The view.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
*
*
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
//dsm($rows);
@ -55,7 +54,7 @@
</div>
</div>
</td>
<?php endforeach; ?>
<?php endforeach; ?>
</tr>
<?php foreach ($items as $time): ?>
<tr>
@ -71,10 +70,10 @@
</div>
</div>
</td>
<?php endforeach; ?>
<?php endforeach; ?>
</tr>
<?php endforeach; ?>
<?php endforeach; ?>
</tbody>
</table>
</div></div>
</div></div>

View file

@ -1,16 +1,15 @@
<?php
// $Id: calendar-year.tpl.php,v 1.6.2.1 2008/06/14 11:38:34 karens Exp $
/**
* @file
* Template to display a view as a calendar year.
*
*
* @see template_preprocess_calendar_year.
*
* $view: The view.
* $months: An array with a formatted month calendar for each month of the year.
* $min_date_formatted: The minimum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
* $max_date_formatted: The maximum date for this calendar in the format YYYY-MM-DD HH:MM:SS.
*
*
*/
//dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
?>
@ -18,10 +17,10 @@
<div class="calendar-calendar"><div class="year-view">
<table <?php if ($mini): ?> class="mini"<?php endif; ?>>
<tbody>
<tr><td><?php print $months[1] ?></td><td><?php print $months[2] ?></td><td><?php print $months[3] ?></td></tr>
<tr><td><?php print $months[4] ?></td><td><?php print $months[5] ?></td><td><?php print $months[6] ?></td></tr>
<tr><td><?php print $months[7] ?></td><td><?php print $months[8] ?></td><td><?php print $months[9] ?></td></tr>
<tr><td><?php print $months[10] ?></td><td><?php print $months[11] ?></td><td><?php print $months[12] ?></td></tr>
<tr><td><?php print $months[1] ?></td><td><?php print $months[2] ?></td><td><?php print $months[3] ?></td></tr>
<tr><td><?php print $months[4] ?></td><td><?php print $months[5] ?></td><td><?php print $months[6] ?></td></tr>
<tr><td><?php print $months[7] ?></td><td><?php print $months[8] ?></td><td><?php print $months[9] ?></td></tr>
<tr><td><?php print $months[10] ?></td><td><?php print $months[11] ?></td><td><?php print $months[12] ?></td></tr>
</tbody>
</table>
</div></div>
</div></div>

View file

@ -1,5 +1,4 @@
<?php
// $Id: theme.inc,v 1.10.2.80 2011/01/03 12:45:27 karens Exp $
/**
* Display a calendar navigation and links
*/
@ -28,7 +27,7 @@ function template_preprocess_calendar_main(&$vars) {
}
elseif (!empty($view->date_info->week)) {
$week = date_week_range($view->date_info->week, $view->date_info->year);
$current_date = $week[0];
$current_date = $week[0];
}
elseif (!empty($view->date_info->month)) {
$current_date = date_make_date($view->date_info->year .'-'. date_pad($view->date_info->month) .'-01 00:00:00');
@ -76,19 +75,19 @@ function template_preprocess_calendar_main(&$vars) {
// If an 'Add new ... link is provided, add it here.
// the query will bring the user back here after adding the node.
if (!empty($view->date_info->calendar_date_link)
if (!empty($view->date_info->calendar_date_link)
&& (user_access("administer nodes") || user_access('create '. $view->date_info->calendar_date_link .' content'))) {
$name = node_get_types('name', $view->date_info->calendar_date_link);
$href = 'node/add/'. str_replace('_', '-', $view->date_info->calendar_date_link);
$query = 'destination='. $view->date_info->url;
$query = 'destination='. $view->date_info->url;
$vars['calendar_links']['calendar calendar-add'] = $base + array(
'title' => t('Add+'),
'href' => $href,
'title' => t('Add+'),
'href' => $href,
'query' => $query,
);
}
$vars['view'] = $view;
$vars['view'] = $view;
$vars['mini'] = !empty($view->date_info->mini);
$vars['block'] = !empty($view->date_info->block);
$vars['block_identifier'] = date_block_identifier($view);
@ -97,7 +96,7 @@ function template_preprocess_calendar_main(&$vars) {
/**
* Display a view as a calendar.
*
*
* This preprocessor does all the work needed for all types of calendar
* views and the template takes care of displaying links to related views.
*/
@ -117,7 +116,7 @@ function template_preprocess_calendar(&$vars) {
$fields = $view->field;
// Render each field into an output array. We have to do the rendering
// here because we don't apppear to have full access to the view
// here because we don't apppear to have full access to the view
// handlers in the theme functions.
$items = array();
$calendar_fields = date_api_fields($view->base_table);
@ -136,7 +135,7 @@ function template_preprocess_calendar(&$vars) {
}
foreach ($fields as $name => $field) {
// Some fields, like the node edit and delete links, have no alias.
$field_alias = $field->field_alias != 'unknown' ? $field->field_alias : $name;
$field_alias = $field->field_alias != 'unknown' ? $field->field_alias : $name;
if (!empty($field) && is_object($field)) {
// Theme the copy instead of the original row so duplicate date
// fields each get a fresh copy of the original data to theme.
@ -176,7 +175,7 @@ function template_preprocess_calendar(&$vars) {
$vars['rows'] = $rows;
$view->date_info->calendar_processed = TRUE;
$vars['view'] = $view;
$vars['view'] = $view;
$vars['mini'] = !empty($view->date_info->mini);
$vars['block'] = !empty($view->date_info->block);
}
@ -265,8 +264,8 @@ function template_preprocess_calendar_year(&$vars) {
$view = $vars['view'];
$year = date_format($view->date_info->min_date, 'Y');
// Construct a calendar for each month, adjusting the $view passed
// to the theme so it will produce the right results.
// Construct a calendar for each month, adjusting the $view passed
// to the theme so it will produce the right results.
$view = drupal_clone($vars['view']);
$rows = $vars['rows'];
$months = array();
@ -322,7 +321,7 @@ function template_preprocess_calendar_day(&$vars) {
$grouped_items = array();
foreach ($rows['all_day'] as $item) {
if (isset($item->{$grouping_field})) {
$column = $item->{$grouping_field};
$column = $item->{$grouping_field};
$item->{$grouping_field} = ''; // Remove the grouping field from the results.
if (!in_array($column, $columns)) {
$columns[] = $column;
@ -339,7 +338,7 @@ function template_preprocess_calendar_day(&$vars) {
// Moved timed items into the right columns and render them.
$start_times = $view->date_info->style_groupby_times;
$show_empty_times = $view->date_info->style_show_empty_times;
$show_empty_times = $view->date_info->style_show_empty_times;
$end_start_time = '23:59:59';
$start_time = array_shift($start_times);
$next_start_time = count($start_times) ? array_shift($start_times) : $end_start_time;
@ -361,7 +360,7 @@ function template_preprocess_calendar_day(&$vars) {
// slots if the option to show empty times was chosen.
while ($time >= $next_start_time && $time < $end_start_time) {
if ((!empty($show_empty_times)) && !array_key_exists($start_time, $grouped_items)) {
$grouped_items[$start_time]['values'] = array();
$grouped_items[$start_time]['values'] = array();
}
$start_time = $next_start_time;
$next_start_time = count($start_times) ? array_shift($start_times) : $end_start_time;
@ -377,7 +376,7 @@ function template_preprocess_calendar_day(&$vars) {
if (!empty($show_empty_times)) {
while ($start_time < $end_start_time) {
if (!array_key_exists($start_time, $grouped_items)) {
$grouped_items[$start_time]['values'] = array();
$grouped_items[$start_time]['values'] = array();
}
$start_time = $next_start_time;
$next_start_time = count($start_times) ? array_shift($start_times) : $end_start_time;
@ -391,8 +390,8 @@ function template_preprocess_calendar_day(&$vars) {
$next_start_time = array_key_exists($i + 1, $start_times) ? $start_times[$i + 1] : '23:59:59';
$heading = theme('calendar_time_row_heading', $start_time, $next_start_time, $rows['date']);
$grouped_items[$start_time]['hour'] = $heading['hour'];
$grouped_items[$start_time]['ampm'] = $heading['ampm'];
$i++;
$grouped_items[$start_time]['ampm'] = $heading['ampm'];
$i++;
}
ksort($grouped_items);
$vars['rows']['items'] = $grouped_items;
@ -444,7 +443,7 @@ function template_preprocess_calendar_week(&$vars) {
}
// Moved timed items into the right columns and render them.
$show_empty_times = $view->date_info->style_show_empty_times;
$show_empty_times = $view->date_info->style_show_empty_times;
$end_start_time = '23:59:59';
$grouped_items = array();
@ -477,15 +476,15 @@ function template_preprocess_calendar_week(&$vars) {
// slots if the option to show empty times was chosen.
while ($time >= $next_start_time && $time < $end_start_time) {
if (($show_empty_times) && !array_key_exists($start_time, $grouped_items)) {
$grouped_items[$start_time]['values'][$weekno] = array();
$grouped_items[$start_time]['values'][$weekno] = array();
}
$start_time = $next_start_time;
$next_start_time = count($start_times) ? array_shift($start_times) : $end_start_time;
}
$theme = isset($item->calendar_node_theme) ? $item->calendar_node_theme : 'calendar_'. $view->date_info->granularity .'_node';
$grouped_items[$start_time]['values'][$weekno][] = theme($theme, $item, $view);
$item_count++;
$by_hour_count++;
$item_count++;
$by_hour_count++;
}
}
@ -493,7 +492,7 @@ function template_preprocess_calendar_week(&$vars) {
if ($show_empty_times) {
while ($start_time < $end_start_time) {
if (!array_key_exists($start_time, $grouped_items)) {
$grouped_items[$start_time]['values'][$weekno] = array();
$grouped_items[$start_time]['values'][$weekno] = array();
}
$start_time = $next_start_time;
$next_start_time = count($start_times) ? array_shift($start_times) : $end_start_time;
@ -509,10 +508,10 @@ function template_preprocess_calendar_week(&$vars) {
$next_start_time = array_key_exists($i + 1, $start_times) ? $start_times[$i + 1] : '23:59:59';
$heading = theme('calendar_time_row_heading', $start_time, $next_start_time, $row['data']['date']);
$grouped_items[$start_time]['hour'] = $heading['hour'];
$grouped_items[$start_time]['ampm'] = $heading['ampm'];
$grouped_items[$start_time]['ampm'] = $heading['ampm'];
}
$vars['items'] = $grouped_items;
$vars['items'] = $grouped_items;
$vars['day_names'] = $day_names;
$vars['columns'] = $columns;
@ -566,7 +565,7 @@ function template_preprocess_calendar_node(&$vars) {
$fields = array();
foreach ($view->field as $name => $field) {
// Some fields, like the node edit and delete links, have no alias.
$field_alias = $field->field_alias != 'unknown' ? $field->field_alias : $name;
$field_alias = $field->field_alias != 'unknown' ? $field->field_alias : $name;
if (!empty($node->$field_alias)) {
$data = $node->$field_alias;
$label = $field->options['label'];
@ -597,7 +596,7 @@ function template_preprocess_calendar_node(&$vars) {
// We added the node type to the results in the query,
// but it will show up as $node->node_type instead of
// $node->type. Rename it to match the normal way it
// $node->type. Rename it to match the normal way it
// would show up on a node object.
$vars['node']->type = $vars['node']->node_type;
}
@ -704,7 +703,7 @@ function theme_calendar_stripe_legend() {
array('class' => 'calendar-legend', 'data' => t('Key'))
);
$rows = array();
$output = '';
$output = '';
foreach ((array) $GLOBALS['calendar_stripes'] as $label => $stripe) {
if($stripe){
$rows[] = array($label, '<div style="background-color:'. $stripe .';color:'. $stripe .'" class="stripe" title="Key: '. $label .'">&nbsp;</div>');