diff -u b/core/includes/theme.inc b/core/includes/theme.inc --- b/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2262,30 +2262,39 @@ // From theme.inc. 'html' => array( 'variables' => array('page_object' => NULL), + 'template' => 'html', ), 'page' => array( 'render element' => 'page', + 'template' => 'page', ), 'region' => array( 'render element' => 'elements', + 'template' => 'region', ), 'time' => array( 'variables' => array('timestamp' => NULL, 'text' => NULL, 'attributes' => array(), 'html' => FALSE), + 'template' => 'time', ), 'datetime_form' => array( + 'template' => 'datetime-form', 'render element' => 'element', ), 'datetime_wrapper' => array( + 'template' => 'datetime-wrapper', 'render element' => 'element', ), 'status_messages' => array( 'variables' => array('display' => NULL), + 'template' => 'status-messages', ), 'links' => array( 'variables' => array('links' => array(), 'attributes' => array('class' => array('links')), 'heading' => array(), 'set_active_class' => FALSE), + 'template' => 'links', ), 'dropbutton_wrapper' => array( 'variables' => array('children' => NULL), + 'template' => 'dropbutton-wrapper', ), 'image' => array( // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft @@ -2301,27 +2310,35 @@ // The title attribute is optional in all cases, so it is omitted by // default. 'variables' => array('uri' => NULL, 'width' => NULL, 'height' => NULL, 'alt' => '', 'title' => NULL, 'attributes' => array()), + 'template' => 'image', ), 'breadcrumb' => array( 'variables' => array('links' => array()), + 'template' => 'breadcrumb', ), 'table' => array( 'variables' => array('header' => NULL, 'rows' => NULL, 'footer' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''), + 'template' => 'table', ), 'tablesort_indicator' => array( 'variables' => array('style' => NULL), + 'template' => 'tablesort-indicator', ), 'mark' => array( 'variables' => array('status' => MARK_NEW), + 'template' => 'mark', ), 'item_list' => array( 'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array(), 'empty' => NULL), + 'template' => 'item-list', ), 'feed_icon' => array( 'variables' => array('url' => NULL, 'title' => NULL), + 'template' => 'feed-icon', ), 'progress_bar' => array( 'variables' => array('label' => NULL, 'percent' => NULL, 'message' => NULL), + 'template' => 'progress-bar', ), 'indentation' => array( 'variables' => array('size' => 1), @@ -2330,12 +2347,15 @@ // From theme.maintenance.inc. 'maintenance_page' => array( 'render element' => 'page', + 'template' => 'maintenance-page', ), 'install_page' => array( 'render element' => 'page', + 'template' => 'install-page', ), 'task_list' => array( 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), + 'template' => 'task-list', ), 'authorize_message' => array( 'variables' => array('message' => NULL, 'success' => TRUE), @@ -2348,67 +2368,88 @@ // From pager.inc. 'pager' => array( 'variables' => array('tags' => array(), 'element' => 0, 'parameters' => array(), 'quantity' => 9), + 'template' => 'pager', ), // From menu.inc. 'menu_link' => array( 'render element' => 'element', 'function' => 'theme_menu_link', + 'path' => 'core/includes', + 'file' => 'menu.inc', ), 'menu_tree' => array( 'render element' => 'tree', + 'template' => 'menu-tree', ), 'menu_local_task' => array( 'render element' => 'element', + 'template' => 'menu-local-task', ), 'menu_local_action' => array( 'render element' => 'element', + 'template' => 'menu-local-action', ), 'menu_local_tasks' => array( 'variables' => array('primary' => array(), 'secondary' => array()), + 'template' => 'menu-local-tasks', ), // From form.inc. 'input' => array( 'render element' => 'element', + 'template' => 'input', ), 'select' => array( 'render element' => 'element', + 'template' => 'select', ), 'fieldset' => array( 'render element' => 'element', + 'template' => 'fieldset', ), 'details' => array( 'render element' => 'element', + 'template' => 'details', ), 'radios' => array( 'render element' => 'element', + 'template' => 'radios', ), 'checkboxes' => array( 'render element' => 'element', + 'template' => 'checkboxes', ), 'form' => array( 'render element' => 'element', + 'template' => 'form', ), 'textarea' => array( 'render element' => 'element', + 'template' => 'textarea', ), 'form_element' => array( 'render element' => 'element', + 'template' => 'form-element', ), 'form_element_label' => array( 'render element' => 'element', + 'template' => 'form-element-label', ), 'vertical_tabs' => array( 'render element' => 'element', + 'template' => 'vertical-tabs', ), 'container' => array( 'render element' => 'element', + 'template' => 'container', ), // From field system. 'field' => array( 'render element' => 'element', + 'template' => 'field', ), 'field_multiple_value_form' => array( 'render element' => 'element', + 'template' => 'field-multiple-value-form', ), ); } diff -u b/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module --- b/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -59,22 +59,27 @@ 'aggregator_feed_source' => array( 'variables' => array('aggregator_feed' => NULL, 'view_mode' => NULL), 'file' => 'aggregator.theme.inc', + 'template' => 'aggregator-feed-source', ), 'aggregator_block_item' => array( 'variables' => array('item' => NULL, 'feed' => 0), 'file' => 'aggregator.theme.inc', + 'template' => 'aggregator-block-item', ), 'aggregator_summary_items' => array( 'variables' => array('summary_items' => NULL, 'source' => NULL), 'file' => 'aggregator.theme.inc', + 'template' => 'aggregator-summary-items', ), 'aggregator_summary_item' => array( 'variables' => array('aggregator_item' => NULL, 'view_mode' => NULL), 'file' => 'aggregator.theme.inc', + 'template' => 'aggregator-summary-item', ), 'aggregator_item' => array( 'variables' => array('aggregator_item' => NULL, 'view_mode' => NULL), 'file' => 'aggregator.theme.inc', + 'template' => 'aggregator-item', ), 'aggregator_page_opml' => array( 'variables' => array('feeds' => NULL), reverted: --- b/core/modules/block/block.module +++ a/core/modules/block/block.module @@ -53,9 +53,11 @@ return array( 'block' => array( 'render element' => 'elements', + 'template' => 'block', ), 'block_list' => array( 'render element' => 'form', + 'template' => 'block-list', ), ); } reverted: --- b/core/modules/block_content/block_content.module +++ a/core/modules/block_content/block_content.module @@ -46,6 +46,7 @@ 'block_content_add_list' => array( 'variables' => array('content' => NULL), 'file' => 'block_content.pages.inc', + 'template' => 'block-content-add-list', ), ); } diff -u b/core/modules/book/book.module b/core/modules/book/book.module --- b/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -54,9 +54,11 @@ return array( 'book_navigation' => array( 'variables' => array('book_link' => NULL), + 'template' => 'book-navigation', ), 'book_tree' => array( 'render element' => 'tree', + 'template' => 'book-tree', ), 'book_link' => array( 'render element' => 'element', @@ -64,6 +66,7 @@ ), 'book_export_html' => array( 'variables' => array('title' => NULL, 'contents' => NULL, 'depth' => NULL), + 'template' => 'book-export-html', ), 'book_admin_table' => array( 'render element' => 'form', @@ -72,9 +75,11 @@ ), 'book_all_books_block' => array( 'render element' => 'book_menus', + 'template' => 'book-all-books-block', ), 'book_node_export_html' => array( 'variables' => array('node' => NULL, 'children' => NULL), + 'template' => 'book-node-export-html', ), ); } reverted: --- b/core/modules/ckeditor/ckeditor.module +++ a/core/modules/ckeditor/ckeditor.module @@ -40,6 +40,7 @@ 'ckeditor_settings_toolbar' => array( 'file' => 'ckeditor.admin.inc', 'variables' => array('editor' => NULL, 'plugins' => NULL), + 'template' => 'ckeditor-settings-toolbar', ), ); } reverted: --- b/core/modules/color/color.module +++ a/core/modules/color/color.module @@ -38,6 +38,7 @@ return array( 'color_scheme_form' => array( 'render element' => 'form', + 'template' => 'color-scheme-form', ), ); } reverted: --- b/core/modules/comment/comment.module +++ a/core/modules/comment/comment.module @@ -129,9 +129,11 @@ return array( 'comment' => array( 'render element' => 'elements', + 'template' => 'comment', ), 'field__comment' => array( 'base hook' => 'field', + 'template' => 'field--comment', ), ); } reverted: --- b/core/modules/file/file.module +++ a/core/modules/file/file.module @@ -577,22 +577,27 @@ // From file.module. 'file_link' => array( 'variables' => array('file' => NULL, 'icon_directory' => NULL, 'description' => NULL, 'attributes' => array()), + 'template' => 'file-link', ), 'file_managed_file' => array( 'render element' => 'element', + 'template' => 'file-managed-file', ), // From file.field.inc. 'file_widget' => array( 'render element' => 'element', + 'template' => 'file-widget', 'file' => 'file.field.inc', ), 'file_widget_multiple' => array( 'render element' => 'element', + 'template' => 'file-widget-multiple', 'file' => 'file.field.inc', ), 'file_upload_help' => array( 'variables' => array('description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL), + 'template' => 'file-upload-help', 'file' => 'file.field.inc', ), ); reverted: --- b/core/modules/filter/filter.module +++ a/core/modules/filter/filter.module @@ -61,6 +61,7 @@ return array( 'filter_tips' => array( 'variables' => array('tips' => NULL, 'long' => FALSE), + 'template' => 'filter-tips', ), 'text_format_wrapper' => array( 'variables' => array( @@ -68,9 +69,11 @@ 'description' => NULL, 'attributes' => array(), ), + 'template' => 'text-format-wrapper', ), 'filter_guidelines' => array( 'variables' => array('format' => NULL), + 'template' => 'filter-guidelines', ), 'filter_caption' => array( 'variables' => array( @@ -79,6 +82,7 @@ 'caption' => NULL, 'classes' => NULL, ), + 'template' => 'filter-caption', ) ); } reverted: --- b/core/modules/forum/forum.module +++ a/core/modules/forum/forum.module @@ -82,15 +82,19 @@ function forum_theme() { return array( 'forums' => array( + 'template' => 'forums', 'variables' => array('forums' => array(), 'topics' => array(), 'topics_pager' => array(), 'parents' => NULL, 'term' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL, 'header' => array()), ), 'forum_list' => array( + 'template' => 'forum-list', 'variables' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL), ), 'forum_icon' => array( + 'template' => 'forum-icon', 'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE), ), 'forum_submitted' => array( + 'template' => 'forum-submitted', 'variables' => array('topic' => NULL), ), ); reverted: --- b/core/modules/image/image.module +++ a/core/modules/image/image.module @@ -107,38 +107,47 @@ 'title' => NULL, 'attributes' => array(), ), + 'template' => 'image-style', ), // Theme functions in image.admin.inc. 'image_style_preview' => array( 'variables' => array('style' => NULL), 'file' => 'image.admin.inc', + 'template' => 'image-style-preview', ), 'image_anchor' => array( 'render element' => 'element', 'file' => 'image.admin.inc', + 'template' => 'image-anchor', ), 'image_resize_summary' => array( 'variables' => array('data' => NULL, 'effect' => array()), + 'template' => 'image-resize-summary', ), 'image_scale_summary' => array( 'variables' => array('data' => NULL, 'effect' => array()), + 'template' => 'image-scale-summary', ), 'image_crop_summary' => array( 'variables' => array('data' => NULL, 'effect' => array()), + 'template' => 'image-crop-summary', ), 'image_rotate_summary' => array( 'variables' => array('data' => NULL, 'effect' => array()), + 'template' => 'image-rotate-summary', ), // Theme functions in image.field.inc. 'image_widget' => array( 'render element' => 'element', 'file' => 'image.field.inc', + 'template' => 'image-widget', ), 'image_formatter' => array( 'variables' => array('item' => NULL, 'item_attributes' => NULL, 'path' => NULL, 'image_style' => NULL), 'file' => 'image.field.inc', + 'template' => 'image-formatter', ), ); } diff -u b/core/modules/language/language.module b/core/modules/language/language.module --- b/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -106,6 +106,7 @@ 'language_negotiation_configure_form' => array( 'render element' => 'form', 'file' => 'language.admin.inc', + 'template' => 'language-negotiation-configure-form', ), 'language_negotiation_configure_browser_form_table' => array( 'render element' => 'form', reverted: --- b/core/modules/link/link.module +++ a/core/modules/link/link.module @@ -41,6 +41,7 @@ return array( 'link_formatter_link_separate' => array( 'variables' => array('title' => NULL, 'url_title' => NULL, 'url' => NULL), + 'template' => 'link-formatter-link-separate', ), ); } diff -u b/core/modules/locale/locale.module b/core/modules/locale/locale.module --- b/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -198,10 +198,12 @@ 'locale_translation_last_check' => array( 'variables' => array('last' => NULL), 'file' => 'locale.pages.inc', + 'template' => 'locale-translation-last-check', ), 'locale_translation_update_info' => array( 'variables' => array('updates' => array(), 'not_found' => array()), 'file' => 'locale.pages.inc', + 'template' => 'locale-translation-update-info', ), ); } diff -u b/core/modules/node/node.module b/core/modules/node/node.module --- b/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -159,6 +159,7 @@ return array( 'node' => array( 'render element' => 'elements', + 'template' => 'node', ), 'node_search_admin' => array( 'render element' => 'form', @@ -167,18 +168,23 @@ 'node_add_list' => array( 'variables' => array('content' => NULL), 'file' => 'node.pages.inc', + 'template' => 'node-add-list', ), 'node_edit_form' => array( 'render element' => 'form', + 'template' => 'node-edit-form', ), 'field__node__title' => array( 'base hook' => 'field', + 'template' => 'field--node--title', ), 'field__node__uid' => array( 'base hook' => 'field', + 'template' => 'field--node--uid', ), 'field__node__created' => array( 'base hook' => 'field', + 'template' => 'field--node--created', ), ); } reverted: --- b/core/modules/rdf/rdf.module +++ a/core/modules/rdf/rdf.module @@ -250,6 +250,7 @@ return array( 'rdf_metadata' => array( 'variables' => array('metadata' => array()), + 'template' => 'rdf-metadata', ), ); } reverted: --- b/core/modules/search/search.module +++ a/core/modules/search/search.module @@ -104,6 +104,7 @@ 'search_result' => array( 'variables' => array('result' => NULL, 'plugin_id' => NULL), 'file' => 'search.pages.inc', + 'template' => 'search-result', ), ); } reverted: --- b/core/modules/simpletest/simpletest.module +++ a/core/modules/simpletest/simpletest.module @@ -56,6 +56,7 @@ return array( 'simpletest_result_summary' => array( 'variables' => array('label' => NULL, 'items' => array(), 'pass' => 0, 'fail' => 0, 'exception' => 0, 'debug' => 0), + 'template' => 'simpletest-result-summary', ), ); } diff -u b/core/modules/system/system.module b/core/modules/system/system.module --- b/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -159,6 +159,7 @@ // is picked up. 'block__system_branding_block' => array( 'base hook' => 'block', + 'template' => 'block--system-branding-block', ), 'system_themes_page' => array( 'variables' => array( @@ -166,12 +167,15 @@ 'theme_group_titles' => array(), ), 'file' => 'system.admin.inc', + 'template' => 'system-themes-page', ), 'system_config_form' => array( 'render element' => 'form', + 'template' => 'system-config-form', ), 'confirm_form' => array( 'render element' => 'form', + 'template' => 'confirm-form', ), 'system_modules_details' => array( 'render element' => 'form', @@ -186,22 +190,27 @@ 'status_report' => array( 'variables' => array('requirements' => NULL), 'file' => 'system.admin.inc', + 'template' => 'status-report', ), 'admin_page' => array( 'variables' => array('blocks' => NULL), 'file' => 'system.admin.inc', + 'template' => 'admin-page', ), 'admin_block' => array( 'variables' => array('block' => NULL), 'file' => 'system.admin.inc', + 'template' => 'admin-block', ), 'admin_block_content' => array( 'variables' => array('content' => NULL), 'file' => 'system.admin.inc', + 'template' => 'admin-block-content', ), 'system_admin_index' => array( 'variables' => array('menu_items' => NULL), 'file' => 'system.admin.inc', + 'template' => 'system-admin-index', ), 'system_compact_link' => array( 'variables' => array(), diff -u b/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module --- b/core/modules/system/tests/modules/common_test/common_test.module +++ b/core/modules/system/tests/modules/common_test/common_test.module @@ -115,9 +115,11 @@ return array( 'common_test_foo' => array( 'variables' => array('foo' => 'foo', 'bar' => 'bar'), + 'template' => 'common-test-foo', ), 'common_test_render_element' => array( 'render element' => 'foo', + 'template' => 'common-test-render-element', ), 'common_test_empty' => array( 'variables' => array('foo' => 'foo'), diff -u b/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module --- b/core/modules/system/tests/modules/theme_test/theme_test.module +++ b/core/modules/system/tests/modules/theme_test/theme_test.module @@ -18,15 +18,19 @@ 'template' => 'theme_test.template_test', ); $items['theme_test_suggestion_provided'] = array( + 'template' => 'theme-test-suggestion-provided', 'variables' => array(), ); $items['theme_test_specific_suggestions'] = array( + 'template' => 'theme-test-specific-suggestions', 'variables' => array(), ); $items['theme_test_suggestions'] = array( + 'template' => 'theme-test-suggestions', 'variables' => array(), ); $items['theme_test_general_suggestions'] = array( + 'template' => 'theme-test-general-suggestions', 'variables' => array(), ); $items['theme_test_function_suggestions'] = array( @@ -43,6 +47,7 @@ ); $items['theme_test_render_element'] = array( 'render element' => 'elements', + 'template' => 'theme-test-render-element', ); $items['theme_test_render_element_children'] = array( 'render element' => 'element', reverted: --- b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module +++ a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module @@ -9,8 +9,7 @@ 'template' => 'twig_theme_test.filter', ); $items['twig_theme_test_php_variables'] = array( + 'template' => 'twig_theme_test.php_variables', - 'variables' => array(), - 'tempalate' => 'twig_theme_test.php_variables', ); $items['twig_theme_test_trans'] = array( 'variables' => array(), @@ -22,9 +21,11 @@ ); $items['twig_raw_test'] = array( 'variables' => array('script' => ''), + 'template' => 'twig-raw-test', ); $items['twig_autoescape_test'] = array( 'variables' => array('script' => ''), + 'template' => 'twig-autoescape-test', ); $items['twig_theme_test_url_generator'] = array( 'variables' => array(), reverted: --- b/core/modules/system/theme.api.php +++ a/core/modules/system/theme.api.php @@ -49,6 +49,7 @@ * 'plugin_id' => NULL, * ), * 'file' => 'search.pages.inc', + * 'template' => 'search-result', * ), * ); * @endcode reverted: --- b/core/modules/taxonomy/taxonomy.module +++ a/core/modules/taxonomy/taxonomy.module @@ -219,6 +219,7 @@ return array( 'taxonomy_term' => array( 'render element' => 'elements', + 'template' => 'taxonomy-term', ), ); } diff -u b/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module --- b/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -50,6 +50,7 @@ function toolbar_theme($existing, $type, $theme, $path) { $items['toolbar'] = array( 'render element' => 'element', + 'template' => 'toolbar', ); return $items; reverted: --- b/core/modules/user/user.module +++ a/core/modules/user/user.module @@ -100,9 +100,11 @@ 'user' => array( 'render element' => 'elements', 'file' => 'user.pages.inc', + 'template' => 'user', ), 'username' => array( 'variables' => array('account' => NULL, 'attributes' => array(), 'link_options' => array()), + 'template' => 'username', ), ); } diff -u b/core/modules/views/views.module b/core/modules/views/views.module --- b/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -121,6 +121,7 @@ // Our extra version of pager from pager.inc $hooks['views_mini_pager'] = $base + array( 'variables' => array('tags' => array(), 'quantity' => 9, 'element' => 0, 'parameters' => array()), + 'template' => 'views-mini-pager', ); $variables = array( @@ -158,6 +159,7 @@ ); $hooks['views_view_grouping'] = $base + array( 'variables' => array('view' => NULL, 'grouping' => NULL, 'grouping_level' => NULL, 'rows' => NULL, 'title' => NULL), + 'template' => 'views-view-grouping', ); $plugins = Views::getPluginDefinitions(); @@ -233,11 +235,13 @@ ); $hooks['views_exposed_form'] = $base + array( + 'template' => 'views-exposed-form', 'render element' => 'form', ); $hooks['views_more'] = $base + array( 'variables' => array('more_url' => NULL, 'link_text' => 'more', 'view' => NULL), + 'template' => 'views-more', ); return $hooks; diff -u b/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module --- b/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -70,25 +70,31 @@ // edit a view 'views_ui_display_tab_setting' => array( 'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()), + 'template' => 'views-ui-display-tab-setting', 'file' => 'views_ui.theme.inc', ), 'views_ui_display_tab_bucket' => array( 'render element' => 'element', + 'template' => 'views-ui-display-tab-bucket', 'file' => 'views_ui.theme.inc', + 'function' => 'theme_views_ui_rearrange_filter_form', ), 'views_ui_rearrange_filter_form' => array( 'render element' => 'form', 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-rearrange-filter-form', ), 'views_ui_expose_filter_form' => array( 'render element' => 'form', 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-expose-filter-form', ), // list views 'views_ui_view_info' => array( 'variables' => array('view' => NULL, 'displays' => NULL), 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-view-info', ), // Group of filters. @@ -102,18 +108,21 @@ 'views_ui_style_plugin_table' => array( 'render element' => 'form', 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-style-plugin-table', ), // When previewing a view. 'views_ui_view_preview_section' => array( 'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''), 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-view-preview-section', ), // Generic container wrapper, to use instead of theme_container when an id // is not desired. 'views_ui_container' => array( 'variables' => array('children' => NULL, 'attributes' => array()), + 'template' => 'views-ui-container', 'file' => 'views_ui.theme.inc', ), );