Updates to thewire interface

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

1 files changed, 35 insertions, 70 deletions

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 3e8e53124..738ab96ba 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -1,9 +1,9 @@
 <?php
 
 	/**
-	 * Elgg thewire note view
+	 * Elgg Wire Posts Listings
 	 * 
-	 * @package ElggTheWire
+	 * @package thewire
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
 	 * @author Curverider <info@elgg.com>
 	 * @copyright Curverider Ltd 2008-2010
@@ -14,89 +14,54 @@
 	 * @uses $vars['entity'] Optionally, the note to view
 	 */
 
-	if (isset($vars['entity'])) {
-    		
-    		$user_name = $vars['entity']->getOwnerEntity()->name;
-    		
-    		//if the note is a reply, we need some more info
-    		
-			$note_url = '';
-			$note_owner = elgg_echo("thewire:notedeleted");
-    		
+if (isset($vars['entity'])) {
+	$user_name = $vars['entity']->getOwnerEntity()->name;
+	
+	//if the note is a reply, we need some more info
+	$note_url = '';
+	$note_owner = elgg_echo("thewire:notedeleted");  		
 ?>
-<div class="thewire-singlepage">
-	<div class="thewire-post">
-			    
-	    <!-- the actual shout -->
-		<div class="note_body">
+<div class="wire_post">
+	<div class="wire_post_contents clearfloat radius8">
 
-	    <div class="thewire_icon">
+	    <div class="wire_post_icon">
 	    <?php
-		        echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'small'));
+		        echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'tiny'));
 	    ?>
 	    </div>
 
-			<div class="thewire_options">
-			
-			<a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="reply"><?php echo elgg_echo('thewire:reply'); ?></a>
-		<?php
-/*		    //only have a reply option for main notes, not other replies
-		    if($vars['entity']->parent == 0){
-        ?>
-		<a href="<?php echo $vars['url']; ?>mod/thewire/reply.php?note_id=<?php echo $vars['entity']->guid; ?>" class="reply">reply</a>
-		<?php
-	        }
-*/
-	    ?>
-	    <div class="clearfloat"></div>
-	    		<?php
-				   
-			// if the user looking at thewire post can edit, show the delete link
+		<div class="wire_post_options">
+			<a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="action_button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
+    		<?php
+				// if the user looking at thewire post can edit, show the delete link
 			if ($vars['entity']->canEdit()) {
-						
-	  
-					   echo "<div class='delete_note'>" . elgg_view("output/confirmlink",array(
-															'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
-															'text' => elgg_echo('delete'),
-															'confirm' => elgg_echo('deleteconfirm'),
-														)) . "</div>";
-			
-			} //end of can edit if statement
-		?>
+			   echo "<div class='delete_button'>" . elgg_view("output/confirmlink",array(
+					'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
+					'text' => elgg_echo('delete'),
+					'confirm' => elgg_echo('deleteconfirm'),
+				)) . "</div>";
+			}
+			?>
 	    </div>
-	    
-		
-		<?php
-		    echo "<b>{$user_name}: </b>";
-		    
-
-		    $desc = $vars['entity']->description;
-
-		    $desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
-			echo parse_urls($desc);
-		?>
-		
 		
-		<div class="clearfloat"></div>
-		</div>
-		<div class="note_date">
-		
-		<?php
-			
+		<div class="wire_post_info">
+			<a href="<?php echo $vars['url']; ?>pg/thewire/<?php echo $vars['entity']->getOwnerEntity()->username; ?>"><?php echo $user_name; ?></a>
+			<?php
+			    $desc = $vars['entity']->description;
+			    $desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+				echo parse_urls($desc);
+			?>
+			<p class="entity_subtext">		
+			<?php
 				echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"),
 								friendly_time($vars['entity']->time_created)
 				);
-				
 				echo " via " . elgg_echo($vars['entity']->method) . ".";
-			
-		?>
+			?>
+			</p>		
 		</div>
-		
-		
 	</div>
 </div>
 <?php
-
-		}
-
+}
 ?>
\ No newline at end of file