@@ -32,7 +32,7 @@ |
||
32 | 32 | /** |
33 | 33 | * Createa view from a template name and optional data. |
34 | 34 | * |
35 | - * @param $name |
|
35 | + * @param string $name |
|
36 | 36 | * @param array $data |
37 | 37 | */ |
38 | 38 | public function __construct($name, $data = []) { |
@@ -62,7 +62,7 @@ |
||
62 | 62 | * @return string |
63 | 63 | */ |
64 | 64 | public static function getFilenameForView($view_name) { |
65 | - $view_file = $view_name . '.php'; |
|
65 | + $view_file = $view_name . '.php'; |
|
66 | 66 | //$theme_view = WT_THEMES_DIR . Theme::theme()->themeId() . '/resources/views/' . $view_file; |
67 | 67 | |
68 | 68 | //if (file_exists($theme_view)) { |
@@ -17,7 +17,6 @@ |
||
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Auth; |
19 | 19 | use Fisharebest\Webtrees\Bootstrap4; |
20 | -use Fisharebest\Webtrees\Config; |
|
21 | 20 | use Fisharebest\Webtrees\Family; |
22 | 21 | use Fisharebest\Webtrees\Filter; |
23 | 22 | use Fisharebest\Webtrees\FlashMessages; |
@@ -146,7 +146,8 @@ discard block |
||
146 | 146 | value="<?= Html::escape($controller->getValue($i)) ?>"> |
147 | 147 | <?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0): ?> |
148 | 148 | <select class="form-control form-control-sm col-3" name="fields[<?= $i ?>]"> |
149 | - <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>> |
|
149 | + <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) { |
|
150 | + echo 'selected' ?>> |
|
150 | 151 | <?= I18N::translate('Exact') ?> |
151 | 152 | </option> |
152 | 153 | <option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>> |
@@ -161,13 +162,15 @@ discard block |
||
161 | 162 | <?php else: ?> |
162 | 163 | <input type="hidden" name="fields[<?= $i ?>]" value="<?= $controller->getField($i) ?>"> |
163 | 164 | <?php endif; |
165 | +} |
|
164 | 166 | if (preg_match('/:DATE$/', $currentFieldSearch) > 0) { |
165 | 167 | ?> |
166 | 168 | <select class="form-control form-control-sm col-3" name="plusminus[<?= $i ?>]"> |
167 | 169 | <option value=""> |
168 | 170 | <?= I18N::translate('Exact date') ?> |
169 | 171 | </option> |
170 | - <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected' ?>> |
|
172 | + <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) { |
|
173 | + echo 'selected' ?>> |
|
171 | 174 | <?= I18N::plural('±%s year', '±%s years', 2, I18N::number(2)) ?> |
172 | 175 | </option> |
173 | 176 | <option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected' ?>> |
@@ -183,6 +186,7 @@ discard block |
||
183 | 186 | //-- relative fields |
184 | 187 | if ($i == 0 && $fct > 4) { |
185 | 188 | $j = $fct; |
189 | +} |
|
186 | 190 | // Get the current options for Father’s and Mother’s name searches |
187 | 191 | $fatherGivnOption = 'SDX'; |
188 | 192 | $fatherSurnOption = 'SDX'; |
@@ -22,7 +22,6 @@ |
||
22 | 22 | use Fisharebest\Webtrees\Fact; |
23 | 23 | use Fisharebest\Webtrees\Family; |
24 | 24 | use Fisharebest\Webtrees\Filter; |
25 | -use Fisharebest\Webtrees\FontAwesome; |
|
26 | 25 | use Fisharebest\Webtrees\GedcomRecord; |
27 | 26 | use Fisharebest\Webtrees\GedcomTag; |
28 | 27 | use Fisharebest\Webtrees\Html; |
@@ -28,8 +28,6 @@ |
||
28 | 28 | use Fisharebest\Webtrees\Html; |
29 | 29 | use Fisharebest\Webtrees\I18N; |
30 | 30 | use Fisharebest\Webtrees\Individual; |
31 | -use Fisharebest\Webtrees\Module; |
|
32 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
33 | 31 | use Fisharebest\Webtrees\Note; |
34 | 32 | use Fisharebest\Webtrees\Place; |
35 | 33 | use Fisharebest\Webtrees\Session; |
@@ -30,8 +30,6 @@ |
||
30 | 30 | use Fisharebest\Webtrees\I18N; |
31 | 31 | use Fisharebest\Webtrees\Individual; |
32 | 32 | use Fisharebest\Webtrees\Media; |
33 | -use Fisharebest\Webtrees\Module; |
|
34 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
35 | 33 | use Fisharebest\Webtrees\Note; |
36 | 34 | use Fisharebest\Webtrees\Repository; |
37 | 35 | use Fisharebest\Webtrees\Source; |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Fisharebest\Webtrees\Functions\FunctionsPrint; |
20 | 20 | use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; |
21 | 21 | use Fisharebest\Webtrees\Functions\FunctionsPrintLists; |
22 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
23 | 22 | |
24 | 23 | /** @global Tree $WT_TREE */ |
25 | 24 | global $WT_TREE; |
@@ -37,7 +37,7 @@ |
||
37 | 37 | /** |
38 | 38 | * Returns a list of block parsers to add to the existing list |
39 | 39 | * |
40 | - * @return BlockParserInterface[] |
|
40 | + * @return CensusTableParser[] |
|
41 | 41 | */ |
42 | 42 | public function getBlockParsers() { |
43 | 43 | return [ |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use League\CommonMark\Block\Parser\AbstractBlockParser; |
20 | 20 | use League\CommonMark\ContextInterface; |
21 | 21 | use League\CommonMark\Cursor; |
22 | -use League\CommonMark\Util\RegexHelper; |
|
23 | 22 | use Webuni\CommonMark\TableExtension\Table; |
24 | 23 | use Webuni\CommonMark\TableExtension\TableCell; |
25 | 24 | use Webuni\CommonMark\TableExtension\TableRow; |