X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fcatalog.php;h=49661523b402c8dd1ee680671cdf9eb1650409ce;hb=aaa8b077bac73addd05114fd2b2ef0829412fac7;hp=a22a1e8ac3ac2a4bcd2b961525a31b394808aad7;hpb=3393d7d6a6968abebf0bdabb81f17eff8b46b477;p=living-lab-site.git diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php index a22a1e8..4966152 100644 --- a/application/controllers/catalog.php +++ b/application/controllers/catalog.php @@ -58,7 +58,7 @@ class Catalog extends CI_Controller { $this->load->view('header', array('selected_menu' => 'home')); $main_params['content'] = $this->load->view('catalog/index_view', $data, TRUE); - $main_params['side'] = $this->load->view('side_default.php', NULL, TRUE); + $main_params['side'] = $this->load->view('side_default', NULL, TRUE); $this->load->view('main', $main_params); $this->load->view('footer'); @@ -92,12 +92,7 @@ class Catalog extends CI_Controller { // ** LOADING MODEL // ** // Video Category - $categories = $this->config->item('categories'); - $category_id = array_search($category_name, $categories); - $vs_data['category_name'] = $category_name; - $vs_data['category_id'] = $category_id; - $vs_data['category_title'] = $category_name ? - $this->lang->line("ui_categ_$category_name") : $category_name; + $vs_data = $this->_get_category_data($category_name); // Retrieve videos summary. $this->load->model('videos_model'); @@ -110,14 +105,14 @@ class Catalog extends CI_Controller { $pg_config['base_url'] = site_url("catalog/category/$category_name/"); $pg_config['uri_segment'] = 4; $pg_config['total_rows'] = $this->videos_model->get_videos_count( - $category_id); + $vs_data['category_id']); $pg_config['per_page'] = $this->config->item('videos_per_page'); $this->pagination->initialize($pg_config); $vs_data['pagination'] = $this->pagination->create_links(); // Video Summary - $data['video_summary'] = $this->load->view('catalog/videos_summary_view', - $vs_data, TRUE); +// $data['video_summary'] = $this->load->view('catalog/videos_summary_view', +// $vs_data, TRUE); $params = array( 'title' => $this->config->item('site_name'), 'css' => array( @@ -134,18 +129,103 @@ class Catalog extends CI_Controller { $this->load->view('html_begin', $this->html_head_params); $this->load->view('header'); - $main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE); - $main_params['side'] = $this->load->view('side_default.php', NULL, TRUE); +// $main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE); + $main_params['content'] = + $this->load->view('catalog/videos_summary_view', $vs_data, TRUE); + $main_params['side'] = $this->load->view('side_default', NULL, TRUE); $this->load->view('main', $main_params); $this->load->view('footer'); $this->load->view('html_end'); } - public function search($query_str) + public function search($search_query = "", $offset = 0, $category_name = NULL) { - echo '