diff options
| author | cash <cash.costello@gmail.com> | 2013-04-19 20:28:51 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2013-04-19 20:28:51 -0400 |
| commit | 863d45bb76d5bce2dabe32acc6f7d1f5400d568d (patch) | |
| tree | be52131c535c5b84897b79f49dfce59041450995 /mod/pages/views/default/object/page_top.php | |
| parent | aa409144fcac454c8f6e2566606e0fb206d933d7 (diff) | |
| parent | 7b002adf2fd383e6a0e7e4b93890720d99750282 (diff) | |
| download | elgg-863d45bb76d5bce2dabe32acc6f7d1f5400d568d.tar.gz elgg-863d45bb76d5bce2dabe32acc6f7d1f5400d568d.tar.bz2 | |
Merge pull request #5325 into 1.8 branch
Diffstat (limited to 'mod/pages/views/default/object/page_top.php')
| -rw-r--r-- | mod/pages/views/default/object/page_top.php | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 945a22eed..f35202993 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -60,18 +60,26 @@ if ($comments_count != 0 && !$revision) { $comments_link = ''; } -$metadata = elgg_view_menu('entity', array( - 'entity' => $vars['entity'], - 'handler' => 'pages', - 'sort_by' => 'priority', - 'class' => 'elgg-menu-hz', -)); - $subtitle = "$editor_text $comments_link $categories"; // do not show the metadata and controls in widget view -if (elgg_in_context('widgets') || $revision) { - $metadata = ''; +if (!elgg_in_context('widgets')) { + // If we're looking at a revision, display annotation menu + if ($revision) { + $metadata = elgg_view_menu('annotation', array( + 'annotation' => $annotation, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz float-alt', + )); + } else { + // Regular entity menu + $metadata = elgg_view_menu('entity', array( + 'entity' => $vars['entity'], + 'handler' => 'pages', + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', + )); + } } if ($full) { |