From 1c8d777c99342b5e9e5d280f03ffa20c802efdad Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 14 May 2018 23:57:43 +0200 Subject: [PATCH] Update category names display --- Changelog | 1 + app/Http/Controllers/BrowseController.php | 6 +++--- app/Http/Controllers/ConsoleController.php | 3 +-- database/seeds/CategoriesTableSeeder.php | 2 +- resources/db/patches/mysql/+1~categories.sql | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 resources/db/patches/mysql/+1~categories.sql diff --git a/Changelog b/Changelog index 947b1039f..92d6a1ca9 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-14 DariusIII + * Chg: Update category names display * Chg: Update composer.json * Chg: Add barryvdh/laravel-ide-helper * Chg: Update Books class diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index d494fee0d..6a6dcb1b2 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -77,7 +77,7 @@ class BrowseController extends BasePageController $catarray = []; $catarray[] = $category['id']; - $this->smarty->assign('parentcat', $parentCategory); + $this->smarty->assign('parentcat', ucfirst($parentCategory)); $this->smarty->assign('category', $category); $orderby = ''; @@ -87,7 +87,7 @@ class BrowseController extends BasePageController $rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions'], $grp); $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, request()->url(), request()->query()); - $this->smarty->assign('catname', $id); + $this->smarty->assign('catname', title_case($id)); $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); @@ -117,7 +117,7 @@ class BrowseController extends BasePageController $this->smarty->assign('catname', $grp); } - $meta_title = 'Browse '.$parentCategory.' > '.$id; + $meta_title = 'Browse '.$parentCategory.' / '.$id; $meta_keywords = 'browse,nzb,description,details'; $meta_description = 'Browse for Nzbs'; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 2b5c94142..4583d8adb 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -21,7 +21,6 @@ class ConsoleController extends BasePageController if ($id === 'WiiVare') { $id = 'WiiVareVC'; } - $id = str_slug($id); $console = new Console(['Settings' => $this->settings]); $gen = new Genres(['Settings' => $this->settings]); @@ -31,7 +30,7 @@ class ConsoleController extends BasePageController $ctmp[] = [ 'id' => $ccat->id, - 'title' => str_slug($ccat->title), + 'title' => $ccat->title, ]; } $category = Category::GAME_ROOT; diff --git a/database/seeds/CategoriesTableSeeder.php b/database/seeds/CategoriesTableSeeder.php index 3261c4043..17dd8f4d6 100644 --- a/database/seeds/CategoriesTableSeeder.php +++ b/database/seeds/CategoriesTableSeeder.php @@ -119,7 +119,7 @@ class CategoriesTableSeeder extends Seeder 9 => array ( 'id' => 1060, - 'title' => 'WiiWare/VC', + 'title' => 'WiiWare VC', 'parentid' => 1000, 'status' => 1, 'description' => NULL, diff --git a/resources/db/patches/mysql/+1~categories.sql b/resources/db/patches/mysql/+1~categories.sql new file mode 100644 index 000000000..2539128c4 --- /dev/null +++ b/resources/db/patches/mysql/+1~categories.sql @@ -0,0 +1,3 @@ +# Rename WiiWare/VC category into WiiWare VC + +UPDATE categories SET title = 'WiiWare VC' WHERE title = 'WiiWare/VC'; \ No newline at end of file