X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fvideo%2Fwatch_view.php;h=9d83addbea5758534dfd0f80fb37d3cc2334674c;hb=19dcbb3149e52c88b7a38f05ef85b80db49fcb72;hp=a3ba0443c09ba180a6a465ad802b39e22dbb4f0d;hpb=e47a97763d745e654ab60c17a85d794b46734ddf;p=living-lab-site.git

diff --git a/application/views/video/watch_view.php b/application/views/video/watch_view.php
index a3ba044..9d83add 100644
--- a/application/views/video/watch_view.php
+++ b/application/views/video/watch_view.php
@@ -3,7 +3,7 @@
 	siteUrl = '<?php echo site_url() ?>';
 </script>
 
-<div id="body">
+<div id="main">
 	<?php // Invalid name in URL ?>
 	<?php if (isset($video['err'])):
 		if ($video['err'] == 'INVALID_NAME'):
@@ -21,12 +21,6 @@
 	<?php else: ?>
 		<h1><?php echo $video['title'] ?></h1>
 		
-		<ul>
-			<li><a id="a_ns-vlc" href="javascript: void(0)">VLC</a></li>
-		
-			<li><a id="a_ns-html5" href="javascript: void(0)">HTML5</a></li>
-		</ul>
-		
 		<div id="video-widget-tabs">
 			<ul>
 				<li>
@@ -40,45 +34,60 @@
 			<div id="video-widget"></div>
 		</div>
 		
-		<!--TODO user name-->
-		<div id="video-date"><?php echo $video['date'] ?></div>
-		<div id="video-views">
-			<?php echo $video['views'] . ' '
-				. ($video['views'] == 1 ? 
-					$this->lang->line('ui_view') : 
-					$this->lang->line('ui_views') );
-			?>
+		<div id="video-info" style="clear: both">
+		<div id="video-upload-info">
+			<?php echo $this->lang->line('ui_uploaded_by') ?>
+				<span id="video-date"><?php echo $video['user_name'] ?></span>
+				<?php echo $this->lang->line('ui_on_date') ?>
+				<span id="video-date"><?php echo $video['date'] ?></span>
 		</div>
-		<div id="video-likes">
-			<?php echo $video['likes'] . ' '
-				. ($video['likes'] == 1 ? 
-					$this->lang->line('ui_like') : 
-					$this->lang->line('ui_likes') );
-			?>
-		</div>
-		<div id="video-dislikes">
-			<?php echo $video['dislikes'] . ' '
-				. ($video['dislikes'] == 1 ? 
-					$this->lang->line('ui_dislike') : 
-					$this->lang->line('ui_dislikes') );
-			?>
+		
+		<div id="video-popularity">
+			<div id="video-views">
+				<?php echo $video['views'] . ' '
+					. ($video['views'] == 1 ? 
+						$this->lang->line('ui_view') : 
+						$this->lang->line('ui_views') );
+				?>
+			</div>
+			
+			<div><span id="video-likes">
+				<?php echo $video['likes'] . ' '
+					. ($video['likes'] == 1 ? 
+						$this->lang->line('ui_like') : 
+						$this->lang->line('ui_likes') );
+				?></span>,
+			<span id="video-dislikes">
+				<?php echo $video['dislikes'] . ' '
+					. ($video['dislikes'] == 1 ? 
+						$this->lang->line('ui_dislike') : 
+						$this->lang->line('ui_dislikes') );
+				?>
+			</span></div>
 		</div>
+		
 		<div id="video-description"><?php echo $video['description'] ?></div>
-		<div id="video-category">
-			<?php echo ucwords($this->lang->line('ui_category'))
-				. ': '. $video['category_title'] ?>
-		</div>
-		<div id="video-tags">
-			<?php echo ucwords($this->lang->line('ui_tags')). ': ' ?>
-			<?php if (isset($video['tags'])): 
+		
+		<dl id="video-category">
+			<dt><?php echo ucwords($this->lang->line('ui_category'))
+				. ': ' ?></dt>
+			<dd><?php echo $video['category_title'] ?></dd>
+		</dl>
+		
+		<dl id="video-tags">
+			<dt><?php echo ucwords($this->lang->line('ui_tags')). ': ' ?></dt>
+			<dd><?php if (isset($video['tags'])): 
 			foreach ($video['tags'] as $tag => $score): ?>
-			<a href="<?php echo site_url('catalog/search/'. $tag) ?>">
-				<?php echo "$tag($score)" ?>
+			<a href="<?php echo site_url('catalog/search/'. $tag) ?>" class="video-tag">
+				<?php echo "$tag " // TODO print score in future ?>
 			</a>
-			<?php endforeach; endif ?>
-		<div id="video-license">
-			<?php echo ucwords($this->lang->line('ui_license'))
-				. ': '. $video['license'] ?>
+			<?php endforeach; endif ?></dd>
+		</dl>
+		
+		<dl id="video-license">
+			<dt><?php echo ucwords($this->lang->line('ui_license')).': ' ?></dt>
+			<dd><?php echo $video['license'] ?></dd>
+		</dl>
 		</div>
 		
 
@@ -97,42 +106,34 @@
 		});
 		
 		// Switch video plugin facilities
-		$('#video-widget-tabs').tabs();	/*{
-			ajaxOptions: {
-				type: "POST",
-				data: { url: "<?php //echo $video['url'][0] ?>" },
-				error: function(xhr, status, index, anchor) {
-					$(anchor.hash).html('Could not load the video plugin.');
-				}
-			}
-		});*/
+		$('#video-widget-tabs')
+			.tabs();
 		$('#switch-to-ns-html5')
 			.click(function() {
-				// TODO switch video plugin
-				console.log('switch-to-ns-html5');
+				$('#video-widget')
+					.nsvideo('type', 'ns-html5');
 			});
 		$('#switch-to-ns-vlc')
 			.click(function() {
-				// TODO switch video plugin
-				console.log('switch-to-ns-vlc');
+				$('#video-widget')
+					.nsvideo('type', 'ns-vlc');
 			});
-			
+		
 		// Video widget
-		$('#video-widget').nsvideo({
-			type: "<?php echo $plugin_type ?>",
-			definition:
-				"<?php echo $video['assets'][ $asset_index ]['def'] ?>",
-			src: {
-				<?php 
-					for ($i=0; $i < count($video['assets']); $i++)
-					{
-						$asset = $video['assets'][$i];
-						echo '"'. $asset['def'] . '": ';
-						echo '"'. $asset['src'] . '"'; 
-						echo ($i == count($video['assets']) - 1) ? '' : ', ';
-					}
-				?>
-			}
-		});
+		$('#video-widget')
+			.nsvideo({
+				type: "<?php echo $plugin_type ?>",
+				src: <?php echo json_encode($video['assets']) ?>,
+				//width: videoWidth,
+				//height: videoHeight
+				minWidth: 640,
+				maxWidth: 1024,
+				initialDuration: "<?php echo $video['duration'] ?>",
+				
+				resize: function() {
+					$('#video-widget-tabs')
+						.css('width', $('#video-widget').css('width'));
+				}
+			});
 	});
 </script>
\ No newline at end of file