From 3393d7d6a6968abebf0bdabb81f17eff8b46b477 Mon Sep 17 00:00:00 2001
From: Calin Burloiu <calin.burloiu@gmail.com>
Date: Wed, 31 Aug 2011 15:32:45 +0300
Subject: [PATCH] malformed category URLs bug fixed

---
 application/controllers/catalog.php               | 3 ++-
 application/views/article/english/about.php       | 8 ++++----
 application/views/catalog/videos_summary_view.php | 2 +-
 css/catalog.css                                   | 2 +-
 css/default.css                                   | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 580f113..a22a1e8 100644
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -29,6 +29,7 @@ class Catalog extends CI_Controller {
 				$id, 0, $this->config->item('videos_per_row'));
 			
 			// Category
+			$vs_data['category_name'] = $name;
 			$vs_data['category_title'] = $name ?
 				$this->lang->line("ui_categ_$name") : $name;
 			$vs_data['category_id'] = $id;
@@ -106,7 +107,7 @@ class Catalog extends CI_Controller {
 		
 		// Pagination
 		$this->load->library('pagination');
-		$pg_config['base_url'] = site_url("catalog/category/$category_id/");
+		$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);
diff --git a/application/views/article/english/about.php b/application/views/article/english/about.php
index 0c75b63..d3ab0ab 100644
--- a/application/views/article/english/about.php
+++ b/application/views/article/english/about.php
@@ -59,10 +59,10 @@
 <p>To take a look at the NextShare plugins in action, all you have to do is <a href="<?php echo site_url('install-plugins'); ?>">install them</a> and then watch any video asset from this site.</p>
 <p>Through the use of P2P technology, you will be able to stream movies from various categories:</p>
 <ul>
-	<li>from <a href="<?php site_url('catalog/category/1') ?>">feature films</a></li>
-	<li>from <a href="<?php echo site_url('catalog/category/2') ?>"><em>TechTalks</em> technical presentations</a></li>
-	<li>or from <a href="<?php site_url('catalog/category/3') ?>">various events</a> from our faculty</li>
-	<li>from <a href="<?php site_url('catalog/category/4') ?>">karaoke parties</a> in <a href="http://acs.pub.ro/" target="_blank" rel="nofollow">Automatic Control and Computers Faculty</a></li>
+	<li>from <a href="<?php echo site_url('catalog/category/movies') ?>">feature films</a></li>
+	<li>from <a href="<?php echo site_url('catalog/category/tech-talks') ?>"><em>TechTalks</em> technical presentations</a></li>
+	<li>or from <a href="<?php echo site_url('catalog/category/events') ?>">various events</a> from our faculty</li>
+	<li>from <a href="<?php echo site_url('catalog/category/karaoke') ?>">karaoke parties</a> in <a href="http://acs.pub.ro/" target="_blank" rel="nofollow">Automatic Control and Computers Faculty</a></li>
 </ul>
 <p>All available movies are currently seeded by 5 peers with high bandwidth (1Gbit) kindly provided by the<a title="NCIT-Cluster" href="http://cluster.ncit.pub.ro/" target="_blank" rel="nofollow"> NCIT-Cluster</a>. Anyone that watches a movie will take part in the swarm and ensure greater availability to provided content.</p>
 
diff --git a/application/views/catalog/videos_summary_view.php b/application/views/catalog/videos_summary_view.php
index 153b96d..25e496b 100644
--- a/application/views/catalog/videos_summary_view.php
+++ b/application/views/catalog/videos_summary_view.php
@@ -1,6 +1,6 @@
 <div class="videos-summary">
 	<h1 class="category-title">
-		<a href="<?php echo site_url("catalog/category/$category_id") ?>">
+		<a href="<?php echo site_url("catalog/category/$category_name") ?>">
 			<?php echo $category_title ?>
 		</a>
 	</h1>
diff --git a/css/catalog.css b/css/catalog.css
index da5da85..591b4d0 100644
--- a/css/catalog.css
+++ b/css/catalog.css
@@ -24,7 +24,7 @@
 	position: relative;
 	width: 132px;
 	height: 99px;
-	/*background: url('/devel/img/thumb_container.png') no-repeat left top;*/
+	/*background: url('/img/thumb_container.png') no-repeat left top;*/
 }
 .video-icon .video-thumb img
 {
diff --git a/css/default.css b/css/default.css
index ae58bc4..bd99c5e 100644
--- a/css/default.css
+++ b/css/default.css
@@ -3,7 +3,7 @@ body
 	margin: 0;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 75%;
-	background: white url('/devel/img/bg.png') repeat-x left 88px;
+	background: white url('/img/bg.png') repeat-x left 88px;
 }
 
 a:link
@@ -153,7 +153,7 @@ h1
 	text-align: left;
 	padding: 0px 0px 0px 8px;
 	margin: 8px 0px 8px 0px;
-	background: url(/devel/img/header.png) top repeat-x;
+	background: url(/img/header.png) top repeat-x;
 	outline: 1px outset rgb(108,162,222);
 	clear: both;
 }
-- 
2.20.1