Fixes #4035 made the entity view pages consistent for blog, bookmarks, file, pages...

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 792f32c420605dead6822fbdc88e0f446abb4077..590547a8c133b7c855f13a45c59c366d9afd262d 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -20,7 +20,6 @@ function blog_get_page_content_read($guid = NULL) {
 
        // no header or tabs for viewing an individual blog
        $return['filter'] = '';
-       $return['header'] = '';
 
        if (!elgg_instanceof($blog, 'object', 'blog')) {
                $return['content'] = elgg_echo('blog:error:post_not_found');

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 05ddf62c7e79d15eaedb6539ec20052a018cd01c..3525b3d4852e9bab1476bb920fc57c73d8652e00 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -77,7 +77,6 @@ if ($full) {
        $summary = elgg_view('object/elements/summary', $params);
 
        echo elgg_view('object/elements/full', array(
-               'title' => $blog->title,
                'summary' => $summary,
                'icon' => $owner_icon,
                'body' => $body,

diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 8e097b09033afeae5ac97284d89e26353b74c748..2439d2ee8b80324e5b5435aaa0cb575cf0f91282 100644 (file)
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -28,7 +28,6 @@ $body = elgg_view_layout('content', array(
        'content' => $content,
        'title' => $title,
        'filter' => '',
-       'header' => '',
 ));
 
 echo elgg_view_page($title, $body);

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ba8029a54affdf48d936931b3695cea0bb31f6d4..89a0d03e0dfc3e5297d9266bb291c6825e685c5b 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -79,7 +79,6 @@ HTML;
 
        echo elgg_view('object/elements/full', array(
                'entity' => $bookmark,
-               'title' => $bookmark->title,
                'icon' => $owner_icon,
                'summary' => $summary,
                'body' => $body,

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 81421133fb0abdf420c47002df614c25c4f61a42..1db9863c9d3581356eb81515f1cfb16f0ce8ec18 100644 (file)
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -69,7 +69,6 @@ if ($full && !elgg_in_context('gallery')) {
 
        $params = array(
                'entity' => $file,
-               'title' => false,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
                'tags' => $tags,

diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index f3d5f96d5372d768f4f7d632b0c9b83db0fdc981..a579d89a4203030a045bc2dcf3ee67e50050e6ee 100644 (file)
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -64,7 +64,6 @@ if ($full) {
 
        $params = array(
                'entity' => $topic,
-               'title' => false,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
                'tags' => $tags,

diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0a1c33458e0f610840dcbc44c2047e0566dba092..e78289f28446561b67095f85db84e5fe9b7e97b7 100644 (file)
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -80,7 +80,6 @@ if ($full) {
 
        $params = array(
                'entity' => $page,
-               'title' => false,
                'metadata' => $metadata,
                'subtitle' => $subtitle,
                'tags' => $tags,

diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
index 4a29914425cb24174323118b8035b7bb287b62f8..9b89f970677892cbd5a972d82bd90fdc11b93360 100644 (file)
--- a/views/default/object/elements/full.php
+++ b/views/default/object/elements/full.php
@@ -2,8 +2,7 @@
 /**
  * Object full rendering
  *
- * Sample output
- * <h2>Title</h3>
+ * Sample output:
  * <div class="elgg-content">
  *     <div class="elgg-image-block">
  *     </div>
@@ -12,14 +11,12 @@
  * </div>
  *
  * @uses $vars['entity']   ElggEntity
- * @uses $vars['title']    Title (false for no title)
  * @uses $vars['icon']     HTML for the content icon
  * @uses $vars['summary']  HTML for the content summary
  * @uses $vars['body']     HTML for the content body
  * @uses $vars['class']    Optional additional class for the content wrapper
  */
 
-$title = elgg_extract('title', $vars);
 $icon = elgg_extract('icon', $vars);
 $summary = elgg_extract('summary', $vars);
 $body = elgg_extract('body', $vars);
@@ -30,14 +27,9 @@ if ($class) {
        $class = "elgg-content";
 }
 
-if ($title) {
-       $title = elgg_view_title($title);
-}
-
 $header = elgg_view_image_block($icon, $summary);
 
 echo <<<HTML
-$title
 <div class="$class">
 $header
 $body