diff --git a/CHANGELOG.md b/CHANGELOG.md index 472282c4f5a..359bde13d12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Version 25.03.X +Fixes: +- [star-rating] Fixed widget asset path with subdirectory + +Enterprise Fixes: +- [surveys] Fixed widget asset path with subdirectory + ## Version 25.03.40 Fixes: - [hooks] Implement domain/ip address validation for hooks with http effect diff --git a/plugins/star-rating/frontend/app.js b/plugins/star-rating/frontend/app.js index 2425161a4cb..a240b566c72 100644 --- a/plugins/star-rating/frontend/app.js +++ b/plugins/star-rating/frontend/app.js @@ -11,8 +11,14 @@ var path = require('path'); * @param {*} res - Express response object */ function renderPopup(req, res) { + let countlyPath = countlyConfig.path || ''; + + if (countlyPath.length > 0 && !countlyPath.startsWith('/')) { + countlyPath = `/${countlyPath}`; + } + res.removeHeader('X-Frame-Options'); - res.render('../../../plugins/star-rating/frontend/public/templates/feedback-popup', {}); + res.render('../../../plugins/star-rating/frontend/public/templates/feedback-popup', { countlyPath }); } app.get(countlyConfig.path + '/feedback/rating', renderPopup); @@ -71,4 +77,4 @@ var path = require('path'); }; }(exported)); -module.exports = exported; \ No newline at end of file +module.exports = exported; diff --git a/plugins/star-rating/frontend/public/stylesheets/ratings-iframe.scss b/plugins/star-rating/frontend/public/stylesheets/ratings-iframe.scss index 56436bb3291..a4d70478dcb 100644 --- a/plugins/star-rating/frontend/public/stylesheets/ratings-iframe.scss +++ b/plugins/star-rating/frontend/public/stylesheets/ratings-iframe.scss @@ -95,70 +95,6 @@ background-repeat: no-repeat; } -.rating-emotion-emojis { - background-image: url('/star-rating/images/star-rating/emoji.svg'); -} - -.rating-emotion-emojis1 { - background-image: url('/star-rating/images/star-rating/emoji_1.svg'); -} - -.rating-emotion-emojis2 { - background-image: url('/star-rating/images/star-rating/emoji_2.svg'); -} - -.rating-emotion-emojis3 { - background-image: url('/star-rating/images/star-rating/emoji_3.svg'); -} - -.rating-emotion-emojis4 { - background-image: url('/star-rating/images/star-rating/emoji_4.svg'); -} - -.rating-emotion-emojis5 { - background-image: url('/star-rating/images/star-rating/emoji_5.svg'); -} - -.rating-emotion-emojis-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled.svg'); -} - -.rating-emotion-emojis1-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled_1.svg'); -} - -.rating-emotion-emojis2-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled_2.svg'); -} - -.rating-emotion-emojis3-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled_3.svg'); -} - -.rating-emotion-emojis4-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled_4.svg'); -} - -.rating-emotion-emojis5-fill { - background-image: url('/star-rating/images/star-rating/emoji_filled_5.svg'); -} - -.rating-emotion-thumbs { - background-image: url('/star-rating/images/star-rating/thumbs.svg'); -} - -.rating-emotion-thumbs-fill { - background-image: url('/star-rating/images/star-rating/thumbs_filled.svg'); -} - -.rating-emotion-stars { - background-image: url('/star-rating/images/star-rating/stars.svg'); -} - -.rating-emotion-stars-fill { - background-image: url('/star-rating/images/star-rating/stars_filled.svg'); -} - .ratings-popup .success-emotions-area { font-size: 20px; text-align: center; diff --git a/plugins/star-rating/frontend/public/templates/drawer.html b/plugins/star-rating/frontend/public/templates/drawer.html index 45220f1e436..71100eb503f 100644 --- a/plugins/star-rating/frontend/public/templates/drawer.html +++ b/plugins/star-rating/frontend/public/templates/drawer.html @@ -63,7 +63,7 @@
@@ -76,7 +76,7 @@
{{ drawerScope.editedObject.popup_thanks_message }}
diff --git a/plugins/star-rating/frontend/public/templates/feedback-popup.html b/plugins/star-rating/frontend/public/templates/feedback-popup.html index ea8ef5f7fa6..5005901b85f 100644 --- a/plugins/star-rating/frontend/public/templates/feedback-popup.html +++ b/plugins/star-rating/frontend/public/templates/feedback-popup.html @@ -2,9 +2,9 @@ Countly Feedback Popup - - - + + + <% if (themeFiles && themeFiles.css) { %> <% for(var i=0, l=themeFiles.css.length; i < l; i++) {%> @@ -12,12 +12,77 @@ <% } %> <% } %> + - +
@@ -186,13 +251,13 @@ > - - + +