diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-06 19:16:23 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-06 19:16:23 +0000 |
| commit | c2d82db47ccdbd388658433d1f703c560d7fb84b (patch) | |
| tree | 0bb352e9f7f9b6f676a5a7b608c18b2fe363b39b /mod/pages/views | |
| parent | 562900f1b36820843a28d7b68f2f0f3e55e04dbf (diff) | |
| download | elgg-c2d82db47ccdbd388658433d1f703c560d7fb84b.tar.gz elgg-c2d82db47ccdbd388658433d1f703c560d7fb84b.tar.bz2 | |
Fixes #2853 pages plugin uses the icon url plugin hook and fixes delete action
git-svn-id: http://code.elgg.org/elgg/trunk@8044 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/pages/views')
5 files changed, 4 insertions, 41 deletions
diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php deleted file mode 100644 index ebf028ef7..000000000 --- a/mod/pages/views/default/icon/object/page/medium.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Page icon override medium - * - * @package ElggPages - */ - -echo elgg_get_site_url() . "mod/pages/images/pages_lrg.gif"; diff --git a/mod/pages/views/default/icon/object/page/small.php b/mod/pages/views/default/icon/object/page/small.php deleted file mode 100644 index 850c78a51..000000000 --- a/mod/pages/views/default/icon/object/page/small.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Page icon override small - * - * @package ElggPages - */ - -echo elgg_get_site_url() . "mod/pages/images/pages.gif";
\ No newline at end of file diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php deleted file mode 100644 index d1200ad61..000000000 --- a/mod/pages/views/default/icon/object/page_top/medium.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php -/** - * Top page icon override medium - * - * @package ElggPages - */ - -echo elgg_get_site_url() . "mod/pages/images/pages_lrg.gif"; -?> diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php deleted file mode 100644 index bb9e0047a..000000000 --- a/mod/pages/views/default/icon/object/page_top/small.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Top Page icon override small - * - * @package ElggPages - */ - -echo elgg_get_site_url() . "mod/pages/images/pages.gif"; diff --git a/mod/pages/views/default/pages/icon.php b/mod/pages/views/default/pages/icon.php index ede0e49d1..d3b749eb8 100644 --- a/mod/pages/views/default/pages/icon.php +++ b/mod/pages/views/default/pages/icon.php @@ -2,6 +2,8 @@ /** * Page icon * + * Uses a separate icon view due to dependency on annotation + * * @package ElggPages * * @uses $vars['entity'] @@ -12,18 +14,12 @@ $annotation = $vars['annotation']; $entity = get_entity($annotation->entity_guid); // Get size -if (!in_array($vars['size'], array('small','medium','large','tiny','master','topbar'))) { +if (!in_array($vars['size'], array('small', 'medium', 'large', 'tiny', 'master', 'topbar'))) { $vars['size'] = "medium"; } -if (!empty($vars['align'])) { - $align = " align=\"{$vars['align']}\" "; -} else { - $align = ""; -} - ?> <a href="<?php echo $annotation->getURL(); ?>"> - <img src="<?php echo $entity->getIconURL($vars['size']); ?>" <?php echo $align; ?> /> + <img src="<?php echo $entity->getIconURL($vars['size']); ?>" /> </a> |