diff --git modules/system/system.module modules/system/system.module
index 78ec082..4fff604 100644
--- modules/system/system.module
+++ modules/system/system.module
@@ -291,6 +291,7 @@ function system_elements() {
'#process' => array('form_process_text_format', 'form_process_ahah'),
'#theme' => 'textfield',
'#theme_wrapper' => 'form_element',
+ '#pre_render' => array('form_pre_render_textfield'),
);
$type['password'] = array(
@@ -429,6 +430,8 @@ function system_elements() {
'#theme_wrapper' => 'vertical_tabs',
'#default_tab' => '',
'#process' => array('form_process_vertical_tabs'),
+ '#attached_js' => array(array('data'=> 'misc/vertical-tabs.js', 'weight' => JS_DEFAULT - 1)),
+ '#attached_css' => array('misc/vertical-tabs.css'),
);
$type['token'] = array(
diff --git modules/user/user-profile.tpl.php modules/user/user-profile.tpl.php
index 5398d00..a0cf79b 100644
--- modules/user/user-profile.tpl.php
+++ modules/user/user-profile.tpl.php
@@ -8,27 +8,13 @@
* This template is used when viewing a registered member's profile page,
* e.g., example.com/user/123. 123 being the users ID.
*
- * By default, all user profile data is printed out with the $user_profile
- * variable. If there is a need to break it up you can use $profile instead.
- * It is keyed to the name of each category or other data attached to the
- * account. If it is a category it will contain all the profile items. By
- * default $profile['summary'] is provided which contains data on the user's
- * history. Other data can be included by modules. $profile['user_picture'] is
- * available by default showing the account picture.
- *
- * Also keep in mind that profile items and their categories can be defined by
- * site administrators. They are also available within $profile. For example,
- * if a site is configured with a category of "contact" with
- * fields for of addresses, phone numbers and other related info, then doing a
- * straight print of $profile['contact'] will output everything in the
- * category. This is useful for altering source order and adding custom
- * markup for the group.
- *
- * To check for all available data within $profile, use the code below.
- *
- * @code
- * print '
'. check_plain(print_r($profile, 1)) .'
';
- * @endcode
+ * Use render($user_profile) to print all profile items, or print a subset
+ * such as render($content['field_example']). Always call render($user_profile)
+ * at the end in order to print all remaining items. If the item is a category,
+ * it will contain all it's profile items. By default, $user_profile['summary']
+ * is provided which contains data on the user's history. Other data can be
+ * included by modules. $user_profile['user_picture'] is available
+ * for showing the account picture.
*
* @see user-profile-category.tpl.php
* Where the html is handled for the group.
@@ -36,14 +22,16 @@
* Where the html is handled for each item in the group.
*
* Available variables:
- * - $user_profile: All user profile data. Ready for print.
- * - $profile: Keyed array of profile categories and their items or other data
- * provided by modules.
+ * - $user_profile: An array of profile items. Use dr() to print them.
* - TODO D7 : document $FIELD_NAME_rendered variables.
*
* @see template_preprocess_user_profile()
*/
+
+// Uncomment the line below to see what variables are available in this template.
+// print '
' . check_plain(print_r(get_defined_vars(), TRUE)) . '
';
+
?>
-
+
diff --git modules/user/user.pages.inc modules/user/user.pages.inc
index de3f82a..c27fd40 100644
--- modules/user/user.pages.inc
+++ modules/user/user.pages.inc
@@ -185,20 +185,11 @@ function user_view($account) {
* The $variables array contains the following arguments:
* - $account
*
- * @see user-picture.tpl.php
+ * @see user-profile.tpl.php
*/
function template_preprocess_user_profile(&$variables) {
$account = $variables['elements']['#account'];
-
- $variables['profile'] = array();
- // Sort sections by weight
- uasort($account->content, 'element_sort');
- // Provide keyed variables so themers can print each section independently.
- foreach (element_children($account->content) as $key) {
- $variables['profile'][$key] = drupal_render($account->content[$key]);
- }
- // Collect all profiles to make it easier to print all items at once.
- $variables['user_profile'] = implode($variables['profile']);
+ $variables['user_profile'] = $account->content;
// Add $FIELD_NAME_rendered variables for fields.
$variables += field_attach_preprocess('user', $account);
diff --git themes/garland/block.tpl.php themes/garland/block.tpl.php
index 6e13ff8..e0dec6f 100644
--- themes/garland/block.tpl.php
+++ themes/garland/block.tpl.php
@@ -7,5 +7,5 @@
subject ?>
-
content ?>
+
diff --git themes/garland/node.tpl.php themes/garland/node.tpl.php
index 7e7a6ed..9508d99 100644
--- themes/garland/node.tpl.php
+++ themes/garland/node.tpl.php
@@ -14,21 +14,21 @@
diff --git themes/garland/page.tpl.php themes/garland/page.tpl.php
index c93dfea..f211971 100644
--- themes/garland/page.tpl.php
+++ themes/garland/page.tpl.php
@@ -15,7 +15,7 @@
-
+