Skip to content
This repository was archived by the owner on Nov 23, 2020. It is now read-only.

[Feature][0.9][Merged] Alert messages can now have HTML content #251

Merged
merged 1 commit into from
Mar 22, 2018
Merged

[Feature][0.9][Merged] Alert messages can now have HTML content #251

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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
### Security
- Nothing

-------

### Added
- flexbox css helper class;
- support for HTML messages inside Alert bubbles, when triggered from PHP;


## [0.8.9] - 2018-02-08

Expand Down
7 changes: 7 additions & 0 deletions src/public/backpack.base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,13 @@ body[class^='skin-purple'] .pagination>.active>span:hover {
border-color: #f8d053;
}

/* FLEXBOX HELPERS */
Copy link
Member Author

@tabacitu tabacitu Feb 28, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has NOTHING to do with the current PR, but it's needed and harmless, so I say let's leave it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed by what though?


.display-flex-wrap {
display: flex;
flex-wrap: wrap;
}

/* BORDER RADIUS HELPERS */

.b-rad-sm {
Expand Down
2 changes: 1 addition & 1 deletion src/resources/views/inc/alerts.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$(function(){
new PNotify({
// title: 'Regular Notice',
text: "{{ $message }}",
text: "{!! str_replace('"', "'", $message) !!}",
Copy link
Contributor

@lloy0076 lloy0076 Mar 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You sure you've checked this?

https://github.com/twigphp/Twig/blob/e9a1f916e2ed7003fa7acec9d17495dbdac0cd7d/test/Twig/Tests/escapingTest.php

Look for the jsSpecialChars test on Line 52.

And there's the filter:

https://github.com/twigphp/Twig/blob/9bac13daf0a4d98c08ea42e87537d624460c77f4/lib/Twig/Extension/Core.php#L949

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. Just double-checked to be sure: https://cl.ly/3C2V1s0i1Y26

type: "{{ $type }}",
icon: false
});
Expand Down