Updated UI for commentwall on profile page.

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

diff --git a/mod/profile/languages/en.php b/mod/profile/languages/en.php
index bb4230070e83e58240c50250bd3707948b36455b..7430f95960e848a4a07e39ac92570d58c95ecc57 100644 (file)
--- 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 9c1ff3fdb109494cff5d8dcfdeada7a48dba2103..f693a3317d14ef010ece3acc0ed6077bfd8b6c76 100644 (file)
--- 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) {\r
                \r
        //start the div which will wrap all the message board contents\r
-       echo "<div id=\"messageboard_wrapper\">";\r
+       echo "<div id='comment_wall_display'>";\r
                        \r
        //loop through all annotations and display\r
        foreach($vars['annotation'] as $content) {\r
@@ -18,5 +18,5 @@ if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
        echo "</div>";\r
                        \r
 } else {\r
-       echo "<div class='ContentWrapper'>" . elgg_echo("profile:commentwall:none") . "</div>";\r
+       echo "<p class='margin_top'>" . elgg_echo("profile:commentwall:none") . "</p>";\r
 }
\ 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 d2a313d93028e3b64f3fca1e93de015577d37fc1..1317ba62e6a64178c2035ebd82721f3a524f089c 100644 (file)
--- 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\r
  */\r
 ?>\r
-<div class="messageboard"><!-- start of messageboard div -->\r
+<div class="entity_listing clearfloat">\r
     <!-- display the user icon of the user that posted the message -->\r
-    <div class="message_sender">               \r
+    <div class="entity_listing_icon">          \r
         <?php\r
             echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));\r
         ?>\r
     </div>\r
-    <!-- display the user's name who posted and the date/time -->\r
-    <p class="message_item_timestamp">\r
-        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>\r
-    </p>       \r
-       <!-- output the actual comment -->\r
-       <div class="message"><?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?></div>\r
-       <div class="message_buttons">  \r
+    \r
+    <div class="entity_listing_info">\r
        <?php\r
         // if the user looking at the comment can edit, show the delete link\r
            if ($vars['annotation']->canEdit()) {\r
-                              echo "<div class='delete_message'>" . elgg_view("output/confirmlink",array(\r
+                              echo "<div class='entity_metadata'><span class='delete_button'>" . elgg_view("output/confirmlink",array(\r
                                                        'href' => $vars['url'] . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,\r
                                                                'text' => elgg_echo('delete'),\r
                                                                'confirm' => elgg_echo('deleteconfirm'),\r
-                                                       )) . "</div>";\r
+                                                       )) . "</span></div>";\r
            } //end of can edit if statement\r
        ?>\r
+           <!-- display the user's name who posted and the date/time -->\r
+           <p class="entity_subtext">\r
+               <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>\r
+           </p>        \r
+               <!-- output the actual comment -->\r
+               <?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?>  \r
        </div>\r
-<div class="clearfloat"></div>\r
-</div><!-- end of messageboard div -->\r
+</div>\r

diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php
index 0d696b955c7274fafcd623fa1ce3591f601e9324..084ffc4004cd51786ce6f56f717d4170eb8734a0 100644 (file)
--- 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\r
  */ \r
 ?>\r
-<div id="mb_input_wrapper">\r
+<div id="comment_wall_add">\r
 <form action="<?php echo $vars['url']; ?>action/profile/addcomment" method="post" name="messageboardForm">\r
     <!-- textarea for the contents -->\r
-    <textarea name="message_content" value="" class="commentwall" style="width:500px;height:20px;"></textarea><br />\r
+    <textarea name="message_content" value="" class="commentwall"></textarea><br />\r
     <!-- the person posting an item on the message board -->\r
     <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />\r
     <!-- the page owner, this will be the profile owner -->\r

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 7a82b2bec00ff415758b5c453b494ee64d74898b..57e54cc5298bc23e640786c9aeade7e86b600623 100644 (file)
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -209,6 +209,13 @@
 }
 
 
+/* ***************************************
+       commentwall within profile
+*************************************** */
+#comment_wall_add textarea {
+       width:685px;
+}
+
 /* ***************************************
        twitter panel within profile
 *************************************** */