diff options
| -rw-r--r-- | app/Module/UserMessagesModule.php | 18 | ||||
| -rw-r--r-- | resources/js/webtrees.js | 11 |
2 files changed, 12 insertions, 17 deletions
diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index ef24d1a728..e693a5884a 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -40,6 +40,7 @@ use stdClass; use function assert; use function e; use function route; +use function view; /** * Class UserMessagesModule @@ -182,11 +183,16 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface $content .= '<th class="list_label">' . I18N::translate('Email address') . '</th>'; $content .= '</tr>'; foreach ($messages as $message) { - $content .= '<tr>'; - $content .= '<td class="list_value_wrap center"><input type="checkbox" name="message_id[]" value="' . $message->message_id . '" id="cb_message' . $message->message_id . '"></td>'; - $content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . e($message->subject) . '</b></a></td>'; - $content .= '<td class="list_value_wrap">' . view('components/datetime', ['timestamp' => $message->created]) . '</td>'; - $content .= '<td class="list_value_wrap">'; + $content .= '<tr>' . + '<td class="list_value_wrap center"><input type="checkbox" name="message_id[]" value="' . $message->message_id . '" id="cb_message' . $message->message_id . '"></td>' . + '<td class="list_value_wrap">' . + '<a href="#message' . $message->message_id . '" data-toggle="collapse" role="button" aria-expanded="false" aria-controls="message' . $message->message_id . '">' . + view('icons/expand') . + view('icons/collapse') . + '<b dir="auto">' . e($message->subject) . '</b>' . + '</a></td>' . + '<td class="list_value_wrap">' . view('components/datetime', ['timestamp' => $message->created]) . '</td>' . + '<td class="list_value_wrap">'; $user = $this->user_service->findByIdentifier($message->sender); @@ -198,7 +204,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface $content .= '</td>'; $content .= '</tr>'; - $content .= '<tr><td class="list_value_wrap" colspan="4"><div id="message' . $message->message_id . '" style="display:none;">'; + $content .= '<tr><td class="list_value_wrap" colspan="4"><div id="message' . $message->message_id . '" class="collapse">'; $content .= '<div dir="auto" style="white-space: pre-wrap;">' . Filter::expandUrls($message->body, $tree) . '</div><br>'; /* I18N: When replying to an email, the subject becomes “RE: <subject>” */ diff --git a/resources/js/webtrees.js b/resources/js/webtrees.js index f2fdfd755a..8760d0c4d0 100644 --- a/resources/js/webtrees.js +++ b/resources/js/webtrees.js @@ -114,17 +114,6 @@ }; }(window.webtrees = window.webtrees || {})); -/** - * @param {string} sid - * @returns {boolean} - */ -function expand_layer (sid) { - $('#' + sid + '_img').toggleClass('icon-plus icon-minus'); - $('#' + sid).slideToggle('fast'); - $('#' + sid + '-alt').toggle(); // hide something when we show the layer - and vice-versa - return false; -} - var pastefield; /** |