Index: modules/block/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.tpl.php,v retrieving revision 1.8 diff -u -p -r1.8 block.tpl.php --- modules/block/block.tpl.php 4 Jan 2010 03:57:19 -0000 1.8 +++ modules/block/block.tpl.php 11 Jan 2010 20:55:24 -0000 @@ -24,10 +24,32 @@ * - $title_suffix (array): An array containing additional output populated by * modules, intended to be displayed after the main title tag that appears in * the template. + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * Helper variables: * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region. * - $zebra: Same output as $block_zebra but independent of any block region. * - $block_id: Counter dependent on each block region. Index: modules/comment/comment-wrapper.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment-wrapper.tpl.php,v retrieving revision 1.8 diff -u -p -r1.8 comment-wrapper.tpl.php --- modules/comment/comment-wrapper.tpl.php 11 Sep 2009 06:48:02 -0000 1.8 +++ modules/comment/comment-wrapper.tpl.php 11 Jan 2010 20:55:24 -0000 @@ -13,6 +13,22 @@ * CSS. It can be manipulated through the variable $classes_array from * preprocess functions. The default value has the following: * - comment-wrapper: The current template type, i.e., "theming hook". + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * The following variables are provided for contextual information. * - $node: Node object the comments are attached to. @@ -25,6 +41,12 @@ * Other variables: * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * * @see template_preprocess_comment_wrapper() * @see theme_comment_wrapper() Index: modules/comment/comment.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v retrieving revision 1.18 diff -u -p -r1.18 comment.tpl.php --- modules/comment/comment.tpl.php 7 Jan 2010 05:23:51 -0000 1.18 +++ modules/comment/comment.tpl.php 11 Jan 2010 20:55:24 -0000 @@ -41,6 +41,22 @@ * - $title_suffix (array): An array containing additional output populated by * modules, intended to be displayed after the main title tag that appears in * the template. + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * These two variables are provided for context: * - $comment: Full comment object. @@ -49,6 +65,12 @@ * Other variables: * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * * @see template_preprocess() * @see template_preprocess_comment() Index: modules/field/theme/field.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/field/theme/field.tpl.php,v retrieving revision 1.10 diff -u -p -r1.10 field.tpl.php --- modules/field/theme/field.tpl.php 26 Dec 2009 16:50:08 -0000 1.10 +++ modules/field/theme/field.tpl.php 11 Jan 2010 20:55:24 -0000 @@ -21,6 +21,25 @@ * field type is "text" it would result in "field-type-text". * - field-label-[label_display]: The current label position. For example, if the * label position is "above" it would result in "field-label-above". + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. + * - $item_attributes: Array with the same keys as $items. For each item + * $items[$delta], the variable $item_attributes[$delta] is a string like + * $attributes, except applied to the tag containing the individual item. * * Other variables: * - $object: The object to which the field is attached. @@ -34,6 +53,16 @@ * - $label_display: Position of label display, inline, above, or hidden. * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. + * - $item_attributes_array: Array with the same keys as $items. For each item + * $items[$delta], the variable $item_attributes_array[$delta] is an array of + * html attribute names and values that is flattened into a string within the + * variable $item_attributes[$delta]. * * @see template_preprocess_field() */ Index: modules/node/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v retrieving revision 1.31 diff -u -p -r1.31 node.tpl.php --- modules/node/node.tpl.php 4 Jan 2010 03:57:19 -0000 1.31 +++ modules/node/node.tpl.php 11 Jan 2010 20:55:25 -0000 @@ -37,6 +37,22 @@ * - $title_suffix (array): An array containing additional output populated by * modules, intended to be displayed after the main title tag that appears in * the template. + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * Other variables: * - $node: Full node object. Contains data that may not be safe. @@ -46,6 +62,12 @@ * - $created: Time the node was published formatted in Unix timestamp. * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in * teaser listings. * - $id: Position of the node. Increments each time it's output. Index: modules/system/region.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/region.tpl.php,v retrieving revision 1.1 diff -u -p -r1.1 region.tpl.php --- modules/system/region.tpl.php 5 Oct 2009 02:43:01 -0000 1.1 +++ modules/system/region.tpl.php 11 Jan 2010 20:55:26 -0000 @@ -14,10 +14,32 @@ * - region-[name]: The name of the region with underscores replaced with * dashes. For example, the page_top region would have a region-page-top class. * - $region: The name of the region variable as defined in the theme's .info file. + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * Helper variables: * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * - $is_admin: Flags true when the current user is an administrator. * - $is_front: Flags true when presented in the front page. * - $logged_in: Flags true when the current user is a logged-in member. Index: modules/toolbar/toolbar.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.tpl.php,v retrieving revision 1.8 diff -u -p -r1.8 toolbar.tpl.php --- modules/toolbar/toolbar.tpl.php 16 Dec 2009 19:41:22 -0000 1.8 +++ modules/toolbar/toolbar.tpl.php 11 Jan 2010 20:55:26 -0000 @@ -13,10 +13,32 @@ * - $toolbar['toolbar_user']: User account / logout links. * - $toolbar['toolbar_menu']: Top level management menu links. * - $toolbar['toolbar_drawer']: A place for extended toolbar content. + * - $attributes: String of XHTML attributes populated by modules, intended to + * be added to the main container tag of this template. This is either an + * empty string or a string containing a leading space, so it should be + * printed without a leading space before what precedes it. By default, this + * variable does not include the id and class attributes, so that the template + * can separately control how these are printed. At its discretion, the theme + * may use a preprocess function to merge the id and/or class into this + * variable, in which case the template should not also print them separately. + * If the theme needs to manipulate this variable, it should do so within a + * preprocess function, through the variable $attributes_array. + * - $title_attributes: Same as $attributes, except applied to the main title + * tag that appears in the template. It can be manipulated through the + * variable $title_attributes_array from preprocess functions. + * - $content_attributes: Same as $attributes, except applied to the main + * content tag that appears in the template. It can be manipulated through the + * variable $content_attributes_array from preprocess functions. * * Other variables: * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. + * - $attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $attributes. + * - $title_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $title_attributes. + * - $content_attributes_array: Array of html attribute names and values. It is + * flattened into a string within the variable $content_attributes. * * @see template_preprocess() * @see template_preprocess_toolbar()