2 files changed, 23 insertions, 24 deletions
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 74ee5ba4b..9acabf3ea 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -4,20 +4,34 @@
  *
  * @package Elgg
  *
- * @uses $vars['entity']
+ * @uses ElggEntity $vars['entity'] The entity to comment on
+ * @uses bool       $vars['inline'] Show a single line version of the form?
  */
 
-if (isset($vars['entity']) && isloggedin()) {
+
+if (isset($vars['entity']) && elgg_is_logged_in()) {
+	
+	$inline = elgg_extract('inline', $vars, false);
+	
+	if ($inline) {
+		echo elgg_view('input/text', array('name' => 'generic_comment'));
+		echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
+	} else {
 ?>
-<p class="mbn">
-	<label><?php echo elgg_echo("generic_comments:text"); ?></label>
-	<?php echo elgg_view('input/longtext', array('internalname' => 'generic_comment')); ?>
-</p>
+	<div>
+		<label><?php echo elgg_echo("generic_comments:add"); ?></label>
+		<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
+	</div>
+	<div class="elgg-foot">
 <?php
-
+		echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+?>
+	</div>
+<?php
+	}
+	
 	echo elgg_view('input/hidden', array(
-		'internalname' => 'entity_guid',
+		'name' => 'entity_guid',
 		'value' => $vars['entity']->getGUID()
 	));
-	echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
 }
diff --git a/views/default/forms/comments/inline.php b/views/default/forms/comments/inline.php
deleted file mode 100644
index ee5883435..000000000
--- a/views/default/forms/comments/inline.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Inline comment form body
- *
- * @uses $vars['entity']
- */
-
-if (isset($vars['entity']) && isloggedin()) {
-	echo elgg_view('input/text', array('internalname' => 'generic_comment'));
-	echo elgg_view('input/hidden', array(
-		'internalname' => 'entity_guid',
-		'value' => $vars['entity']->getGUID()
-	));
-	echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
-}