projects / living-lab-site.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
users can comment videos and can like and dislike comments => a new production version
[living-lab-site.git] / application / views / video / watch_view.php
diff --git a/application/views/video/watch_view.php b/application/views/video/watch_view.php
index f102c4e..2da1ba0 100644 (file)
--- a/application/views/video/watch_view.php
+++ b/application/views/video/watch_view.php
@@ -34,58 +34,68 @@
                <div id="video-widget"></div>
        </div>
        
-       <div id="video-info" style="clear: both">
-       <div id="video-upload-info">
-               <?php echo $this->lang->line('ui_uploaded_by') ?>
-                       <span id="video-user"><a href="<?php echo site_url("user/profile/{$video['username']}") ?>"><?php echo $video['username'] ?></a></span>
-                       <?php echo $this->lang->line('ui_on_date') ?>
-                       <span id="video-date"><?php echo $video['date'] ?></span>
-       </div>
+       <div style="clear: both"></div>
        
-       <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><!--<a id="link-like" href="#"><?php echo $this->lang->line('video_like') ?></a>
-                       <a id="link-dislike" href="#"><?php echo $this->lang->line('video_dislike') ?></a>-->
-                       <a class="link-vote" data-action="like" href="#"><?php echo $this->lang->line('video_like') ?></a>
-                       <a class="link-vote" data-action="dislike" href="#"><?php echo $this->lang->line('video_dislike') ?></a>
-                       <span id="video-likes"><?php echo $video['likes'] ?></span> <?php
-                               echo $this->lang->line('ui_likes') ?>,
-                       <span id="video-dislikes"><?php echo $video['dislikes'] ?></span> <?php
-                               echo $this->lang->line('ui_dislikes'); ?>
+       <div id="video-footer">
+               <div id="video-info" style="clear: both">
+                       <div id="video-upload-info">
+                               <?php echo $this->lang->line('ui_uploaded_by') ?>
+                                       <span id="video-user"><a href="<?php echo site_url("user/profile/{$video['username']}") ?>"><?php echo $video['username'] ?></a></span>
+                                       <?php echo $this->lang->line('ui_on_date') ?>
+                                       <span id="video-date"><?php echo $video['date'] ?></span>
+                       </div>
+                       
+                       <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><a class="link-vote" data-action="like" href="#"><?php echo $this->lang->line('video_like') ?></a>
+                                       <a class="link-vote" data-action="dislike" href="#"><?php echo $this->lang->line('video_dislike') ?></a>
+                                       <span id="video-likes"><?php echo $video['likes'] ?></span> <?php
+                                               echo $this->lang->line('ui_likes') ?>,
+                                       <span id="video-dislikes"><?php echo $video['dislikes'] ?></span> <?php
+                                               echo $this->lang->line('ui_dislikes'); ?>
+                               </div>
+                       </div>
+                       
+                       <div id="video-description"><?php echo $video['description'] ?></div>
+                       
+                       <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) ?>" class="video-tag">
+                                       <?php echo "$tag " // TODO print score in future ?>
+                               </a>
+                               <?php endforeach; endif ?></dd>
+                       </dl>
+                       
+                       <dl id="video-torrents">
+                               <dt><?php echo $this->lang->line('ui_download_torrents') ?>: </dt>
+                         <?php foreach ($video['assets'] as $asset): ?>
+                               <dd><a href="<?php echo $asset['src'] ?>"><?php echo $asset['def'] ?></a></dd>
+                         <?php endforeach ?>
+                       </dl>
+                       
+                       <dl id="video-license">
+                               <dt><?php echo ucwords($this->lang->line('ui_license')).': ' ?></dt>
+                               <dd><?php echo $video['license'] ?></dd>
+                       </dl>
                </div>
-       </div>
-       
-       <div id="video-description"><?php echo $video['description'] ?></div>
        
-       <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) ?>" class="video-tag">
-                       <?php echo "$tag " // TODO print score in future ?>
-               </a>
-               <?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 id="video-comments"><?php echo $comments ?></div>
        </div>
-       
 
 <?php endif // if (isset($video['err'])): ?>
 </div>
@@ -134,7 +144,7 @@
                        });
                
                $('.link-vote')
-                       .click(function() {
+                       .click(function(event) {
                                var user_id = "<?php echo $user_id ?>";
                                var action, idOutput;
                                if ($(this).data('action') == 'like')
@@ -149,13 +159,15 @@
                                }
                                //alert(action + " " + user_id);
                                
+                               event.preventDefault();
+                               
                                if (user_id.length != 0)
                                {
                                        $.ajax({
                                                type: "GET",
                                                url: "<?php echo site_url("video/ajax_vote") ?>/"
                                                        + action
-                                                       + "<?php echo "/{$video['id']}/$user_id" ?>",
+                                                       + "<?php echo "/{$video['id']}" ?>",
                                                data: {t: ""+Math.random()},
                                                dataType: "text",
                                                success: function(text) {
@@ -179,7 +191,7 @@
                                {
                                        $.ajax({
                                                type: "GET",
-                                               url: "<?php echo site_url("video/ajax_vote/like/{$video['id']}/$user_id") ?>",
+                                               url: "<?php echo site_url("video/ajax_vote/like/{$video['id']}") ?>",
                                                dataType: "text",
                                                success: function(text) {
                                                        if (text)
Framework of UPB Living Lab Site