Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change the style in admin notice content view from <p> to <pre> #11301

Merged
merged 1 commit into from
May 5, 2020
Merged

Change the style in admin notice content view from <p> to <pre> #11301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
ui: Change the style of content in notic content view from <p> to <pre> 
That's because many notic have more than one lines. So I think
pre is more better to used in here than p

Signed-off-by: a1012112796 <[email protected]>
  • Loading branch information
@a1012112796
a1012112796 committed May 5, 2020
commit e6b72b1190cb365f0ee16ce27cbb100e970d66a4
2 changes: 1 addition & 1 deletion templates/admin/notice.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<i class="close icon"></i>
<div class="header">{{$.i18n.Tr "admin.notices.view_detail_header"}}</div>
<div class="content">
<p></p>
<pre></pre>
</div>
</div>
{{template "base/footer" .}}
2 changes: 1 addition & 1 deletion web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,7 +2019,7 @@ function initAdmin() {

// Attach view detail modals
$('.view-detail').on('click', function () {
$detailModal.find('.content p').text($(this).data('content'));
$detailModal.find('.content pre').text($(this).data('content'));
$detailModal.modal('show');
return false;
});
Expand Down