diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/color/color.module | 2 | ||||
-rw-r--r-- | modules/comment/comment.module | 38 | ||||
-rw-r--r-- | modules/dblog/dblog.module | 2 | ||||
-rw-r--r-- | modules/filter/filter.admin.inc | 2 | ||||
-rw-r--r-- | modules/filter/filter.module | 1 | ||||
-rw-r--r-- | modules/menu/menu.admin.inc | 2 | ||||
-rw-r--r-- | modules/node/node.admin.inc | 6 | ||||
-rw-r--r-- | modules/node/node.module | 14 | ||||
-rw-r--r-- | modules/node/node.pages.inc | 12 | ||||
-rw-r--r-- | modules/poll/poll.module | 2 | ||||
-rw-r--r-- | modules/syslog/syslog.module | 5 | ||||
-rw-r--r-- | modules/system/system.admin.inc | 11 | ||||
-rw-r--r-- | modules/system/system.module | 5 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.module | 5 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 2 | ||||
-rw-r--r-- | modules/trigger/trigger.admin.inc | 2 | ||||
-rw-r--r-- | modules/update/update.report.inc | 7 | ||||
-rw-r--r-- | modules/upload/upload.module | 6 |
18 files changed, 118 insertions, 6 deletions
diff --git a/modules/color/color.module b/modules/color/color.module index 516e98c69..d6cfb2050 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -160,6 +160,8 @@ function color_scheme_form(&$form_state, $theme) { /** * Theme color form. + * + * @ingroup @themeable */ function theme_color_scheme_form($form) { // Include stylesheet diff --git a/modules/comment/comment.module b/modules/comment/comment.module index dc217aca6..4876fe638 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1448,6 +1448,11 @@ function comment_form_submit($form, &$form_state) { } } +/** + * Return a themed comment. + * + * @ingroup themeable + */ function theme_comment_view($comment, $node, $links = array(), $visible = 1) { static $first_new = TRUE; @@ -1506,7 +1511,11 @@ function comment_controls($mode = COMMENT_MODE_THREADED_EXPANDED, $order = COMME return $form; } - +/** + * Theme comment controls box where the user can change the default display mode and display order of comments. + * + * @ingroup themeable + */ function theme_comment_controls($form) { $output = '<div class="container-inline">'; $output .= drupal_render($form); @@ -1575,22 +1584,47 @@ function template_preprocess_comment_folded(&$variables) { $variables['title'] = l($comment->subject, comment_node_url() .'/'. $comment->cid, array('fragment' => "comment-$comment->cid")); } +/** + * Theme collapsed flat type comment. + * + * @ingroup themeable + */ function theme_comment_flat_collapsed($comment, $node) { return theme('comment_view', $comment, $node, '', 0); } +/** + * Theme expanded flat type comment. + * + * @ingroup themeable + */ function theme_comment_flat_expanded($comment, $node) { return theme('comment_view', $comment, $node, module_invoke_all('link', 'comment', $comment, 0)); } +/** + * Theme collapsed thread type comment. + * + * @ingroup themeable + */ function theme_comment_thread_collapsed($comment, $node) { return theme('comment_view', $comment, $node, '', 0); } +/** + * Theme expanded thread type comment. + * + * @ingroup themeable + */ function theme_comment_thread_expanded($comment, $node) { return theme('comment_view', $comment, $node, module_invoke_all('link', 'comment', $comment, 0)); } +/** + * Theme the "comment posting is forbidden" message. + * + * @ingroup themeable + */ function theme_comment_post_forbidden($node) { global $user; if ($user->uid) { @@ -1634,6 +1668,8 @@ function template_preprocess_comment_wrapper(&$variables) { /** * Make the submitted variable themable + * + * @ingroup themeable */ function theme_comment_submitted($comment) { return t('Submitted by !username on @datetime.', diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index 0bacc217e..2ff90b91f 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -145,6 +145,8 @@ function dblog_watchdog($log = array()) { /** * Theme dblog administration filter selector. + * + * @ingroup themeable */ function theme_dblog_filters($form) { $output = ''; diff --git a/modules/filter/filter.admin.inc b/modules/filter/filter.admin.inc index 45a3836ad..36f253775 100644 --- a/modules/filter/filter.admin.inc +++ b/modules/filter/filter.admin.inc @@ -350,6 +350,8 @@ function filter_admin_order(&$form_state, $format = NULL) { /** * Theme filter order configuration form. + * + * @ingroup themeable */ function theme_filter_admin_order($form) { $header = array(t('Name'), t('Weight')); diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 306d6ff8b..4f4ed8240 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -576,7 +576,6 @@ function _filter_tips($format, $long = FALSE) { * * @ingroup themeable */ - function theme_filter_tips_more_info() { return '<p>'. l(t('More information about formatting options'), 'filter/tips') .'</p>'; } diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 779399b05..9996f5106 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -163,6 +163,8 @@ function menu_overview_form_submit($form, &$form_state) { /** * Theme the menu overview form into a table. + * + * @ingroup themeable */ function theme_menu_overview_form($form) { drupal_add_tabledrag('menu-overview', 'match', 'parent', 'menu-plid', 'menu-plid', 'menu-mlid', TRUE, MENU_MAX_DEPTH - 1); diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index d665233c5..e441e3e3d 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -236,6 +236,8 @@ function node_filter_form() { /** * Theme node administration filter form. + * + * @ingroup themeable */ function theme_node_filter_form($form) { $output = ''; @@ -248,6 +250,8 @@ function theme_node_filter_form($form) { /** * Theme node administration filter selector. + * + * @ingroup themeable */ function theme_node_filters($form) { $output = ''; @@ -403,6 +407,8 @@ function node_admin_nodes() { /** * Theme node administration overview. + * + * @ingroup themeable */ function theme_node_admin_nodes($form) { // If there are rows in this form, then $form['title'] contains a list of diff --git a/modules/node/node.module b/modules/node/node.module index c4ea1336e..e2a800bf8 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -148,6 +148,8 @@ function node_title_list($result, $title = NULL) { /** * Format a listing of links to nodes. + * + * @ingroup themeable */ function theme_node_list($items, $title = NULL) { return theme('item_list', $items, $title); @@ -1045,6 +1047,11 @@ function node_show($node, $cid) { return $output; } +/** + * Theme a log message. + * + * @ingroup themeable + */ function theme_node_log_message($log) { return '<div class="log"><div class="title">'. t('Log') .':</div>'. $log .'</div>'; } @@ -1234,6 +1241,11 @@ function node_user($op, &$edit, &$user) { } } +/** + * Theme the content ranking part of the search settings admin page. + * + * @ingroup themeable + */ function theme_node_search_admin($form) { $output = drupal_render($form['info']); @@ -2315,6 +2327,8 @@ function node_forms() { /** * Format the "Submitted by username on date/time" for each node + * + * @ingroup themeable */ function theme_node_submitted($node) { return t('Submitted by !username on @datetime', diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index d7f09af47..975f3d8f6 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -21,6 +21,11 @@ function node_add_page() { return theme('node_add_list', $content); } +/** + * Display the list of available node types for node creation. + * + * @ingroup themeable + */ function theme_node_add_list($content) { $output = ''; @@ -309,6 +314,11 @@ function node_form_build_preview($form, &$form_state) { $form_state['node_preview'] = node_preview($node); } +/** + * Present a node submission form. + * + * @ingroup themeable + */ function theme_node_form($form) { $output = "\n<div class=\"node-form\">\n"; @@ -399,6 +409,8 @@ function node_preview($node) { * * @param $node * The node object which is being previewed. + * + * @ingroup themeable */ function theme_node_preview($node) { $output = '<div class="preview">'; diff --git a/modules/poll/poll.module b/modules/poll/poll.module index dca6d09a9..586610553 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -636,6 +636,8 @@ function poll_view_results(&$node, $teaser, $page, $block) { /** * Theme the admin poll form for choices. + * + * @ingroup themeable */ function theme_poll_choices($form) { // Change the button title to reflect the behavior when using JavaScript. diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module index 9c00aaa4f..58ff3e7ce 100644 --- a/modules/syslog/syslog.module +++ b/modules/syslog/syslog.module @@ -88,6 +88,11 @@ function syslog_theme() { ); } +/** + * Format a system log entry. + * + * @ingroup themeable + */ function theme_syslog_format($entry) { global $base_url; diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 72f49b9a4..e48c583a7 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1711,7 +1711,8 @@ function system_batch_page() { * @param $block * An array containing information about the block. It should * include a 'title', a 'description' and a formatted 'content'. - * @themeable + * + * @ingroup themeable */ function theme_admin_block($block) { // Don't display the block if it has no content to display. @@ -1741,7 +1742,8 @@ EOT; * @param $block * An array containing information about the block. It should * include a 'title', a 'description' and a formatted 'content'. - * @themeable + * + * @ingroup themeable */ function theme_admin_block_content($content) { if (!$content) { @@ -1778,7 +1780,8 @@ function theme_admin_block_content($content) { * 'title', a 'description', a formatted 'content' and a * 'position' which will control which container it will be * in. This is usually 'left' or 'right'. - * @themeable + * + * @ingroup themeable */ function theme_admin_page($blocks) { $stripe = 0; @@ -1818,6 +1821,8 @@ function theme_admin_page($blocks) { /** * Theme output of the dashboard page. + * + * @ingroup themeable */ function theme_system_admin_by_module($menu_items) { $stripe = 0; diff --git a/modules/system/system.module b/modules/system/system.module index ca8e54703..4849b7489 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1706,6 +1706,11 @@ function _system_zonelist() { return $zones; } +/** + * Format the Powered by Drupal text. + * + * @ingroup themeable + */ function theme_system_powered_by($image_path) { $image = theme('image', $image_path, t('Powered by Drupal, an open source content management system'), t('Powered by Drupal, an open source content management system')); return l($image, 'http://drupal.org', array('html' => TRUE, 'absolute' => TRUE, 'external' => TRUE)); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index a247954b1..097e7c1ff 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1036,7 +1036,10 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti } /** - * We use the default selection field for choosing terms. + * Format the selection field for choosing terms + * (by deafult the default selection field is used). + * + * @ingroup themeable */ function theme_taxonomy_term_select($element) { return theme('select', $element); diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index 74f1db504..94dca7633 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -82,6 +82,8 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') { * An array of term ids. * @param $result * A pager_query() result, such as that performed by taxonomy_select_nodes(). + * + * @ingroup themeable */ function theme_taxonomy_term_page($tids, $result) { $output = ''; diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc index 4d5090422..0573ac8af 100644 --- a/modules/trigger/trigger.admin.inc +++ b/modules/trigger/trigger.admin.inc @@ -226,6 +226,8 @@ function trigger_assign_form_submit($form, $form_state) { * The fieldset including all assigned actions. * @return * The rendered form with the table prepended. + * + * @ingroup themeable */ function theme_trigger_display($element) { $header = array(); diff --git a/modules/update/update.report.inc b/modules/update/update.report.inc index 84c34c40c..2c5c283f4 100644 --- a/modules/update/update.report.inc +++ b/modules/update/update.report.inc @@ -22,6 +22,8 @@ function update_status() { /** * Theme project status report. + * + * @ingroup themeable */ function theme_update_report($data) { $last = variable_get('update_last_check', 0); @@ -197,6 +199,11 @@ function theme_update_report($data) { return $output; } +/** + * Theme the version display of a project. + * + * @ingroup themeable + */ function theme_update_version($version, $tag, $class) { $output = ''; $output .= '<table class="version '. $class .'">'; diff --git a/modules/upload/upload.module b/modules/upload/upload.module index fcd2f5a92..c35776426 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -340,6 +340,8 @@ function upload_nodeapi(&$node, $op, $teaser) { /** * Displays file attachments in table + * + * @ingroup themeable */ function theme_upload_attachments($files) { $header = array(t('Attachment'), t('Size')); @@ -517,6 +519,8 @@ function _upload_form($node) { /** * Theme the attachments list. + * + * @ingroup themeable */ function theme_upload_form_current(&$form) { $header = array('', t('Delete'), t('List'), t('Description'), t('Weight'), t('Size')); @@ -542,6 +546,8 @@ function theme_upload_form_current(&$form) { /** * Theme the attachment form. * Note: required to output prefix/suffix. + * + * @ingroup themeable */ function theme_upload_form_new($form) { $output = drupal_render($form); |