layout corrections in watch video page

diff --git a/application/controllers/video.php b/application/controllers/video.php
index 6f22400..5a4b9d5 100644 (file)
--- a/application/controllers/video.php
+++ b/application/controllers/video.php
@@ -33,6 +33,9 @@ class Video extends CI_Controller {
        {
                $this->load->helper('url');
                
+               // **
+               // ** LOADING MODEL
+               // **
                // Retrieve video information.
                $this->load->model('videos_model');
                $data['video'] = $this->videos_model->get_video($id, $name);
@@ -54,8 +57,6 @@ class Video extends CI_Controller {
                                                        //'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 +68,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');

diff --git a/application/views/video/watch_view.php b/application/views/video/watch_view.php
index 231b702..36ae1e0 100644 (file)
--- a/application/views/video/watch_view.php
+++ b/application/views/video/watch_view.php
@@ -3,6 +3,7 @@
        siteUrl = '<?php echo site_url() ?>';
 </script>
 
+<div id="watch-main">
 <?php // Invalid name in URL ?>
 <?php if (isset($video['err'])):
        if ($video['err'] == 'INVALID_NAME'):
@@ -91,6 +92,7 @@
        
 
 <?php endif // if (isset($video['err'])): ?>
+</div>
 
 <?php // Javascript bindings when document is ready ?>
 <script type="text/javascript">

diff --git a/css/video.css b/css/video.css
index 447a7ba..daeb9b2 100644 (file)
--- a/css/video.css
+++ b/css/video.css
@@ -1,3 +1,9 @@
+#watch-main
+{
+       width: 1056px;
+       margin: 0 auto;
+}
+
 .ui-tabs-panel
 {
        padding: 0 !important;