diff --git a/Changelog b/Changelog index 92d6a1ca9..ae6b6d82d 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-05-15 DariusIII + * Fix: Many route and themes related fixes 2018-05-14 DariusIII * Chg: Update category names display * Chg: Update composer.json diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index 194863b23..b23427c6c 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -79,9 +79,9 @@ class AdultController extends BasePageController if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); - if ($cdata) { - $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $cdata = (new Category)->find($category); + if ($cdata !== null) { + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 684007317..c7850dee5 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -77,9 +77,9 @@ class BooksController extends BasePageController if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); + $cdata = (new Category)->find($category); if ($cdata !== null) { - $this->smarty->assign('catname', $cdata->parentid !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 4583d8adb..ce19f5636 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -85,12 +85,12 @@ class ConsoleController extends BasePageController $this->smarty->assign('genres', $genres); $this->smarty->assign('genre', $genre); - if ($category === -1) { + if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); - if ($cdata) { - $this->smarty->assign('catname', $cdata->parentid !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $cdata = (new Category)->find($category); + if ($cdata !== null) { + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index 90b660776..01221b7dd 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -65,10 +65,9 @@ class GamesController extends BasePageController if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); - - if ($cdata) { - $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $cdata = (new Category)->find($category); + if ($cdata !== null) { + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index a01819f23..b728c8f69 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -149,9 +149,9 @@ class MovieController extends BasePageController if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); - if ($cdata) { - $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $cdata = (new Category)->find($category); + if ($cdata !== null) { + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 7e2202d45..3ad2e2c10 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -89,9 +89,9 @@ class MusicController extends BasePageController if ((int) $category === -1) { $this->smarty->assign('catname', 'All'); } else { - $cdata = Category::find($category); - if ($cdata) { - $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $cdata = (new Category)->find($category); + if ($cdata !== null) { + $this->smarty->assign('catname', $cdata); } else { $this->show404(); } diff --git a/composer.lock b/composer.lock index 8992a1db7..b15464c91 100644 --- a/composer.lock +++ b/composer.lock @@ -312,7 +312,8 @@ "Gemfile.lock", "*.md" ] - } + }, + "time": "2016-06-06T17:37:52+00:00" }, { "name": "bower-asset/autosize", @@ -341,7 +342,8 @@ "form", "textarea", "ui" - ] + ], + "time": "2017-05-19T15:36:30+00:00" }, { "name": "bower-asset/bootstrap", @@ -390,7 +392,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-3.x", @@ -439,7 +442,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-datepicker", @@ -468,7 +472,8 @@ }, "license": [ "Apache-2.0" - ] + ], + "time": "2016-08-05T09:50:13+00:00" }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -498,7 +503,8 @@ "dropdowns", "hover", "twitter" - ] + ], + "time": "2015-12-01T23:35:57+00:00" }, { "name": "bower-asset/bootstrap-progressbar", @@ -532,7 +538,8 @@ }, "license": [ "MIT" - ] + ], + "time": "2015-05-15T18:56:17+00:00" }, { "name": "bower-asset/bootswatch", @@ -663,7 +670,8 @@ "modal", "popup", "ui" - ] + ], + "time": "2016-05-10T22:21:33+00:00" }, { "name": "bower-asset/datatables", @@ -711,7 +719,8 @@ "jquery", "library", "table" - ] + ], + "time": "2017-08-31T13:52:17+00:00" }, { "name": "bower-asset/fancybox", @@ -777,7 +786,8 @@ "tests", "examples" ] - } + }, + "time": "2015-01-26T21:19:01+00:00" }, { "name": "bower-asset/flexboxgrid", @@ -813,7 +823,8 @@ "css", "flexbox", "grid" - ] + ], + "time": "2016-08-14T16:43:18+00:00" }, { "name": "bower-asset/font-awesome", @@ -858,7 +869,8 @@ "src", "build.xml" ] - } + }, + "time": "2015-07-20T20:04:00+00:00" }, { "name": "bower-asset/icheck", @@ -908,7 +920,8 @@ "replacement", "skins", "ui" - ] + ], + "time": "2014-03-03T17:36:28+00:00" }, { "name": "bower-asset/jquery", @@ -971,7 +984,8 @@ "javascript", "jquery", "library" - ] + ], + "time": "2016-05-20T17:24:43+00:00" }, { "name": "bower-asset/jquery-3.2.x", @@ -1038,7 +1052,8 @@ "scroll", "scrolltop", "scrolltotop" - ] + ], + "time": "2017-08-31T15:51:29+00:00" }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1057,7 +1072,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-04-15T06:38:34+00:00" }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1076,7 +1092,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-06-10T14:28:59+00:00" }, { "name": "bower-asset/jquery.nicescroll", @@ -1106,7 +1123,8 @@ "demo", "package.json" ] - } + }, + "time": "2016-03-01T20:38:24+00:00" }, { "name": "bower-asset/material-design-iconic-font", @@ -1145,7 +1163,8 @@ "font", "icons", "material" - ] + ], + "time": "2015-11-08T04:50:28+00:00" }, { "name": "bower-asset/materialize", @@ -1204,7 +1223,8 @@ "responsive", "sass", "ux" - ] + ], + "time": "2017-04-15T01:39:28+00:00" }, { "name": "bower-asset/pace", @@ -1250,7 +1270,8 @@ "progress", "progress", "spinner" - ] + ], + "time": "2014-11-06T16:31:34+00:00" }, { "name": "bower-asset/pnotify", @@ -1302,7 +1323,8 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin." + "description": "JavaScript notification plugin.", + "time": "2017-07-31T21:50:29+00:00" }, { "name": "bower-asset/respond", @@ -1326,7 +1348,8 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", + "time": "2013-12-19T04:44:31+00:00" }, { "name": "bower-asset/responsive-tables-js", @@ -1356,7 +1379,8 @@ "jquery", "responsive", "table" - ] + ], + "time": "2015-10-08T14:18:04+00:00" }, { "name": "bower-asset/select2", @@ -1424,7 +1448,8 @@ "scrolling", "slimscroll", "ui" - ] + ], + "time": "2016-06-11T09:19:14+00:00" }, { "name": "bower-asset/tinymce-dist", diff --git a/resources/views/themes/Charisma/books.tpl b/resources/views/themes/Charisma/books.tpl index 2f48f7701..a7e0036ea 100755 --- a/resources/views/themes/Charisma/books.tpl +++ b/resources/views/themes/Charisma/books.tpl @@ -3,7 +3,8 @@
  1. Home
    2. - / {$catname|escape:"htmlall"} + / {$catname->parent->title} + / {$catname->title}
diff --git a/resources/views/themes/Charisma/console.tpl b/resources/views/themes/Charisma/console.tpl index d7d419bc5..7e6804ed1 100755 --- a/resources/views/themes/Charisma/console.tpl +++ b/resources/views/themes/Charisma/console.tpl @@ -2,7 +2,8 @@
  1. Home
    2. - / {$catname|escape:"htmlall"} + / {$catname->parent->title} + / {$catname->title}
diff --git a/resources/views/themes/Charisma/games.tpl b/resources/views/themes/Charisma/games.tpl index 7873dd226..cf57b90d1 100755 --- a/resources/views/themes/Charisma/games.tpl +++ b/resources/views/themes/Charisma/games.tpl @@ -3,7 +3,8 @@
  1. Home
    2. - / {$catname|escape:"htmlall"} + / {$catname->parent->title} + / {$catname->title}
diff --git a/resources/views/themes/Charisma/headermenu.tpl b/resources/views/themes/Charisma/headermenu.tpl index befd0c961..a5d402760 100755 --- a/resources/views/themes/Charisma/headermenu.tpl +++ b/resources/views/themes/Charisma/headermenu.tpl @@ -16,7 +16,7 @@
  • Anime Series
    • {foreach $parentcat.subcatlist as $subcat} -
  • {$subcat.title}
    • +
  • {$subcat.title}
    • {/foreach} @@ -29,10 +29,10 @@