@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | if (strlen($match[1]) > strlen($match[2])) { |
74 | 74 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
75 | 75 | } |
76 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
76 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
77 | 77 | $view = 'year'; |
78 | 78 | } else { |
79 | 79 | // advanced-year "decade/century wildcard" |
80 | 80 | if (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
81 | 81 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
82 | 82 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
83 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
83 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
84 | 84 | $view = 'year'; |
85 | 85 | } else { |
86 | 86 | if ($year < 0) { |
@@ -192,14 +192,14 @@ discard block |
||
192 | 192 | if (strlen($match[1]) > strlen($match[2])) { |
193 | 193 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
194 | 194 | } |
195 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
195 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
196 | 196 | $view = 'year'; |
197 | 197 | } else { |
198 | 198 | // advanced-year "decade/century wildcard" |
199 | 199 | if (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
200 | 200 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
201 | 201 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
202 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
202 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
203 | 203 | $view = 'year'; |
204 | 204 | } else { |
205 | 205 | if ($year < 0) { |
@@ -526,7 +526,7 @@ |
||
526 | 526 | $html = ''; |
527 | 527 | |
528 | 528 | foreach ($list as $id => $facts) { |
529 | - $tmp = GedcomRecord::getInstance($id, $tree); |
|
529 | + $tmp = GedcomRecord::getInstance($id, $tree); |
|
530 | 530 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->getFullName() . '</a> '; |
531 | 531 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
532 | 532 | } |
@@ -74,7 +74,7 @@ |
||
74 | 74 | <?php endforeach ?> |
75 | 75 | </td> |
76 | 76 | <td> |
77 | - <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name,])) ?>" title="<?= I18N::translate('Send a message') ?>"> |
|
77 | + <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name, ])) ?>" title="<?= I18N::translate('Send a message') ?>"> |
|
78 | 78 | <?= e($record_change->real_name) ?> - <?= e($record_change->user_name) ?> |
79 | 79 | </a> |
80 | 80 | </td> |
@@ -5,7 +5,7 @@ |
||
5 | 5 | |
6 | 6 | <?= view('admin/breadcrumbs', [ |
7 | 7 | 'links' => [route('admin-control-panel') => I18N::translate('Control panel'), |
8 | - route('admin-modules') => I18N::translate('Module administration'), |
|
8 | + route('admin-modules') => I18N::translate('Module administration'), |
|
9 | 9 | $title |
10 | 10 | ]]) ?> |
11 | 11 |
@@ -116,7 +116,7 @@ |
||
116 | 116 | */ |
117 | 117 | public function getURL() { |
118 | 118 | return e(route('place-hierarchy', |
119 | - ['parent' => array_reverse($this->gedcom_place),'ged' => $this->tree->getNameUrl()])); |
|
119 | + ['parent' => array_reverse($this->gedcom_place), 'ged' => $this->tree->getNameUrl()])); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -2787,7 +2787,7 @@ |
||
2787 | 2787 | <?php |
2788 | 2788 | if ($level < 3 && $record->pl_icon != '') { |
2789 | 2789 | echo 'var image = { |
2790 | - "url" : "' . WT_MODULES_DIR . 'googlemap/" + "' . $record->pl_icon . '", |
|
2790 | + "url" : "' . WT_MODULES_DIR . 'googlemap/" + "' . $record->pl_icon . '", |
|
2791 | 2791 | "size" : new google.maps.Size(25, 15), |
2792 | 2792 | "origin" : new google.maps.Point(0, 0), |
2793 | 2793 | "anchor" : new google.maps.Point(12, 15) |
@@ -184,6 +184,6 @@ |
||
184 | 184 | </table> |
185 | 185 | </form> |
186 | 186 | |
187 | -<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx,])) ?>"></div> |
|
187 | +<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, ])) ?>"></div> |
|
188 | 188 | |
189 | 189 | <?= view('modals/ajax') ?> |
@@ -6,13 +6,13 @@ |
||
6 | 6 | |
7 | 7 | <?php if ($individual->isPendingDeletion()): ?> |
8 | 8 | <?php if (Auth::isModerator($individual->getTree())): ?> |
9 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
9 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
10 | 10 | <?php elseif (Auth::isEditor($individual->getTree())): ?> |
11 | 11 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This individual has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
12 | 12 | <?php endif ?> |
13 | 13 | <?php elseif ($individual->isPendingAddition()): ?> |
14 | 14 | <?php if (Auth::isModerator($individual->getTree())): ?> |
15 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
15 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
16 | 16 | <?php elseif (Auth::isEditor($individual->getTree())): ?> |
17 | 17 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This individual has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
18 | 18 | <?php endif ?> |
@@ -8,13 +8,13 @@ |
||
8 | 8 | |
9 | 9 | <?php if ($record->isPendingDeletion()): ?> |
10 | 10 | <?php if (Auth::isModerator($record->getTree())): ?> |
11 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
11 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
12 | 12 | <?php elseif (Auth::isEditor($record->getTree())): ?> |
13 | 13 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
14 | 14 | <?php endif ?> |
15 | 15 | <?php elseif ($record->isPendingAddition()): ?> |
16 | 16 | <?php if (Auth::isModerator($record->getTree())): ?> |
17 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
17 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
18 | 18 | <?php elseif (Auth::isEditor($record->getTree())): ?> |
19 | 19 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
20 | 20 | <?php endif ?> |
@@ -8,13 +8,13 @@ |
||
8 | 8 | |
9 | 9 | <?php if ($source->isPendingDeletion()): ?> |
10 | 10 | <?php if (Auth::isModerator($source->getTree())): ?> |
11 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
11 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
12 | 12 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
13 | 13 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
14 | 14 | <?php endif ?> |
15 | 15 | <?php elseif ($source->isPendingAddition()): ?> |
16 | 16 | <?php if (Auth::isModerator($source->getTree())): ?> |
17 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
17 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
18 | 18 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
19 | 19 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
20 | 20 | <?php endif ?> |