Fixes #3974 blog, bookmarks, file, and pages plugins consistent in integration with...

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 8246fdec3223291485885328cb79dfd44b238b4d..a805541bd0315e98da60d50f54b1210d6e6d0baf 100644 (file)
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -104,7 +104,7 @@ $access_input = elgg_view('input/access', array(
        'value' => $vars['access_id']
 ));
 
-$categories_input = elgg_view('categories', $vars);
+$categories_input = elgg_view('input/categories', $vars);
 
 // hidden inputs
 $container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid()));

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index ab75bd09bf69feb2bbd35ff1c2ae78f5e8a43816..b51b769a242d77e6f9e8eb9930a76255a1051de6 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -52,8 +52,7 @@ $metadata = elgg_view_menu('entity', array(
        'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "<p>$author_text $date $comments_link</p>";
-$subtitle .= $categories;
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 78426323210cea1799014b97f466a473edceaecb..bdd623bb562aca82f1b97091e33aac226814584f 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -50,7 +50,7 @@ $metadata = elgg_view_menu('entity', array(
        'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index fbd585b8aece53741c64f6fd8ba2d7fd6ff24b8a..874d8fb071e4f7da4b855659adba76751dda9ca3 100644 (file)
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -53,7 +53,7 @@ $metadata = elgg_view_menu('entity', array(
        'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {

diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index c29de1085f866b250c37517893a93912aa7ac48a..20737a121c2e0b3a221601da30f34416bcaa6a52 100644 (file)
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -24,7 +24,7 @@ foreach ($variables as $name => $type) {
 <?php
 }
 
-$cats = elgg_view('categories', $vars);
+$cats = elgg_view('input/categories', $vars);
 if (!empty($cats)) {
        echo $cats;
 }

diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0f7b51a0e84140a7cd64b81afc583305a995bee8..08cdd6e2d702b20542fbc89ac45ec7e01c2b06a6 100644 (file)
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -46,6 +46,7 @@ $editor_link = elgg_view('output/url', array(
 $date = elgg_view_friendly_time($annotation->time_created);
 $editor_text = elgg_echo('pages:strapline', array($date, $editor_link));
 $tags = elgg_view('output/tags', array('tags' => $page->tags));
+$categories = elgg_view('output/categories', $vars);
 
 $comments_count = $page->countComments();
 //only display if there are commments
@@ -67,7 +68,7 @@ $metadata = elgg_view_menu('entity', array(
        'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$editor_text $categories $comments_link";
+$subtitle = "$editor_text $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets') || $revision) {