X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fcatalog%2Findex_view.php;h=0905dc356c80601ba1853bc2edb84405066b63a3;hb=a11428ed0b4651895e27d6920c219d8d2476631c;hp=de7d1df3ddced47e91d73a34864288514aacd813;hpb=0b134deb6f1108155973436e3de7296a76a2d660;p=living-lab-site.git

diff --git a/application/views/catalog/index_view.php b/application/views/catalog/index_view.php
index de7d1df..0905dc3 100644
--- a/application/views/catalog/index_view.php
+++ b/application/views/catalog/index_view.php
@@ -1,17 +1,37 @@
 <div id="body">
-	<?php foreach($query->result() as $video):
-		$img_src = sprintf("data/thumbs/%s_t%02d.jpg", $video->name,
-			$video->default_thumb); 
-		$video_url = sprintf("video/watch/%d", $video->id);
-		?>
-		<div class="video-icon">
-			<img src="<?php echo $img_src ?>" />
-			<a href="<?php echo $video_url ?>">
-				<div class="video-icon_title"><?php echo $video->title ?></div>
+<div id="content">
+
+<?php foreach ($categories as $category_id => $category_name): ?>
+<div class="video-list">
+<h1>
+	<a href="<?php echo site_url("catalog/category/$category_id") ?>">
+		<?php echo $category_name ?>
+	</a>
+</h1>
+
+<?php foreach($videos[$category_id] as $video):
+	$thumb_src = $video['thumbs'][ $video['default_thumb'] ];
+	?>
+	<div class="video-icon">
+		
+		<div class="video-thumb">
+			<a href="<?php echo $video['video_url'] ?>">
+				<img src="<?php echo $thumb_src ?>" />
+				<div class="video-duration"><?php echo $video['duration'] ?></div>
 			</a>
-			<div class="video-icon_duration"><?php echo $video->duration ?></div>
-			<div class="video-icon_views"><?php echo $video->views . ' views' ?></div>
-			<!--<div class="video-icon_user"><?php echo 'TODO: print user name' ?></div>-->
-			<br />
-	<?php endforeach ?>
+		</div>
+		<div class="video-title">
+			<a href="<?php echo $video['video_url'] ?>">			
+			<?php echo $video['shorted_title'] ?></a>
+		</div>		
+		<div class="video-views"><?php echo $video['views'] . ' views' ?></div>
+		<!--<div class="video-username"><?php echo 'TODO: print user name' ?></div>-->
+	</div>
+<?php endforeach ?>
+
+<div style="clear: both"></div>
+</div>
+<?php endforeach ?>
+
+</div>
 </div>