@@ -30,11 +30,11 @@ |
||
| 30 | 30 | use Fisharebest\Webtrees\GedcomTag; |
| 31 | 31 | use Fisharebest\Webtrees\I18N; |
| 32 | 32 | use Fisharebest\Webtrees\Individual; |
| 33 | +use Fisharebest\Webtrees\Menu; |
|
| 33 | 34 | use Fisharebest\Webtrees\Module; |
| 34 | 35 | use Fisharebest\Webtrees\Stats; |
| 35 | 36 | use Fisharebest\Webtrees\Theme; |
| 36 | 37 | use Fisharebest\Webtrees\Tree; |
| 37 | -use Fisharebest\Webtrees\Menu; |
|
| 38 | 38 | use PDO; |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | /** |
| 216 | 216 | * Return a menu item for this chart. |
| 217 | 217 | * |
| 218 | - * @return Menu|null |
|
| 218 | + * @return Menu |
|
| 219 | 219 | */ |
| 220 | 220 | public function getChartMenu(Individual $individual) { |
| 221 | 221 | return new Menu( |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | /** |
| 230 | 230 | * Return a menu item for this chart - for use in individual boxes. |
| 231 | 231 | * |
| 232 | - * @return Menu|null |
|
| 232 | + * @return Menu |
|
| 233 | 233 | */ |
| 234 | 234 | public function getBoxChartMenu(Individual $individual) { |
| 235 | 235 | return $this->getChartMenu($individual); |
@@ -20,8 +20,8 @@ |
||
| 20 | 20 | use Fisharebest\Webtrees\Filter; |
| 21 | 21 | use Fisharebest\Webtrees\I18N; |
| 22 | 22 | use Fisharebest\Webtrees\Individual; |
| 23 | -use Fisharebest\Webtrees\Module\InteractiveTree\TreeView; |
|
| 24 | 23 | use Fisharebest\Webtrees\Menu; |
| 24 | +use Fisharebest\Webtrees\Module\InteractiveTree\TreeView; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Class InteractiveTreeModule |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /** |
| 76 | 76 | * Return a menu item for this chart. |
| 77 | 77 | * |
| 78 | - * @return Menu|null |
|
| 78 | + * @return Menu |
|
| 79 | 79 | */ |
| 80 | 80 | public function getChartMenu(Individual $individual) { |
| 81 | 81 | return new Menu( |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | /** |
| 90 | 90 | * Return a menu item for this chart - for use in individual boxes. |
| 91 | 91 | * |
| 92 | - * @return Menu|null |
|
| 92 | + * @return Menu |
|
| 93 | 93 | */ |
| 94 | 94 | public function getBoxChartMenu(Individual $individual) { |
| 95 | 95 | return $this->getChartMenu($individual); |
@@ -74,8 +74,11 @@ |
||
| 74 | 74 | <td class="col-xs-2"> |
| 75 | 75 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 76 | 76 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 77 | - <?php else: ?> |
|
| 78 | - <?php echo $module->getTitle(); ?> |
|
| 77 | + <?php else { |
|
| 78 | + : ?> |
|
| 79 | + <?php echo $module->getTitle(); |
|
| 80 | +} |
|
| 81 | +?> |
|
| 79 | 82 | <?php endif; ?> |
| 80 | 83 | </td> |
| 81 | 84 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -500,7 +500,7 @@ |
||
| 500 | 500 | /** |
| 501 | 501 | * A menu, to be added to the main application menu. |
| 502 | 502 | * |
| 503 | - * @return Menu|null |
|
| 503 | + * @return Menu |
|
| 504 | 504 | */ |
| 505 | 505 | public function getMenu() { |
| 506 | 506 | $menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=show_list', 'menu-story'); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | /** |
| 57 | 57 | * Return a menu item for this chart. |
| 58 | 58 | * |
| 59 | - * @return Menu|null |
|
| 59 | + * @return Menu |
|
| 60 | 60 | */ |
| 61 | 61 | public function getChartMenu(Individual $individual) { |
| 62 | 62 | return new Menu( |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Return a menu item for this chart - for use in individual boxes. |
| 72 | 72 | * |
| 73 | - * @return Menu|null |
|
| 73 | + * @return Menu |
|
| 74 | 74 | */ |
| 75 | 75 | public function getBoxChartMenu(Individual $individual) { |
| 76 | 76 | return $this->getChartMenu($individual); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | /** |
| 57 | 57 | * Return a menu item for this chart. |
| 58 | 58 | * |
| 59 | - * @return Menu|null |
|
| 59 | + * @return Menu |
|
| 60 | 60 | */ |
| 61 | 61 | public function getChartMenu(Individual $individual) { |
| 62 | 62 | return new Menu( |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Return a menu item for this chart - for use in individual boxes. |
| 72 | 72 | * |
| 73 | - * @return Menu|null |
|
| 73 | + * @return Menu |
|
| 74 | 74 | */ |
| 75 | 75 | public function getBoxChartMenu(Individual $individual) { |
| 76 | 76 | return $this->getChartMenu($individual); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | /** |
| 57 | 57 | * Return a menu item for this chart. |
| 58 | 58 | * |
| 59 | - * @return Menu|null |
|
| 59 | + * @return Menu |
|
| 60 | 60 | */ |
| 61 | 61 | public function getChartMenu(Individual $individual) { |
| 62 | 62 | return new Menu( |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Return a menu item for this chart - for use in individual boxes. |
| 72 | 72 | * |
| 73 | - * @return Menu|null |
|
| 73 | + * @return Menu |
|
| 74 | 74 | */ |
| 75 | 75 | public function getBoxChartMenu(Individual $individual) { |
| 76 | 76 | return $this->getChartMenu($individual); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | /** |
| 57 | 57 | * Return a menu item for this chart. |
| 58 | 58 | * |
| 59 | - * @return Menu|null |
|
| 59 | + * @return Menu |
|
| 60 | 60 | */ |
| 61 | 61 | public function getChartMenu(Individual $individual) { |
| 62 | 62 | return new Menu( |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Return a menu item for this chart - for use in individual boxes. |
| 72 | 72 | * |
| 73 | - * @return Menu|null |
|
| 73 | + * @return Menu |
|
| 74 | 74 | */ |
| 75 | 75 | public function getBoxChartMenu(Individual $individual) { |
| 76 | 76 | return $this->getChartMenu($individual); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | 19 | use Fisharebest\Webtrees\I18N; |
| 20 | -use Fisharebest\Webtrees\Menu; |
|
| 21 | 20 | use Fisharebest\Webtrees\Individual; |
| 21 | +use Fisharebest\Webtrees\Menu; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Class TimelineChartModule |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | /** |
| 57 | 57 | * Return a menu item for this chart. |
| 58 | 58 | * |
| 59 | - * @return Menu|null |
|
| 59 | + * @return Menu |
|
| 60 | 60 | */ |
| 61 | 61 | public function getChartMenu(Individual $individual) { |
| 62 | 62 | return new Menu( |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Return a menu item for this chart - for use in individual boxes. |
| 72 | 72 | * |
| 73 | - * @return Menu|null |
|
| 73 | + * @return Menu |
|
| 74 | 74 | */ |
| 75 | 75 | public function getBoxChartMenu(Individual $individual) { |
| 76 | 76 | return $this->getChartMenu($individual); |