@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * Where are our CSS, JS and other assets? |
| 33 | 33 | */ |
| 34 | 34 | protected const THEME_DIR = 'colors'; |
| 35 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 35 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 36 | 36 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 37 | 37 | |
| 38 | 38 | /** @var string[] A list of color palettes */ |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | * Where are our CSS, JS and other assets? |
| 30 | 30 | */ |
| 31 | 31 | protected const THEME_DIR = 'fab'; |
| 32 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 32 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 33 | 33 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | * Where are our CSS, JS and other assets? |
| 31 | 31 | */ |
| 32 | 32 | protected const THEME_DIR = 'clouds'; |
| 33 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 33 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 34 | 34 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * Where are our CSS, JS and other assets? |
| 48 | 48 | */ |
| 49 | 49 | protected const THEME_DIR = '_common'; |
| 50 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 50 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 51 | 51 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 52 | 52 | |
| 53 | 53 | protected const PERSON_BOX_CLASSES = [ |
@@ -219,7 +219,8 @@ discard block |
||
| 219 | 219 | <li class="wt-initials-list-item d-flex"> |
| 220 | 220 | <?php if ($count > 0) : ?> |
| 221 | 221 | <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 222 | - <?php else : ?> |
|
| 222 | + <?php else { |
|
| 223 | + : ?> |
|
| 223 | 224 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 224 | 225 | |
| 225 | 226 | <?php endif ?> |
@@ -273,6 +274,7 @@ discard block |
||
| 273 | 274 | |
| 274 | 275 | if ($show === 'indi' || $show === 'surn') { |
| 275 | 276 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
| 277 | +} |
|
| 276 | 278 | if ($show === 'surn') { |
| 277 | 279 | // Show the surname list |
| 278 | 280 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -149,7 +149,7 @@ |
||
| 149 | 149 | 'ged' => $tree->name(), |
| 150 | 150 | 'show_all' => 'yes', |
| 151 | 151 | ]; |
| 152 | - $show = $request->get('show', 'surn'); |
|
| 152 | + $show = $request->get('show', 'surn'); |
|
| 153 | 153 | } |
| 154 | 154 | } elseif ($surname) { |
| 155 | 155 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | $top10 = DB::table('hit_counter') |
| 72 | 72 | ->where('gedcom_id', '=', $tree->id()) |
| 73 | - ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php']) |
|
| 73 | + ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php']) |
|
| 74 | 74 | ->orderByDesc('page_count') |
| 75 | 75 | ->limit((int) $num) |
| 76 | 76 | ->pluck('page_count', 'page_parameter'); |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | { |
| 29 | 29 | public const RECORD_TYPE = 'SOUR'; |
| 30 | 30 | |
| 31 | - protected const ROUTE_NAME = 'source'; |
|
| 31 | + protected const ROUTE_NAME = 'source'; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * A closure which will create a record from a database row. |
@@ -401,19 +401,19 @@ |
||
| 401 | 401 | private function faqsExist(Tree $tree, string $language): bool |
| 402 | 402 | { |
| 403 | 403 | return DB::table('block') |
| 404 | - ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 405 | - ->where('module_name', '=', $this->getName()) |
|
| 406 | - ->where('setting_name', '=', 'languages') |
|
| 407 | - ->where(function (Builder $query) use ($tree): void { |
|
| 408 | - $query |
|
| 409 | - ->whereNull('gedcom_id') |
|
| 410 | - ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 411 | - }) |
|
| 412 | - ->select(['setting_value AS languages']) |
|
| 413 | - ->get() |
|
| 414 | - ->filter(function (stdClass $faq) use ($language): bool { |
|
| 415 | - return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 416 | - }) |
|
| 404 | + ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 405 | + ->where('module_name', '=', $this->getName()) |
|
| 406 | + ->where('setting_name', '=', 'languages') |
|
| 407 | + ->where(function (Builder $query) use ($tree): void { |
|
| 408 | + $query |
|
| 409 | + ->whereNull('gedcom_id') |
|
| 410 | + ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 411 | + }) |
|
| 412 | + ->select(['setting_value AS languages']) |
|
| 413 | + ->get() |
|
| 414 | + ->filter(function (stdClass $faq) use ($language): bool { |
|
| 415 | + return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 416 | + }) |
|
| 417 | 417 | ->isNotEmpty(); |
| 418 | 418 | } |
| 419 | 419 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | { |
| 95 | 95 | $url = $request->get('url', ''); |
| 96 | 96 | $xref = $request->get('xref', ''); |
| 97 | - $change_id = (int)$request->get('change_id'); |
|
| 97 | + $change_id = (int) $request->get('change_id'); |
|
| 98 | 98 | |
| 99 | 99 | $changes = DB::table('change') |
| 100 | 100 | ->where('gedcom_id', '=', $tree->id()) |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | { |
| 192 | 192 | $url = $request->get('url', ''); |
| 193 | 193 | $xref = $request->get('xref', ''); |
| 194 | - $change_id = (int)$request->get('change_id'); |
|
| 194 | + $change_id = (int) $request->get('change_id'); |
|
| 195 | 195 | |
| 196 | 196 | // Reject a change, and subsequent changes to the same record |
| 197 | 197 | DB::table('change') |