@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | </legend> |
| 56 | 56 | <div class="col-sm-8"> |
| 57 | 57 | <?= Bootstrap4::radioButtons( |
| 58 | - 'cleardatabase', |
|
| 59 | - [I18N::translate('no'), I18N::translate('yes')], |
|
| 60 | - '0', |
|
| 61 | - true |
|
| 62 | - ) ?> |
|
| 58 | + 'cleardatabase', |
|
| 59 | + [I18N::translate('no'), I18N::translate('yes')], |
|
| 60 | + '0', |
|
| 61 | + true |
|
| 62 | + ) ?> |
|
| 63 | 63 | </div> |
| 64 | 64 | </div> |
| 65 | 65 | </fieldset> |
@@ -72,14 +72,14 @@ discard block |
||
| 72 | 72 | </legend> |
| 73 | 73 | <div class="col-sm-8"> |
| 74 | 74 | <?= Bootstrap4::select( |
| 75 | - [ |
|
| 76 | - 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
| 77 | - 'add' => I18N::translate('Only add new records'), |
|
| 78 | - 'update' => I18N::translate('Only update existing records'), |
|
| 79 | - ], |
|
| 80 | - '0', |
|
| 81 | - ['id' => 'import-options', 'name' => 'import-options'] |
|
| 82 | - ) ?> |
|
| 75 | + [ |
|
| 76 | + 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
| 77 | + 'add' => I18N::translate('Only add new records'), |
|
| 78 | + 'update' => I18N::translate('Only update existing records'), |
|
| 79 | + ], |
|
| 80 | + '0', |
|
| 81 | + ['id' => 'import-options', 'name' => 'import-options'] |
|
| 82 | + ) ?> |
|
| 83 | 83 | </div> |
| 84 | 84 | </div> |
| 85 | 85 | </fieldset> |
@@ -75,27 +75,27 @@ discard block |
||
| 75 | 75 | <a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>"> |
| 76 | 76 | <?= FontAwesome::decorativeIcon('add') ?> |
| 77 | 77 | <?= /* I18N: A button label. */ |
| 78 | - I18N::translate('add place') ?> |
|
| 78 | + I18N::translate('add place') ?> |
|
| 79 | 79 | </a> |
| 80 | 80 | <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" |
| 81 | 81 | data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 82 | 82 | <?= FontAwesome::decorativeIcon('download') ?> |
| 83 | 83 | <?= /* I18N: A button label. */ |
| 84 | - I18N::translate('export file') ?> |
|
| 84 | + I18N::translate('export file') ?> |
|
| 85 | 85 | </button> |
| 86 | 86 | <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> |
| 87 | 87 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'csv'])) ?>"> |
| 88 | 88 | csv |
| 89 | 89 | </a> |
| 90 | 90 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'geojson'] |
| 91 | - )) ?>"> |
|
| 91 | + )) ?>"> |
|
| 92 | 92 | geoJSON |
| 93 | 93 | </a> |
| 94 | 94 | </div> |
| 95 | 95 | <a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>"> |
| 96 | 96 | <?= FontAwesome::decorativeIcon('upload') ?> |
| 97 | 97 | <?= /* I18N: A button label. */ |
| 98 | - I18N::translate('import file') ?> |
|
| 98 | + I18N::translate('import file') ?> |
|
| 99 | 99 | </a> |
| 100 | 100 | </td> |
| 101 | 101 | </tr> |
@@ -111,16 +111,16 @@ discard block |
||
| 111 | 111 | </label> |
| 112 | 112 | <div class="col-sm-6"> |
| 113 | 113 | <?= Bootstrap4::select( |
| 114 | - Tree::getNameList(), |
|
| 115 | - '', |
|
| 116 | - ['id' => 'ged', 'name' => 'ged'] |
|
| 117 | - ) ?> |
|
| 114 | + Tree::getNameList(), |
|
| 115 | + '', |
|
| 116 | + ['id' => 'ged', 'name' => 'ged'] |
|
| 117 | + ) ?> |
|
| 118 | 118 | </div> |
| 119 | 119 | <div class="col-sm-2"> |
| 120 | 120 | <button type="submit" class="btn btn-primary"> |
| 121 | 121 | <?= view('icons/upload') ?> |
| 122 | 122 | <?= /* I18N: A button label. */ |
| 123 | - I18N::translate('import') ?> |
|
| 123 | + I18N::translate('import') ?> |
|
| 124 | 124 | </button> |
| 125 | 125 | </div> |
| 126 | 126 | </div> |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | </label> |
| 75 | 75 | <div class="col-sm-9 wt-page-options-value"> |
| 76 | 76 | <?= FunctionsEdit::formControlIndividual($tree, $default_individual, ['id' => 'root-id', |
| 77 | - 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?> |
|
| 77 | + 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?> |
|
| 78 | 78 | <p class="small text-muted" id="root-id-description"> |
| 79 | 79 | <?= I18N::translate('This individual will be selected by default when viewing charts and reports.') ?> |
| 80 | 80 | </p> |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | <?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description']) ?> |
| 150 | 150 | <p class="small text-muted" id="theme-description"> |
| 151 | 151 | <?= /* I18N: Help text for the "Default theme" site configuration setting */ |
| 152 | - I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?> |
|
| 152 | + I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?> |
|
| 153 | 153 | </p> |
| 154 | 154 | </div> |
| 155 | 155 | </div> |
@@ -241,7 +241,7 @@ |
||
| 241 | 241 | ], |
| 242 | 242 | 'CEME' => [ |
| 243 | 243 | // CEME is NOT a valid 5.5.1 tag |
| 244 | - //'BURI', |
|
| 244 | + //'BURI', |
|
| 245 | 245 | ], |
| 246 | 246 | 'RELA' => [ |
| 247 | 247 | 'ASSO', |
@@ -302,13 +302,13 @@ discard block |
||
| 302 | 302 | { |
| 303 | 303 | $found_facts = []; |
| 304 | 304 | foreach ([ |
| 305 | - new GregorianDate($jd), |
|
| 306 | - new JulianDate($jd), |
|
| 307 | - new FrenchDate($jd), |
|
| 308 | - new JewishDate($jd), |
|
| 309 | - new HijriDate($jd), |
|
| 310 | - new JalaliDate($jd), |
|
| 311 | - ] as $anniv) { |
|
| 305 | + new GregorianDate($jd), |
|
| 306 | + new JulianDate($jd), |
|
| 307 | + new FrenchDate($jd), |
|
| 308 | + new JewishDate($jd), |
|
| 309 | + new HijriDate($jd), |
|
| 310 | + new JalaliDate($jd), |
|
| 311 | + ] as $anniv) { |
|
| 312 | 312 | // Build a SQL where clause to match anniversaries in the appropriate calendar. |
| 313 | 313 | $ind_sql = |
| 314 | 314 | "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" . |
@@ -462,9 +462,9 @@ discard block |
||
| 462 | 462 | |
| 463 | 463 | // Now fetch these anniversaries |
| 464 | 464 | foreach ([ |
| 465 | - 'INDI' => $ind_sql . $where . $order_by, |
|
| 466 | - 'FAM' => $fam_sql . $where . $order_by, |
|
| 467 | - ] as $type => $sql) { |
|
| 465 | + 'INDI' => $ind_sql . $where . $order_by, |
|
| 466 | + 'FAM' => $fam_sql . $where . $order_by, |
|
| 467 | + ] as $type => $sql) { |
|
| 468 | 468 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
| 469 | 469 | foreach ($rows as $row) { |
| 470 | 470 | if ($type === 'INDI') { |
@@ -522,9 +522,9 @@ discard block |
||
| 522 | 522 | $ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1"; |
| 523 | 523 | $fam_sql = "SELECT d_gid AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families` {$where} AND d_gid=f_id AND d_file=f_file ORDER BY d_julianday1"; |
| 524 | 524 | foreach ([ |
| 525 | - 'INDI' => $ind_sql, |
|
| 526 | - 'FAM' => $fam_sql, |
|
| 527 | - ] as $type => $sql) { |
|
| 525 | + 'INDI' => $ind_sql, |
|
| 526 | + 'FAM' => $fam_sql, |
|
| 527 | + ] as $type => $sql) { |
|
| 528 | 528 | $rows = Database::prepare($sql)->fetchAll(); |
| 529 | 529 | foreach ($rows as $row) { |
| 530 | 530 | if ($type === 'INDI') { |
@@ -345,10 +345,10 @@ |
||
| 345 | 345 | } |
| 346 | 346 | // print gedcom ages |
| 347 | 347 | foreach ([ |
| 348 | - I18N::translate('Age') => $fact_age, |
|
| 349 | - I18N::translate('Husband') => $husb_age, |
|
| 350 | - I18N::translate('Wife') => $wife_age, |
|
| 351 | - ] as $label => $age) { |
|
| 348 | + I18N::translate('Age') => $fact_age, |
|
| 349 | + I18N::translate('Husband') => $husb_age, |
|
| 350 | + I18N::translate('Wife') => $wife_age, |
|
| 351 | + ] as $label => $age) { |
|
| 352 | 352 | if ($age != '') { |
| 353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
| 354 | 354 | } |
@@ -840,9 +840,9 @@ |
||
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | foreach ([ |
| 843 | - 'main' => $main_blocks, |
|
| 844 | - 'side' => $side_blocks, |
|
| 845 | - ] as $location => $updated_blocks) { |
|
| 843 | + 'main' => $main_blocks, |
|
| 844 | + 'side' => $side_blocks, |
|
| 845 | + ] as $location => $updated_blocks) { |
|
| 846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
| 847 | 847 | if (is_numeric($block_id)) { |
| 848 | 848 | // Updated block |
@@ -13,18 +13,18 @@ |
||
| 13 | 13 | <?= csrf_field() ?> |
| 14 | 14 | <ul class="fa-ul"> |
| 15 | 15 | <?php |
| 16 | - foreach ($entries as $entry) { |
|
| 17 | - if (in_array($entry, $protected)) { |
|
| 18 | - echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>'; |
|
| 19 | - } else { |
|
| 20 | - echo '<li><span class="fa-li">' . view('icons/delete') . '</span>'; |
|
| 21 | - echo '<label>'; |
|
| 22 | - echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> '; |
|
| 23 | - echo e($entry); |
|
| 24 | - echo '</label></li>'; |
|
| 25 | - } |
|
| 26 | - } |
|
| 27 | - ?> |
|
| 16 | + foreach ($entries as $entry) { |
|
| 17 | + if (in_array($entry, $protected)) { |
|
| 18 | + echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>'; |
|
| 19 | + } else { |
|
| 20 | + echo '<li><span class="fa-li">' . view('icons/delete') . '</span>'; |
|
| 21 | + echo '<label>'; |
|
| 22 | + echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> '; |
|
| 23 | + echo e($entry); |
|
| 24 | + echo '</label></li>'; |
|
| 25 | + } |
|
| 26 | + } |
|
| 27 | + ?> |
|
| 28 | 28 | </ul> |
| 29 | 29 | |
| 30 | 30 | <button class="btn btn-danger" type="submit"> |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | <p> |
| 9 | 9 | <?= /* I18N: FAQ = “Frequently Asked Question” */ |
| 10 | - I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?> |
|
| 10 | + I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?> |
|
| 11 | 11 | <?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?> |
| 12 | 12 | </p> |
| 13 | 13 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> |
| 29 | 29 | <?= view('icons/add') ?> |
| 30 | 30 | <?= /* I18N: FAQ = “Frequently Asked Question” */ |
| 31 | - I18N::translate('Add an FAQ') ?> |
|
| 31 | + I18N::translate('Add an FAQ') ?> |
|
| 32 | 32 | </a> |
| 33 | 33 | </p> |
| 34 | 34 | |