diff options
author | Dries Buytaert <dries@buytaert.net> | 2004-08-04 20:40:01 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2004-08-04 20:40:01 +0000 |
commit | c71bfded3dea1754633f29ac8e81fb3ab46b766a (patch) | |
tree | 77a7a843b7b6d9c0f857c749b9acbab19c1f8e94 /modules | |
parent | a52cf8297aa8c012065a4cb4e3f6a6ee3e258fc1 (diff) | |
download | brdo-c71bfded3dea1754633f29ac8e81fb3ab46b766a.tar.gz brdo-c71bfded3dea1754633f29ac8e81fb3ab46b766a.tar.bz2 |
- Patch #9657: more intelligent theme() function. Hopefully, Adrian will be
able to use this patch too.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/aggregator.module | 4 | ||||
-rw-r--r-- | modules/aggregator/aggregator.module | 4 | ||||
-rw-r--r-- | modules/forum.module | 4 | ||||
-rw-r--r-- | modules/forum/forum.module | 4 | ||||
-rw-r--r-- | modules/system.module | 2 | ||||
-rw-r--r-- | modules/system/system.module | 2 | ||||
-rw-r--r-- | modules/user.module | 5 | ||||
-rw-r--r-- | modules/user/user.module | 5 |
8 files changed, 18 insertions, 12 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index 694568ad2..903535461 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -1039,7 +1039,9 @@ function theme_aggregator_block_item($item, $feed = 0) { global $user; if ($user->uid && module_exist('blog') && user_access('edit own blog')) { - $output .= '<div class="icon">'. l('<img src="'. theme('image', 'blog.png') .'" alt="'. t('blog it') .'" title="'. t('blog it') .'" />', 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>'; + if ($image = theme('misc/blog.png', t('blog it'), t('blog it'))) { + $output .= '<div class="icon">'. l($image, 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>'; + } } // external link diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 694568ad2..903535461 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -1039,7 +1039,9 @@ function theme_aggregator_block_item($item, $feed = 0) { global $user; if ($user->uid && module_exist('blog') && user_access('edit own blog')) { - $output .= '<div class="icon">'. l('<img src="'. theme('image', 'blog.png') .'" alt="'. t('blog it') .'" title="'. t('blog it') .'" />', 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>'; + if ($image = theme('misc/blog.png', t('blog it'), t('blog it'))) { + $output .= '<div class="icon">'. l($image, 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>'; + } } // external link diff --git a/modules/forum.module b/modules/forum.module index aaad68486..4d645cf02 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -705,9 +705,9 @@ function _forum_icon($new_posts, $num_posts = 0, $comment_mode = 0, $sticky = 0) } // default - $file = $base_path ."/forum-$icon.png"; + $file = "misc/forum-$icon.png"; - $output = "<img src=\"$file\" alt=\"\" title=\"\" />"; + $output = theme('image', $file); } else { $output = ' '; diff --git a/modules/forum/forum.module b/modules/forum/forum.module index aaad68486..4d645cf02 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -705,9 +705,9 @@ function _forum_icon($new_posts, $num_posts = 0, $comment_mode = 0, $sticky = 0) } // default - $file = $base_path ."/forum-$icon.png"; + $file = "misc/forum-$icon.png"; - $output = "<img src=\"$file\" alt=\"\" title=\"\" />"; + $output = theme('image', $file); } else { $output = ' '; diff --git a/modules/system.module b/modules/system.module index 9ea7daac2..170fd8090 100644 --- a/modules/system.module +++ b/modules/system.module @@ -233,7 +233,7 @@ function system_listing($type) { ksort($files); if ($type == 'module') { - $required = array('modules/admin.module', 'modules/filter.module', 'modules/system.module', 'modules/user.module', 'modules/watchdog.module'); + $required = array('modules/admin.module', 'modules/block.module', 'modules/filter.module', 'modules/system.module', 'modules/user.module', 'modules/watchdog.module'); // the throttle mechanism requires additional modules always be enabled $throttle_required = array_merge($required, array('modules/statistics.module', 'modules/throttle.module')); diff --git a/modules/system/system.module b/modules/system/system.module index 9ea7daac2..170fd8090 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -233,7 +233,7 @@ function system_listing($type) { ksort($files); if ($type == 'module') { - $required = array('modules/admin.module', 'modules/filter.module', 'modules/system.module', 'modules/user.module', 'modules/watchdog.module'); + $required = array('modules/admin.module', 'modules/block.module', 'modules/filter.module', 'modules/system.module', 'modules/user.module', 'modules/watchdog.module'); // the throttle mechanism requires additional modules always be enabled $throttle_required = array_merge($required, array('modules/statistics.module', 'modules/throttle.module')); diff --git a/modules/user.module b/modules/user.module index 9c9b0883c..42a5c395c 100644 --- a/modules/user.module +++ b/modules/user.module @@ -567,7 +567,8 @@ function theme_user_picture($account) { } if ($picture) { - $picture = "<img src=\"$picture\" alt=\"" . t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous')))) . '" />'; + $alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous')))); + $picture = theme('image', $picture, $alt, $alt); if ($account->uid) { $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.'))); } @@ -1019,7 +1020,7 @@ function user_edit_form($uid, $edit) { if (variable_get('user_pictures', 0)) { $group = ''; if (file_exists($edit['picture'])) { - $group .= '<img src="'. file_create_url($edit['picture']) .'" alt="" title="" />'; + $group .= theme('image', file_create_url($edit['picture'])); } $group .= form_file(t('Upload picture'), 'picture', 48, t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', '')); $data[] = array('title' => t('Picture'), 'data' => $group, 'weight' => 1); diff --git a/modules/user/user.module b/modules/user/user.module index 9c9b0883c..42a5c395c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -567,7 +567,8 @@ function theme_user_picture($account) { } if ($picture) { - $picture = "<img src=\"$picture\" alt=\"" . t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous')))) . '" />'; + $alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous')))); + $picture = theme('image', $picture, $alt, $alt); if ($account->uid) { $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.'))); } @@ -1019,7 +1020,7 @@ function user_edit_form($uid, $edit) { if (variable_get('user_pictures', 0)) { $group = ''; if (file_exists($edit['picture'])) { - $group .= '<img src="'. file_create_url($edit['picture']) .'" alt="" title="" />'; + $group .= theme('image', file_create_url($edit['picture'])); } $group .= form_file(t('Upload picture'), 'picture', 48, t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', '')); $data[] = array('title' => t('Picture'), 'data' => $group, 'weight' => 1); |