diff options
Diffstat (limited to 'mod/pages')
| -rw-r--r-- | mod/pages/images/pages.gif | bin | 3098 -> 2766 bytes | |||
| -rw-r--r-- | mod/pages/images/pages_lrg.gif | bin | 11394 -> 10234 bytes | |||
| -rw-r--r-- | mod/pages/languages/en.php | 11 | ||||
| -rw-r--r-- | mod/pages/manifest.xml | 2 | ||||
| -rw-r--r-- | mod/pages/start.php | 17 |
5 files changed, 23 insertions, 7 deletions
diff --git a/mod/pages/images/pages.gif b/mod/pages/images/pages.gif Binary files differindex 2e4ee761a..7efcb7278 100644 --- a/mod/pages/images/pages.gif +++ b/mod/pages/images/pages.gif diff --git a/mod/pages/images/pages_lrg.gif b/mod/pages/images/pages_lrg.gif Binary files differindex 2e41e4739..234a52672 100644 --- a/mod/pages/images/pages_lrg.gif +++ b/mod/pages/images/pages_lrg.gif diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php index 1c6d0318c..eb9d22708 100644 --- a/mod/pages/languages/en.php +++ b/mod/pages/languages/en.php @@ -27,7 +27,16 @@ $english = array( 'pages:revision' => "Revision", 'pages:navigation' => "Navigation", - 'pages:via' => "via pages", + 'pages:new' => "A new page", + 'pages:notification' => +'%s added a new page: + +%s +%s + +View and comment on the new page: +%s +', 'item:object:page_top' => 'Top-level pages', 'item:object:page' => 'Pages', 'pages:nogroup' => 'This group does not have any pages yet', diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml index 6990bd6b0..4cf999f45 100644 --- a/mod/pages/manifest.xml +++ b/mod/pages/manifest.xml @@ -6,7 +6,7 @@ <category>bundled</category> <category>content</category> <category>widget</category> - <description>Elgg Pages</description> + <description>Collaborative editing tool. Enables users to create pages similar to a wiki without having to know wiki syntax.</description> <website>http://www.elgg.org</website> <copyright>See COPYRIGHT.txt</copyright> <license>GNU General Public License version 2</license> diff --git a/mod/pages/start.php b/mod/pages/start.php index b2f26c719..834e98870 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -189,10 +189,12 @@ function pages_icon_url_override($hook, $type, $returnvalue, $params) { if (elgg_instanceof($entity, 'object', 'page_top') || elgg_instanceof($entity, 'object', 'page')) { switch ($params['size']) { + case 'topbar': + case 'tiny': case 'small': return 'mod/pages/images/pages.gif'; break; - case 'medium': + default: return 'mod/pages/images/pages_lrg.gif'; break; } @@ -264,13 +266,18 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) { $entity = $params['entity']; $to_entity = $params['to_entity']; $method = $params['method']; - if (($entity instanceof ElggEntity) && (($entity->getSubtype() == 'page_top') || ($entity->getSubtype() == 'page'))) { + + if (elgg_instanceof($entity, 'object', 'page') || elgg_instanceof($entity, 'object', 'page_top')) { $descr = $entity->description; $title = $entity->title; - //@todo why? - $url = elgg_get_site_url() . "view/" . $entity->guid; $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + + return elgg_echo('pages:notification', array( + $owner->name, + $title, + $descr, + $entity->getURL() + )); } return null; } |
