diff --git a/Changelog b/Changelog index d41a3e9da..be7cff2fa 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-15 DariusIII + * Chg: Change Music category into Audio to match database setting * Fix: Fix links to categories in side menus * Fix: Fix tvSearch query * Chg: Use original subcategory titles when browsing diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index dc4c02ffb..0cc155693 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -57,7 +57,7 @@ class BrowseController extends BasePageController * @param string $id * @throws \Exception */ - public function show(string $parentCategory, string $id = 'all') + public function show(string $parentCategory, string $id = 'All') { $this->setPrefs(); $releases = new Releases(['Settings' => $this->settings]); @@ -65,7 +65,7 @@ class BrowseController extends BasePageController $parentId = Category::query()->where('title', $parentCategory)->first(['id']); $query = Category::query(); - if ($id !== 'all') { + if ($id !== 'All') { $query->where('title', $id)->where('parentid', $parentId['id']); } else { $query->where('id', $parentId['id']); diff --git a/resources/views/themes/Charisma/basepage.tpl b/resources/views/themes/Charisma/basepage.tpl index 589353018..0fa76cba1 100755 --- a/resources/views/themes/Charisma/basepage.tpl +++ b/resources/views/themes/Charisma/basepage.tpl @@ -91,7 +91,7 @@ class="zmdi zmdi-xbox"> Console
  • Movies
  • -
  • Music
  • Games
  • @@ -102,7 +102,7 @@
  • Books
  • -
  • Browse All Releases +
  • Browse All Releases
  • Browse Groups diff --git a/resources/views/themes/Gentele/basepage.tpl b/resources/views/themes/Gentele/basepage.tpl index 8b9af2bcb..27cb57072 100755 --- a/resources/views/themes/Gentele/basepage.tpl +++ b/resources/views/themes/Gentele/basepage.tpl @@ -81,7 +81,7 @@ class="fa fa-gamepad"> Console
  • Movies
  • -
  • Music
  • Games
  • @@ -91,7 +91,7 @@
  • Books
  • -
  • Browse All Releases
  • Home
  • / - {$parentcat} + {$parentcat} / {if ($catname !== '')} {$catname}{/if} diff --git a/resources/views/themes/Omicron/basepage.tpl b/resources/views/themes/Omicron/basepage.tpl index 812e15ed6..c60fb60d3 100755 --- a/resources/views/themes/Omicron/basepage.tpl +++ b/resources/views/themes/Omicron/basepage.tpl @@ -212,7 +212,7 @@ class="fa fa-gamepad"> Console
  • Movies
  • -
  • Music
  • Games
  • @@ -222,7 +222,7 @@ class="fa fa-venus-mars">
    Adult
  • Books
  • -
  • Browse All Releases
  • Browse Groups
  • diff --git a/routes/web.php b/routes/web.php index b21be198e..df041e17a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -99,9 +99,9 @@ Route::post('movie', 'MovieController@showMovie'); Route::post('movietrailers', 'MovieController@showTrailer'); -Route::get('Music/{id?}', 'MusicController@show'); +Route::get('Audio/{id?}', 'MusicController@show'); -Route::post('Music/{id?}', 'MusicController@show'); +Route::post('Audio/{id?}', 'MusicController@show'); Route::get('nfo/{id?}', 'NfoController@showNfo');