Fixes #3025: The wire uses core's metadata view.

git-svn-id: http://code.elgg.org/elgg/trunk@8633 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 0f51d052edda583b258acdc977e32b39da3b4410..a9a57690468efe68eee1e903958dee68d2706b24 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -24,6 +24,9 @@ function thewire_init() {
        // add a site navigation item\r
        $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'pg/thewire/all');\r
        elgg_register_menu_item('site', $item);\r
+\r
+       // remove entity menu items edit and access because they don't apply here.\r
+       elgg_register_plugin_hook_handler('prepare', 'menu:entity', 'thewire_remove_entity_menu_items');\r
        \r
        // Extend system CSS with our own styles, which are defined in the thewire/css view\r
        elgg_extend_view('css', 'thewire/css');\r
@@ -354,4 +357,26 @@ function thewire_test($hook, $type, $value, $params) {
        global $CONFIG;\r
        $value[] = $CONFIG->pluginspath . 'thewire/tests/regex.php';\r
        return $value;\r
+}\r
+\r
+/**\r
+ * Removes the access and edit items from the entity menu\r
+ *\r
+ * @param type $hook\r
+ * @param type $type\r
+ * @param type $value\r
+ * @param type $params\r
+ * @return array\r
+ */\r
+function thewire_remove_entity_menu_items($hook, $type, $value, $params) {\r
+       if (elgg_in_context('thewire')) {\r
+               $menu = elgg_extract('default', $value, array());\r
+               foreach ($menu as $i => $entry) {\r
+                       $name = $entry->getName();\r
+                       if ($name == 'access' || $name == 'edit') {\r
+                               unset($value['default'][$i]);\r
+                       }\r
+               }\r
+               return $value;\r
+       }\r
 }
\ No newline at end of file

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 2baadd30b728cd8a531b72e97317171fa8aa68ca..b784c5c087c2c2e22d8f6b78f0e887fb06402e85 100644 (file)
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -29,9 +29,11 @@ $owner_link = elgg_view('output/url', array(
 $author_text = elgg_echo('byline', array($owner_link));
 $date = elgg_view_friendly_time($post->time_created);
 
-$metadata = elgg_view('thewire/metadata', array(
-       'entity' => $post,
-       'handler' => 'thewire',
+$metadata = elgg_view_menu('entity', array(
+        'entity' => $post,
+        'handler' => 'thewire',
+        'sort_by' => 'priority',
+        'class' => 'elgg-menu-hz',
 ));
 
 $subtitle = "$author_text $date";

diff --git a/mod/thewire/views/default/thewire/metadata.php b/mod/thewire/views/default/thewire/metadata.php
deleted file mode 100644 (file)
index 6d871b0..0000000
--- a/mod/thewire/views/default/thewire/metadata.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- *
- */
-
-$entity = $vars['entity'];
-$handler = elgg_extract('handler', $vars, '');
-
-?>
-<ul class="elgg-menu elgg-menu-metadata">
-<?php
-if (elgg_is_logged_in()) {
-       echo '<li>';
-       echo elgg_view('output/url', array(
-               'href' => "pg/thewire/reply/$entity->guid",
-               'text' => elgg_echo('thewire:reply'),
-       ));
-       echo '</li>';
-}
-
-if ($entity->reply) {
-       echo '<li>';
-       echo elgg_view('output/url', array(
-               'href' => "pg/thewire/previous/$entity->guid",
-               'text' => elgg_echo('thewire:previous'),
-       ));
-       echo '</li>';
-}
-
-echo '<li>';
-echo elgg_view('output/url', array(
-       'href' => 'pg/thewire/thread/' . $entity->wire_thread,
-       'text' => elgg_echo('thewire:thread'),
-));
-echo '</li>';
-
-
-// links to delete or edit.
-if ($entity->canEdit() && $handler) {
-
-       $delete_url = "action/$handler/delete?guid={$entity->getGUID()}";
-       $delete_link = elgg_view('output/confirmlink', array(
-               'href' => $delete_url,
-               'text' => elgg_view_icon('delete'),
-               'title' => elgg_echo('delete'),
-               'confirm' => elgg_echo('deleteconfirm'),
-               'text_encode' => false,
-       ));
-       echo "<li>$delete_link</li>";
-}
-
-$likes = elgg_view_likes($entity);
-echo "<li>$likes</li>";
-
-?>
-</ul>
\ No newline at end of file