projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plugin detection created as a widget; can't tell yet if swarmplayer is installed
[living-lab-site.git]
/
application
/
controllers
/
video.php
diff --git
a/application/controllers/video.php
b/application/controllers/video.php
index
321dc80
..
019fa2c
100644
(file)
--- a/
application/controllers/video.php
+++ b/
application/controllers/video.php
@@
-1,7
+1,7
@@
<?php
/**
<?php
/**
- * Class Video control
l
s video items handling: watching, commenting, rating,
+ * Class Video controls video items handling: watching, commenting, rating,
* adding etc.
*
* @category Controller
* adding etc.
*
* @category Controller
@@
-33,6
+33,9
@@
class Video extends CI_Controller {
{
$this->load->helper('url');
{
$this->load->helper('url');
+ // **
+ // ** LOADING MODEL
+ // **
// Retrieve video information.
$this->load->model('videos_model');
$data['video'] = $this->videos_model->get_video($id, $name);
// Retrieve video information.
$this->load->model('videos_model');
$data['video'] = $this->videos_model->get_video($id, $name);
@@
-42,20
+45,15
@@
class Video extends CI_Controller {
$params = array( 'title' => $data['video']['title'] . ' -- '
. $this->config->item('site_name'),
'css' => array(
$params = array( 'title' => $data['video']['title'] . ' -- '
. $this->config->item('site_name'),
'css' => array(
- 'jquery-ui-1.8.14.custom.css',
'jquery.ui.nsvideo.css',
'video.css'
),
'js' => array(
'jquery.ui.nsvideo.css',
'video.css'
),
'js' => array(
- 'jquery-1.6.2.min.js',
- 'jquery-ui-1.8.14.custom.min.js',
'jquery.ui.nsvideo.js'
),
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
'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
// Preloading video plugin.
// TODO plugin auto: type and format
@@
-67,6
+65,13
@@
class Video extends CI_Controller {
// $data['plugin_content'] = $this->_plugin('ns-html5',
// $data['video']['url'][0], TRUE);
// $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');
$this->load->view('video/watch_view', $data);
$this->load->view('footer');