diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 02:13:13 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 02:13:13 +0000 |
| commit | dd5f5518d83e46c13232e0fa82118539aae0faa7 (patch) | |
| tree | 600c8c95e942f752c9980ba22630227282a5c172 /mod | |
| parent | de8cccfd3f729fce4350a3391208acf2450a3f83 (diff) | |
| download | elgg-dd5f5518d83e46c13232e0fa82118539aae0faa7.tar.gz elgg-dd5f5518d83e46c13232e0fa82118539aae0faa7.tar.bz2 | |
Fixes #2980: DRY'ed up all plugins to use elgg_view_icon instead of generating their own html
git-svn-id: http://code.elgg.org/elgg/trunk@8410 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
4 files changed, 25 insertions, 16 deletions
diff --git a/mod/bookmarks/views/default/bookmarks/page_links.php b/mod/bookmarks/views/default/bookmarks/page_links.php index 92ea8600a..8774230f0 100644 --- a/mod/bookmarks/views/default/bookmarks/page_links.php +++ b/mod/bookmarks/views/default/bookmarks/page_links.php @@ -11,7 +11,7 @@ $url = 'pg/bookmarks/add/' . elgg_get_logged_in_user_guid() $return[] = new ElggMenuItem('bookmark_this_page', elgg_echo('bookmarks:this'), $url); echo elgg_view('output/url', array( - 'text' => '<span class="elgg-icon elgg-icon-bookmark"></span>', + 'text' => elgg_view_icon('bookmark'), 'href' => $url, 'title' => $label, 'rel' => 'nofollow', diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index e9485d260..dc1ae795d 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -63,12 +63,12 @@ if ($full && !elgg_in_context('gallery')) { 'tags' => $tags, ); $bookmark_info = elgg_view('layout/objects/list/body', $params); - + $bookmark_icon = elgg_view_icon('bookmark'); echo <<<HTML $header $bookmark_info <div class="bookmark elgg-content"> - <span class="elgg-icon elgg-icon-bookmark"></span><h3 class="pbl">$link</h3> + $bookmark_icon<h3 class="pbl">$link</h3> $description </div> HTML; @@ -103,7 +103,7 @@ HTML; 'text' => $display_text ))); - $content = "<span class=\"elgg-icon elgg-icon-bookmark\"></span>$link{$excerpt}"; + $content = elgg_view_icon('bookmark') . "$link{$excerpt}"; $params = array( 'entity' => $bookmark, diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php index 89aa8cbc6..be444adb8 100644 --- a/mod/developers/views/default/theme_preview/icons.php +++ b/mod/developers/views/default/theme_preview/icons.php @@ -9,17 +9,26 @@ <?php echo elgg_view('theme_preview/header', $vars); ?> <h2>Icon Sprites</h2> <ul class="mbl clearfix"> - <li><span class="elgg-icon elgg-icon-settings"></span>Settings</li> - <li><span class="elgg-icon elgg-icon-friends"></span>Friends</li> - <li><span class="elgg-icon elgg-icon-help"></span>Help</li> - <li><span class="elgg-icon elgg-icon-delete"></span>Delete</li> - <li><span class="elgg-icon elgg-icon-likes"></span>Likes</li> - <li><span class="elgg-icon elgg-icon-liked"></span>Liked</li> - <li><span class="elgg-icon elgg-icon-following"></span>Following</li> - <li><span class="elgg-icon elgg-icon-dragger"></span>Dragger</li> - <li><span class="elgg-icon elgg-icon-rss"></span>RSS</li> - <li><span class="elgg-icon elgg-icon-arrow-s"></span>Arrow S</li> - <li><span class="elgg-icon elgg-icon-hover-menu"></span>Hover Menu</li> + <?php + $icons = array( + 'settings' => 'Settings', + 'friends' => 'Friends', + 'help' => 'Help', + 'delete' => 'Delete', + 'likes' => 'Likes', + 'liked' => 'Liked', + 'following' => 'Following', + 'dragger' => 'Dragger', + 'rss' => 'RSS', + 'arrow-s' => 'Arrow S', + 'hover-menu' => 'Hover Menu', + ); + + foreach ($icons as $icon_id => $icon_label) { + echo "<li>" . elgg_view_icon($icon_id) . $icon_label . "</li>"; + } + + ?> </ul> <h2>Ajax loader</h2> <div class="mbl"> diff --git a/mod/thewire/views/default/thewire/metadata.php b/mod/thewire/views/default/thewire/metadata.php index da749c97f..0ae7cb0a0 100644 --- a/mod/thewire/views/default/thewire/metadata.php +++ b/mod/thewire/views/default/thewire/metadata.php @@ -41,7 +41,7 @@ if ($entity->canEdit() && $handler) { $delete_url = "action/$handler/delete?guid={$entity->getGUID()}"; $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, - 'text' => '<span class="elgg-icon elgg-icon-delete"></span>', + 'text' => elgg_view_icon('delete'), 'title' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), 'text_encode' => false, |