Updated UI for commentwall on profile page.

git-svn-id: http://code.elgg.org/elgg/trunk@5551 36083f99-b078-4883-b0ff-0f9b5a30f544

5 files changed, 25 insertions, 17 deletions

diff --git a/mod/profile/languages/en.php b/mod/profile/languages/en.php
index bb4230070..7430f9596 100644
--- a/mod/profile/languages/en.php
+++ b/mod/profile/languages/en.php
@@ -82,6 +82,7 @@ $english = array(
 	'profile:commentwall:blank' => "Sorry; you need to actually put something in the message area before we can save it.",
 	'profile:commentwall:notfound' => "Sorry; we could not find the specified item.",
 	'profile:commentwall:notdeleted' => "Sorry; we could not delete this message.",
+	'profile:commentwall:none' => "No comment wall posts found.",
 	'profile:commentwall:somethingwentwrong' => "Something went wrong when trying to save your message, make sure you actually wrote a message.",
 	'profile:commentwall:failure' => "An unexpected error occurred when adding your message. Please try again.",
 	
diff --git a/mod/profile/views/default/profile/commentwall/commentwall.php b/mod/profile/views/default/profile/commentwall/commentwall.php
index 9c1ff3fdb..f693a3317 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall.php
@@ -7,7 +7,7 @@
 if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {

     		

 	//start the div which will wrap all the message board contents

-	echo "<div id=\"messageboard_wrapper\">";

+	echo "<div id='comment_wall_display'>";

 			

 	//loop through all annotations and display

 	foreach($vars['annotation'] as $content) {

@@ -18,5 +18,5 @@ if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
 	echo "</div>";

 			

 } else {

-	echo "<div class='ContentWrapper'>" . elgg_echo("profile:commentwall:none") . "</div>";

+	echo "<p class='margin_top'>" . elgg_echo("profile:commentwall:none") . "</p>";

 }
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
index d2a313d93..1317ba62e 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php
@@ -3,30 +3,30 @@
 * Elgg Message board individual item display page

  */

 ?>

-<div class="messageboard"><!-- start of messageboard div -->

+<div class="entity_listing clearfloat">

     <!-- display the user icon of the user that posted the message -->

-    <div class="message_sender">	        

+    <div class="entity_listing_icon">	        

         <?php

             echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));

         ?>

     </div>

-    <!-- display the user's name who posted and the date/time -->

-    <p class="message_item_timestamp">

-        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>

-    </p>	

-	<!-- output the actual comment -->

-	<div class="message"><?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?></div>

-	<div class="message_buttons">  

+    

+    <div class="entity_listing_info">

 	<?php

         // if the user looking at the comment can edit, show the delete link

 	    if ($vars['annotation']->canEdit()) {

-			       echo "<div class='delete_message'>" . elgg_view("output/confirmlink",array(

+			       echo "<div class='entity_metadata'><span class='delete_button'>" . elgg_view("output/confirmlink",array(

 							'href' => $vars['url'] . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,

 								'text' => elgg_echo('delete'),

 								'confirm' => elgg_echo('deleteconfirm'),

-							)) . "</div>";

+							)) . "</span></div>";

 	    } //end of can edit if statement

 	?>

+	    <!-- display the user's name who posted and the date/time -->

+	    <p class="entity_subtext">

+	        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>

+	    </p>	

+		<!-- output the actual comment -->

+		<?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?>  

 	</div>

-<div class="clearfloat"></div>

-</div><!-- end of messageboard div -->

+</div>

diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php
index 0d696b955..084ffc400 100644
--- a/mod/profile/views/default/profile/commentwall/commentwalladd.php
+++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php
@@ -3,10 +3,10 @@
  * Elgg profile comment wall add

  */ 

 ?>

-<div id="mb_input_wrapper">

+<div id="comment_wall_add">

 <form action="<?php echo $vars['url']; ?>action/profile/addcomment" method="post" name="messageboardForm">

     <!-- textarea for the contents -->

-    <textarea name="message_content" value="" class="commentwall" style="width:500px;height:20px;"></textarea><br />

+    <textarea name="message_content" value="" class="commentwall"></textarea><br />

     <!-- the person posting an item on the message board -->

     <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />

     <!-- the page owner, this will be the profile owner -->

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 7a82b2bec..57e54cc52 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -210,6 +210,13 @@
 
 
 /* ***************************************
+	commentwall within profile
+*************************************** */
+#comment_wall_add textarea {
+	width:685px;
+}
+
+/* ***************************************
 	twitter panel within profile
 *************************************** */
 ul#twitter_update_list li {