Merge branch 'master' of github.com:brettp/Elgg

7 files changed, 13 insertions, 11 deletions

diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php
index e3d38ace5..e78395c31 100644
--- a/mod/thewire/pages/thewire/everyone.php
+++ b/mod/thewire/pages/thewire/everyone.php
@@ -9,7 +9,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'));
 $title = elgg_echo('thewire:everyone');
 
 if (elgg_is_logged_in()) {
-	$content .= elgg_view_form('thewire/add');
+	$form_vars = array('class' => 'thewire-form');
+	$content .= elgg_view_form('thewire/add', $form_vars);
 	$content .= elgg_view('input/urlshortener');
 }
 
@@ -23,7 +24,6 @@ $body = elgg_view_layout('content', array(
 	'filter_context' => 'all',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 	'sidebar' => elgg_view('thewire/sidebar'),
 ));
 
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
index ab452aa55..265b73eab 100644
--- a/mod/thewire/pages/thewire/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
@@ -11,13 +11,18 @@ elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
 elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
-$content = list_user_friends_objects($owner->guid, 'thewire', 15, false);
+if (get_loggedin_userid() == $owner->guid) {
+	$form_vars = array('class' => 'thewire-form');
+	$content = elgg_view_form('thewire/add', $form_vars);
+	$content .= elgg_view('input/urlshortener');
+}
+
+$content .= list_user_friends_objects($owner->guid, 'thewire', 15, false);
 
 $body = elgg_view_layout('content', array(
 	'filter_context' => 'friends',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
index d61307990..b6449b217 100644
--- a/mod/thewire/pages/thewire/owner.php
+++ b/mod/thewire/pages/thewire/owner.php
@@ -12,7 +12,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
 elgg_push_breadcrumb($owner->name);
 
 if (get_loggedin_userid() == $owner->guid) {
-	$content = elgg_view_form('thewire/add');
+	$form_vars = array('class' => 'thewire-form');
+	$content = elgg_view_form('thewire/add', $form_vars);
 	$content .= elgg_view('input/urlshortener');
 }
 
@@ -27,7 +28,6 @@ $body = elgg_view_layout('content', array(
 	'filter_context' => 'mine',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 	'sidebar' => elgg_view('thewire/sidebar'),
 ));
 
diff --git a/mod/thewire/pages/thewire/previous.php b/mod/thewire/pages/thewire/previous.php
index 45c1e1095..a3f1cb01c 100644
--- a/mod/thewire/pages/thewire/previous.php
+++ b/mod/thewire/pages/thewire/previous.php
@@ -15,7 +15,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $body,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/thewire/pages/thewire/reply.php b/mod/thewire/pages/thewire/reply.php
index 826d513b6..df4511c51 100644
--- a/mod/thewire/pages/thewire/reply.php
+++ b/mod/thewire/pages/thewire/reply.php
@@ -14,7 +14,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
 elgg_push_breadcrumb($title);
 
 $content = elgg_view('thewire/reply', array('post' => $post));
-$content .= elgg_view_form('thewire/add', array(), array('post' => $post));
+$form_vars = array('class' => 'thewire-form');
+$content .= elgg_view_form('thewire/add', $form_vars, array('post' => $post));
 $content .= elgg_view('input/urlshortener');
 
 
@@ -22,7 +23,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/tag.php b/mod/thewire/pages/thewire/tag.php
index 53f9e9db9..1c88030ec 100644
--- a/mod/thewire/pages/thewire/tag.php
+++ b/mod/thewire/pages/thewire/tag.php
@@ -30,7 +30,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/thread.php b/mod/thewire/pages/thewire/thread.php
index 5c32a8400..ec2709430 100644
--- a/mod/thewire/pages/thewire/thread.php
+++ b/mod/thewire/pages/thewire/thread.php
@@ -22,7 +22,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);