updated date pathauto addressfield honeypot features modules
This commit is contained in:
@@ -77,6 +77,7 @@ function theme_date_display_combination($variables) {
|
||||
$microdata = $variables['microdata'];
|
||||
$add_microdata = $variables['add_microdata'];
|
||||
$precision = date_granularity_precision($field['settings']['granularity']);
|
||||
$show_remaining_days = $variables['show_remaining_days'];
|
||||
|
||||
$output = '';
|
||||
|
||||
@@ -121,10 +122,12 @@ function theme_date_display_combination($variables) {
|
||||
$date1 = $dates['value']['formatted'];
|
||||
$date2 = $date1;
|
||||
break;
|
||||
|
||||
case 'value2':
|
||||
$date2 = $dates['value2']['formatted'];
|
||||
$date1 = $date2;
|
||||
break;
|
||||
|
||||
default:
|
||||
$date1 = $dates['value']['formatted'];
|
||||
$date2 = $dates['value2']['formatted'];
|
||||
@@ -151,6 +154,20 @@ function theme_date_display_combination($variables) {
|
||||
$has_time_string = FALSE;
|
||||
}
|
||||
|
||||
// Check remaining days.
|
||||
$show_remaining_days = '';
|
||||
if (!empty($variables['show_remaining_days'])) {
|
||||
$remaining_days = floor((strtotime($variables['dates']['value']['formatted_iso'])
|
||||
- strtotime('now')) / (24 * 3600));
|
||||
|
||||
// Show remaining days only for future events.
|
||||
if ($remaining_days >= 0) {
|
||||
$show_remaining_days = theme('date_display_remaining', array(
|
||||
'remaining_days' => $remaining_days,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// No date values, display nothing.
|
||||
if (empty($date1) && empty($date2)) {
|
||||
$output .= '';
|
||||
@@ -167,6 +184,7 @@ function theme_date_display_combination($variables) {
|
||||
'microdata' => $microdata,
|
||||
'add_microdata' => $add_microdata,
|
||||
'dates' => $dates,
|
||||
'show_remaining_days' => $show_remaining_days,
|
||||
));
|
||||
}
|
||||
// Same day, different times, don't repeat the date but show both Start and
|
||||
@@ -186,6 +204,7 @@ function theme_date_display_combination($variables) {
|
||||
'microdata' => $microdata,
|
||||
'add_microdata' => $add_microdata,
|
||||
'dates' => $dates,
|
||||
'show_remaining_days' => $show_remaining_days,
|
||||
));
|
||||
$replaced = str_replace($time1, $time, $date1);
|
||||
$output .= theme('date_display_single', array(
|
||||
@@ -209,6 +228,7 @@ function theme_date_display_combination($variables) {
|
||||
'microdata' => $microdata,
|
||||
'add_microdata' => $add_microdata,
|
||||
'dates' => $dates,
|
||||
'show_remaining_days' => $show_remaining_days,
|
||||
));
|
||||
}
|
||||
|
||||
@@ -236,12 +256,12 @@ function template_preprocess_date_display_single(&$variables) {
|
||||
// Because the Entity API integration for Date has a variable data
|
||||
// structure depending on whether there is an end value, the attributes
|
||||
// could be attached to the field or to the value property.
|
||||
if(!empty($variables['microdata']['#attributes']['itemprop'])) {
|
||||
if (!empty($variables['microdata']['#attributes']['itemprop'])) {
|
||||
$variables['microdata']['value']['#attributes'] = $variables['microdata']['#attributes'];
|
||||
}
|
||||
|
||||
// Add the machine readable time using the content attribute.
|
||||
if(!empty($variables['microdata']['value']['#attributes'])) {
|
||||
if (!empty($variables['microdata']['value']['#attributes'])) {
|
||||
$variables['microdata']['value']['#attributes']['content'] = $variables['dates']['value']['formatted_iso'];
|
||||
}
|
||||
else {
|
||||
@@ -257,6 +277,7 @@ function theme_date_display_single($variables) {
|
||||
$date = $variables['date'];
|
||||
$timezone = $variables['timezone'];
|
||||
$attributes = $variables['attributes'];
|
||||
$show_remaining_days = isset($variables['show_remaining_days']) ? $variables['show_remaining_days'] : '';
|
||||
|
||||
// Wrap the result with the attributes.
|
||||
$output = '<span class="date-display-single"' . drupal_attributes($attributes) . '>' . $date . $timezone . '</span>';
|
||||
@@ -265,7 +286,8 @@ function theme_date_display_single($variables) {
|
||||
$output .= '<meta' . drupal_attributes($variables['microdata']['value']['#attributes']) . '/>';
|
||||
}
|
||||
|
||||
return $output;
|
||||
// Add remaining message and return.
|
||||
return $output . $show_remaining_days;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -314,6 +336,7 @@ function theme_date_display_range($variables) {
|
||||
$timezone = $variables['timezone'];
|
||||
$attributes_start = $variables['attributes_start'];
|
||||
$attributes_end = $variables['attributes_end'];
|
||||
$show_remaining_days = $variables['show_remaining_days'];
|
||||
|
||||
$start_date = '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $date1 . '</span>';
|
||||
$end_date = '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $date2 . $timezone . '</span>';
|
||||
@@ -326,10 +349,13 @@ function theme_date_display_range($variables) {
|
||||
}
|
||||
|
||||
// Wrap the result with the attributes.
|
||||
return t('!start-date to !end-date', array(
|
||||
$output = '<div class="date-display-range">' . t('!start-date to !end-date', array(
|
||||
'!start-date' => $start_date,
|
||||
'!end-date' => $end_date,
|
||||
));
|
||||
)) . '</div>';
|
||||
|
||||
// Add remaining message and return.
|
||||
return $output . $show_remaining_days;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -375,7 +401,7 @@ function theme_date_combo($variables) {
|
||||
'#title' => field_filter_xss(t($element['#title'])) . ' ' . ($element['#delta'] > 0 ? intval($element['#delta'] + 1) : ''),
|
||||
'#value' => '',
|
||||
'#description' => !empty($element['#fieldset_description']) ? $element['#fieldset_description'] : '',
|
||||
'#attributes' => array(),
|
||||
'#attributes' => array('class' => array('date-combo')),
|
||||
'#children' => $element['#children'],
|
||||
);
|
||||
// Add marker to required date fields.
|
||||
@@ -396,7 +422,11 @@ function theme_date_text_parts($variables) {
|
||||
$rows[] = drupal_render($element[$key]);
|
||||
}
|
||||
else {
|
||||
$rows[] = array($part, drupal_render($element[$key][0]), drupal_render($element[$key][1]));
|
||||
$rows[] = array(
|
||||
$part,
|
||||
drupal_render($element[$key][0]),
|
||||
drupal_render($element[$key][1]),
|
||||
);
|
||||
}
|
||||
}
|
||||
if ($element['year']['#type'] == 'hidden') {
|
||||
@@ -408,4 +438,49 @@ function theme_date_text_parts($variables) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Render a date combo as a form element.
|
||||
*/
|
||||
function theme_date_form_element($variables) {
|
||||
$element = &$variables['element'];
|
||||
|
||||
// Detect whether element is multiline.
|
||||
$count = preg_match_all('`<(?:div|span)\b[^>]* class="[^"]*\b(?:date-no-float|date-clear)\b`', $element['#children'], $matches, PREG_OFFSET_CAPTURE);
|
||||
$multiline = FALSE;
|
||||
if ($count > 1) {
|
||||
$multiline = TRUE;
|
||||
}
|
||||
elseif ($count) {
|
||||
$before = substr($element['#children'], 0, $matches[0][0][1]);
|
||||
if (preg_match('`<(?:div|span)\b[^>]* class="[^"]*\bdate-float\b`', $before)) {
|
||||
$multiline = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
// Detect if there is more than one subfield.
|
||||
$count = count(explode('<label', $element['#children'])) - 1;
|
||||
if ($count == 1) {
|
||||
$element['#title_display'] = 'none';
|
||||
}
|
||||
|
||||
// Wrap children with a div and add an extra class if element is multiline.
|
||||
$element['#children'] = '<div class="date-form-element-content'. ($multiline ? ' date-form-element-content-multiline' : '') .'">'. $element['#children'] .'</div>';
|
||||
|
||||
return theme('form_element', $variables);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns HTML for remaining message.
|
||||
*/
|
||||
function theme_date_display_remaining($variables) {
|
||||
$remaining_days = $variables['remaining_days'];
|
||||
$output = '';
|
||||
$show_remaining_text = t('The upcoming date less then 1 day.');
|
||||
if ($remaining_days) {
|
||||
$show_remaining_text = format_plural($remaining_days, 'To event remaining 1 day', 'To event remaining @count days');
|
||||
}
|
||||
|
||||
return '<div class="date-display-remaining"><span class="date-display-remaining">' . $show_remaining_text . '</span></div>';
|
||||
}
|
||||
|
||||
/** @} End of addtogroup themeable */
|
||||
|
||||
Reference in New Issue
Block a user