Permalink
Browse files

Filter::get() and Filter::post() has been replaced with $request by w…

…ebtrees
  • Loading branch information...
JustCarmen committed Sep 9, 2018
1 parent 1d1708d commit 6fceb67917455aa2c33260d229aae9cb5aa231b8
Showing with 5 additions and 6 deletions.
  1. +4 −5 app/Theme/JustBaseTheme.php
  2. +1 −1 app/Theme/JustLightTheme.php
@@ -15,7 +15,6 @@
*/
namespace JustCarmen\WebtreesThemes\JustLight\Theme;
use Fisharebest\Webtrees\Filter;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Menu;
@@ -70,14 +69,14 @@ public function fancyImagebar() {
* @return string
*/
public function getThemeGlobalClass() {
$class = ' jc-global-' . Filter::get('route');
$class = ' jc-global-' . $this->request->get('route');
$module = Filter::get('module');
$module = $this->request->get('module');
if ($module) {
$class .= '-' . $module;
}
if (strpos(Filter::get('route'), '-list') !== false && Filter::get('route') !== 'media-list') {
if (strpos($this->request->get('route'), '-list') !== false && $this->request->get('route') !== 'media-list') {
$class .= ' jc-global-list';
}
return $class;
@@ -152,7 +151,7 @@ public function parameter($parameter_name) {
'image-vline' => $path . 'vline.png'
];
if (Filter::get('route') === 'pedigree' && (Filter::getInteger('orientation') === 2 || Filter::getInteger('orientation') === 3)) {
if ($this->request->get('route') === 'pedigree' && ($this->request->get('orientation') === 2 || $this->request->get('orientation') === 3)) {
$parameters['compact-chart-box-x'] = 90;
$parameters['compact-chart-box-y'] = 120;
}
@@ -105,7 +105,7 @@ public function secondaryMenuContainer(array $menus):string {
public function setFluidClass() {
$pages = ['individual'];
if (in_array(Filter::get('route'), $pages)) {
if (in_array($this->request->get('route'), $pages)) {
return '-fluid px-5'; // container-fluid
}
}

0 comments on commit 6fceb67

Please sign in to comment.