Merge branch 'master' into navigation

1 files changed, 20 insertions, 6 deletions

diff --git a/templates/part.items.php b/templates/part.items.php
index 062cb557e..3d043dfd0 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -22,8 +22,9 @@ foreach($items as $item) {
 
 	echo '<li class="feed_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $item->getFeedId() . '">';
 		echo '<span class="timestamp">' . $item->getDate() . '</span>';
+		$relative_modified_date = OCP\relative_modified_date($item->getDate());
 		echo '<h2 class="item_date"><time class="timeago" datetime="' .
-			date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) .  '</time>' . '</h2>';
+			date('c', $item->getDate()) . '">' . $relative_modified_date .  '</time>' . '</h2>';
 
 		echo '<div class="utils">';
 			echo '<ul class="primary_item_utils">';
@@ -38,7 +39,7 @@ foreach($items as $item) {
 		} else {
 			$feedTitle = '';
 		}
-		
+
 		if(($item->getAuthor() !== null) && (trim($item->getAuthor()) !== '')) {
 			$author = $l->t('by') . ' ' . htmlspecialchars($item->getAuthor(), ENT_QUOTES, 'UTF-8');
 		} else {
@@ -49,16 +50,29 @@ foreach($items as $item) {
 			echo '<h2 class="item_author">'. $feedTitle . $author . '</h2>';
 		}
 
-		echo '<div class="body">' . $item->getBody() . '</div>';
+		echo '<div class="body">';
+		echo $item->getBody();
+		
+		if($item->getEnclosure() !== null) {
+			$enclosure = $item->getEnclosure();
+			$enclosureType = htmlspecialchars($enclosure->getMimeType(), ENT_QUOTES, 'UTF-8');
+			$enclosureLink = htmlspecialchars($enclosure->getLink(), ENT_QUOTES, 'UTF-8');
+			$enclosureFilename = htmlspecialchars(basename($enclosureLink), ENT_QUOTES, 'UTF-8');
+			
+			echo '<br /><br /><audio controls="controls"><source src="' . $enclosureLink . '" type="' . $enclosureType . '"></source></audio><br />';
+			echo '<a href="' . $enclosureLink . '" target="_blank">Original audio source (' . $enclosureFilename . ')</a>';
+		}
+		
+		echo '</div>';
 
 		echo '<div class="bottom_utils">';
 			echo '<ul class="secondary_item_utils">';
-				echo '<li class="share_link"><a class="share" data-item-type="news_item" data-item="' . $item->getId() . '" title="' . $l->t('Share') . 
-		      '" data-possible-permissions="' . (OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE) . '" href="#">' . $l->t('Share') . '</a></li>';				
+				echo '<li class="share_link"><a class="share" data-item-type="news_item" data-item="' . $item->getId() . '" title="' . $l->t('Share') .
+		      '" data-possible-permissions="' . (OCP\PERMISSION_READ | OCP\PERMISSION_SHARE) . '" href="#">' . $l->t('Share') . '</a></li>';
 				echo '<li class="keep_unread">' . $l->t('Keep unread') . '<input type="checkbox" /></li>';
 			echo '</ul>';
 		echo '</div>';
-		
+
 
 	echo '</li>';