commit 37e9020d80ef404d57a505307ee7fc1c5d457f1a Author: Jen Lampton Date: Thu Jun 27 15:13:51 2013 -0700 remove duplicate template file diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index 85b878c..1f98ad6 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -52,7 +52,7 @@ function datetime_element_info() { '#input' => TRUE, '#element_validate' => array('datetime_datelist_validate'), '#process' => array('datetime_datelist_form_process'), - '#theme' => 'datelist_form', + '#theme' => 'datetime_form', '#theme_wrappers' => array('datetime_wrapper'), '#date_part_order' => array('year', 'month', 'day', 'hour', 'minute'), '#date_year_range' => '1900:2050', @@ -72,10 +72,6 @@ function datetime_theme() { 'template' => 'datetime-form', 'render element' => 'element', ), - 'datelist_form' => array( - 'template' => 'datelist-form', - 'render element' => 'element', - ), 'datetime_wrapper' => array( 'template' => 'datetime-wrapper', 'render element' => 'element', @@ -339,32 +335,6 @@ function template_preprocess_datetime_form(&$variables) { } /** - * Prepares variables for date selection form templates. - * - * Default template: datelist-form.html.twig. - * - * @param array $variables - * An associative array containing: - * - element: An associative array containing the properties of the element. - * Properties used: #title, #value, #options, #description, #required, - * #attributes. - */ -function template_preprocess_datelist_form(&$variables) { - $element = $variables['element']; - - $variables['attributes'] = array(); - if (isset($element['#id'])) { - $variables['attributes']['id'] = $element['#id']; - } - if (!empty($element['#attributes']['class'])) { - $variables['attributes']['class'] = (array) $element['#attributes']['class']; - } - $variables['attributes']['class'][] = 'container-inline'; - - $variables['content'] = $element; -} - -/** * Prepares variables for datetime form wrapper templates. * * Default template: datetime-wrapper.html.twig. diff --git a/core/modules/datetime/templates/datelist-form.html.twig b/core/modules/datetime/templates/datelist-form.html.twig deleted file mode 100644 index c8d02e6..0000000 --- a/core/modules/datetime/templates/datelist-form.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{# -/** - * @file - * Default theme implementation of a datelist form element. - * - * Available variables: - * - attributes: HTML attributes for the datelist form element. - * - content: The datelist form element to be output. - * - * @see template_preprocess_datelist_form() - * - * @ingroup themeable - */ -#} - - {{ content }} -