search implementation completed; video ordering feature when browsing by category...

[living-lab-site.git] / application / controllers / video.php

diff --git a/application/controllers/video.php b/application/controllers/video.php
index 2818ba3..4a15ba5 100644 (file)
--- a/application/controllers/video.php
+++ b/application/controllers/video.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Class Video controlls video items handling: watching, commenting, rating,
+ * Class Video controls video items handling: watching, commenting, rating,
  * adding etc.
  *
  * @category   Controller
@@ -31,31 +31,31 @@ class Video extends CI_Controller {
         */
        public function watch($id, $name = NULL, $plugin = NULL)
        {
-               $this->load->helper('url');
-               
+               // **
+               // ** LOADING MODEL
+               // **
                // Retrieve video information.
                $this->load->model('videos_model');
+               $this->videos_model->inc_video_var($id, 'views');
                $data['video'] = $this->videos_model->get_video($id, $name);
+               $categories = $this->config->item('categories');
+               $data['video']['category_name'] = 
+                       $categories[ $data['video']['category_id'] ];
                $data['plugin_type'] = ($plugin === NULL ? 'auto' : $plugin);
                
                // Display page.
                $params = array(        'title' => $data['video']['title'] . ' -- '
                                                                . $this->config->item('site_name'),
                                                        'css' => array(
-                                                               'jquery-ui-1.8.15.custom.css',
                                                                'jquery.ui.nsvideo.css',
                                                                'video.css'
                                                        ),
                                                        'js' => array(
-                                                               'jquery-1.6.2.min.js',
-                                                               'jquery-ui-1.8.15.custom.min.js',
                                                                'jquery.ui.nsvideo.js'
                                                        ),
                                                        //'metas' => array('description'=>'','keywords'=>'')
                                                        );
                $this->load->library('html_head_params', $params);
-               $this->load->view('html_begin', $this->html_head_params);
-               $this->load->view('header');
                
                // Preloading video plugin.
                // TODO plugin auto: type and format
@@ -67,6 +67,13 @@ class Video extends CI_Controller {
 //             $data['plugin_content'] = $this->_plugin('ns-html5', 
 //                     $data['video']['url'][0], TRUE);
                
+               // **
+               // ** LOADING VIEWS
+               // **
+               $this->load->view('html_begin', $this->html_head_params);
+               $this->load->view('header');
+               
+               //$main_params['content'] = $this->load->view('video/watch_view', $data, TRUE);
                $this->load->view('video/watch_view', $data);
                
                $this->load->view('footer');