jQuery-3, Bootstrap-4, FontAwesome-4.7, Select2-4, remove popup windows

1 files changed, 47 insertions, 44 deletions

diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php
index 59b03291bb..fa79666177 100644
--- a/app/Module/UpcomingAnniversariesModule.php
+++ b/app/Module/UpcomingAnniversariesModule.php
@@ -16,7 +16,9 @@
 namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\Bootstrap4;
 use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\FontAwesome;
 use Fisharebest\Webtrees\Functions\FunctionsEdit;
 use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
 use Fisharebest\Webtrees\I18N;
@@ -61,9 +63,8 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
 		$onlyBDM   = $this->getBlockSetting($block_id, 'onlyBDM', '0');
 		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
 		$sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
-		$block     = $this->getBlockSetting($block_id, 'block', '1');
 
-		foreach (['days', 'filter', 'onlyBDM', 'infoStyle', 'sortStyle', 'block'] as $name) {
+		foreach (['days', 'filter', 'onlyBDM', 'infoStyle', 'sortStyle'] as $name) {
 			if (array_key_exists($name, $cfg)) {
 				$$name = $cfg[$name];
 			}
@@ -75,7 +76,7 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
 		$id    = $this->getName() . $block_id;
 		$class = $this->getName() . '_block';
 		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+			$title = FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => 'block_edit.php?block_id=' . $block_id . '&ged=' . $WT_TREE->getNameHtml() . '&ctype=' . $ctype]) . ' ';
 		} else {
 			$title = '';
 		}
@@ -96,10 +97,6 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
 		}
 
 		if ($template) {
-			if ($block === '1') {
-				$class .= ' small_inner_block';
-			}
-
 			return Theme::theme()->formatBlock($id, $title, $class, $content);
 		} else {
 			return $content;
@@ -133,7 +130,6 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
 			$this->setBlockSetting($block_id, 'onlyBDM', Filter::postBool('onlyBDM'));
 			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
 			$this->setBlockSetting($block_id, 'sortStyle', Filter::post('sortStyle', 'alpha|anniv', 'alpha'));
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
 		}
 
 		$days      = $this->getBlockSetting($block_id, 'days', '7');
@@ -141,46 +137,53 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
 		$onlyBDM   = $this->getBlockSetting($block_id, 'onlyBDM', '0');
 		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
 		$sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
-		$block     = $this->getBlockSetting($block_id, 'block', '1');
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Number of days to show');
-		echo '</td><td class="optionbox">';
-		echo '<input type="text" name="days" size="2" value="', $days, '">';
-		echo ' <em>', I18N::plural('maximum %s day', 'maximum %s days', 30, I18N::number(30)), '</em>';
-		echo '</td></tr>';
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Show only events of living individuals');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('filter', $filter);
-		echo '</td></tr>';
+		?>
+		<div class="form-group row">
+			<label class="col-sm-3 col-form-label" for="days">
+				<?= I18N::translate('Number of days to show') ?>
+			</label>
+			<div class="col-sm-9">
+				<input type="text" name="days" id="days" size="2" value="<?= $days ?>">
+				<?= I18N::plural('maximum %s day', 'maximum %s days', 30, I18N::number(30)) ?>
+			</div>
+		</div>
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Show only births, deaths, and marriages');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('onlyBDM', $onlyBDM);
-		echo '</td></tr>';
+		<div class="form-group row">
+			<label class="col-sm-3 col-form-label" for="filter">
+				<?= I18N::translate('Show only events of living individuals') ?>
+			</label>
+			<div class="col-sm-9">
+				<?= Bootstrap4::radioButtons('filter', FunctionsEdit::optionsNoYes(), $filter, true) ?>
+			</div>
+		</div>
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Presentation style');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('infoStyle', ['list' => I18N::translate('list'), 'table' => I18N::translate('table')], null, $infoStyle, '');
-		echo '</td></tr>';
+		<div class="form-group row">
+			<label class="col-sm-3 col-form-label" for="onlyBDM">
+				<?= I18N::translate('Show only births, deaths, and marriages') ?>
+			</label>
+			<div class="col-sm-9">
+				<?= Bootstrap4::radioButtons('onlyBDM', FunctionsEdit::optionsNoYes(), $onlyBDM, true) ?>
+			</div>
+		</div>
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Sort order');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('sortStyle', [
-			/* I18N: An option in a list-box */ 'alpha' => I18N::translate('sort by name'),
-			/* I18N: An option in a list-box */ 'anniv' => I18N::translate('sort by date'),
-		], null, $sortStyle, '');
-		echo '</td></tr>';
+		<div class="form-group row">
+			<label class="col-sm-3 col-form-label" for="infoStyle">
+				<?= I18N::translate('Presentation style') ?>
+			</label>
+			<div class="col-sm-9">
+				<?= Bootstrap4::select(['list' => I18N::translate('list'), 'table' => I18N::translate('table')], $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?>
+			</div>
+		</div>
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
+		<div class="form-group row">
+			<label class="col-sm-3 col-form-label" for="sortStyle">
+				<?= I18N::translate('Sort order') ?>
+			</label>
+			<div class="col-sm-9">
+				<?= Bootstrap4::select([/* I18N: An option in a list-box */ 'alpha' => I18N::translate('sort by name'), /* I18N: An option in a list-box */ 'anniv' => I18N::translate('sort by date')], $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?>
+			</div>
+		</div>
+		<?php
 	}
 }