@@ -84,7 +84,8 @@ discard block |
||
| 84 | 84 | <?php if ($ancestors_only === '1'): ?> |
| 85 | 85 | <input type="hidden" name="ancestors" value="1"> |
| 86 | 86 | <?= I18N::translate('Find relationships via ancestors') ?> |
| 87 | - <?php else: ?> |
|
| 87 | + <?php else { |
|
| 88 | + : ?> |
|
| 88 | 89 | <?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?> |
| 89 | 90 | <?php endif ?> |
| 90 | 91 | </div> |
@@ -114,6 +115,7 @@ discard block |
||
| 114 | 115 | if ($person1 && $person2) { |
| 115 | 116 | if (I18N::direction() === 'ltr') { |
| 116 | 117 | $horizontal_arrow = '<br><i class="icon-rarrow"></i>'; |
| 118 | +} |
|
| 117 | 119 | $diagonal1 = Theme::theme()->parameter('image-dline'); |
| 118 | 120 | $diagonal2 = Theme::theme()->parameter('image-dline2'); |
| 119 | 121 | } else { |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Exception; |
| 19 | -use Swift_Mailer; |
|
| 20 | 19 | use Swift_MailTransport; |
| 20 | +use Swift_Mailer; |
|
| 21 | 21 | use Swift_Message; |
| 22 | 22 | use Swift_NullTransport; |
| 23 | 23 | use Swift_Preferences; |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | if (!empty($menu->getSubmenus())) { |
| 107 | 107 | // Insert a dummy menu / label into the submenu |
| 108 | 108 | $submenus = $menu->getSubmenus(); |
| 109 | - array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;'])); |
|
| 109 | + array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;'])); |
|
| 110 | 110 | $menu->setSubmenus($submenus); |
| 111 | 111 | } |
| 112 | 112 | |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | namespace Fisharebest\Webtrees\Module; |
| 17 | 17 | |
| 18 | -use Fisharebest\Webtrees\Auth; |
|
| 19 | 18 | use Fisharebest\Webtrees\Date; |
| 20 | 19 | use Fisharebest\Webtrees\Fact; |
| 21 | 20 | use Fisharebest\Webtrees\Family; |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | namespace Fisharebest\Webtrees\Module; |
| 17 | 17 | |
| 18 | -use Fisharebest\Webtrees\Auth; |
|
| 19 | 18 | use Fisharebest\Webtrees\Database; |
| 20 | 19 | use Fisharebest\Webtrees\Filter; |
| 21 | 20 | use Fisharebest\Webtrees\I18N; |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | namespace Fisharebest\Webtrees\Module; |
| 17 | 17 | |
| 18 | -use Fisharebest\Webtrees\Auth; |
|
| 19 | 18 | use Fisharebest\Webtrees\Controller\ChartController; |
| 20 | 19 | use Fisharebest\Webtrees\Filter; |
| 21 | 20 | use Fisharebest\Webtrees\I18N; |
@@ -85,8 +85,7 @@ discard block |
||
| 85 | 85 | // Create the underlying PDO object |
| 86 | 86 | self::$pdo = new PDO( |
| 87 | 87 | (substr($DBHOST, 0, 1) === '/' ? |
| 88 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
| 89 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 88 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 90 | 89 | ), |
| 91 | 90 | $DBUSER, $DBPASS, |
| 92 | 91 | [ |
@@ -161,7 +160,7 @@ discard block |
||
| 161 | 160 | } |
| 162 | 161 | } |
| 163 | 162 | $milliseconds = sprintf('%.3f', $microseconds * 1000); |
| 164 | - self::$log[] = '<tr><td>' .$stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>'; |
|
| 163 | + self::$log[] = '<tr><td>' . $stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>'; |
|
| 165 | 164 | } |
| 166 | 165 | |
| 167 | 166 | /** |
@@ -297,9 +297,9 @@ |
||
| 297 | 297 | |
| 298 | 298 | if ($sosa == 0 && Auth::isEditor($family->getTree())) { |
| 299 | 299 | echo '<br>'; |
| 300 | - echo '<a href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() .'&xref=' . $family->getXref() . '&gender=U">' . I18N::translate('Add a child to this family') . '</a>'; |
|
| 301 | - echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() .'&xref=' . $family->getXref() . '&gender=M" title="', I18N::translate('son'), '"></a>'; |
|
| 302 | - echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() .'&xref=' . $family->getXref() . '&gender=F" title="', I18N::translate('daughter'), '"></a>'; |
|
| 300 | + echo '<a href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() . '&xref=' . $family->getXref() . '&gender=U">' . I18N::translate('Add a child to this family') . '</a>'; |
|
| 301 | + echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() . '&xref=' . $family->getXref() . '&gender=M" title="', I18N::translate('son'), '"></a>'; |
|
| 302 | + echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&ged=' . $family->getTree()->getNameHtml() . '&xref=' . $family->getXref() . '&gender=F" title="', I18N::translate('daughter'), '"></a>'; |
|
| 303 | 303 | echo '<br><br>'; |
| 304 | 304 | } |
| 305 | 305 | echo '</td>'; |
@@ -77,11 +77,11 @@ |
||
| 77 | 77 | $menu->addSubmenu(new Menu(I18N::translate('Change family members'), 'edit_interface.php?action=changefamily&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref(), 'menu-fam-change')); |
| 78 | 78 | |
| 79 | 79 | // edit_fam / add child |
| 80 | - $menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&ged=' . $this->record->getTree()->getNameHtml() .'&xref=' . $this->record->getXref() . '&gender=U', 'menu-fam-addchil')); |
|
| 80 | + $menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref() . '&gender=U', 'menu-fam-addchil')); |
|
| 81 | 81 | |
| 82 | 82 | // edit_fam / reorder_children |
| 83 | 83 | if ($this->record->getNumberOfChildren() > 1) { |
| 84 | - $menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&ged=' . $this->record->getTree()->getNameHtml() .'&xref=' . $this->record->getXref(), 'menu-fam-orderchil')); |
|
| 84 | + $menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref(), 'menu-fam-orderchil')); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // delete |