LPS-45877

Hi Hugo,

The PR extends from https://github.com/hhuijser/liferay-plugins/pull/184 and https://github.com/hhuijser/liferay-portal/pull/1837.

The fix is finished in the displaying level(jsp).

Please help check it.

Thanks,
Hai