Skip to content

Commit 97b26f2

Browse files
authored
Merge pull request #591 from frknbasaran/next
[feedback] some css conflicts fixed & new query params for "/feedback" url
2 parents 7ddb731 + ffd273f commit 97b26f2

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

plugins/star-rating/frontend/public/stylesheets/countly-feedback-web.css

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
padding-bottom:10px
1616
padding-top: 10px;
1717
padding-bottom: 10px;
18-
padding-right: 2px;
19-
padding-left: 1px;
2018
}
2119
.mright{
2220
right:0;

plugins/star-rating/frontend/public/stylesheets/countly-feedback.css

+1-4
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,7 @@ input[type=checkbox] {
264264
cursor: pointer;
265265
border-radius: 2px;
266266
}
267-
.countly-feedback-checkbox-title {
268-
position: absolute;
269-
left: 20px;
270-
}
267+
271268
#countly-feedback {
272269
border-top-left-radius: 2px;
273270
border-bottom-left-radius: 2px;

plugins/star-rating/frontend/public/stylesheets/main.css

+1-5
Original file line numberDiff line numberDiff line change
@@ -879,11 +879,7 @@
879879
-ms-transform: rotate(45deg);
880880
transform: rotate(45deg);
881881
}
882-
#countly-feedback-checkbox-title {
883-
position: absolute;
884-
left: 20px;
885-
}
886-
#countly-feedback {
882+
#countly-feedback {
887883
border-top-left-radius: 2px;
888884
border-bottom-left-radius: 2px;
889885
position: absolute;

plugins/star-rating/frontend/public/templates/feedback-popup.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,12 @@
162162
var device_id = getParameterByName('device_id');
163163
var sdk_version = getParameterByName('sdk_version');
164164
var app_key = getParameterByName('app_key');
165+
var sdk_name = getParameterByName('sdk_name') || 'javascript_feedback_popup';
166+
var app_version = getParameterByName('app_version');
165167
var url = window.location.href.split("/")[0] + "//" + window.location.href.split("/")[2];
166168
var d = new Date();
167169
var h = d.getHours();
168170
var dow = d.getDay();
169-
170171
/*
171172
Get widget configurations for render
172173
*/
@@ -303,7 +304,7 @@
303304
}
304305
$.ajax({
305306
"type": "GET",
306-
"url": url + '/i?events=' + encodeURIComponent(JSON.stringify([eventObject])) + '&app_key=' + app_key + '&device_id=' + device_id + 'sdk_name=javascript_feedback_popup&sdk_version=' + sdk_version + '&timestamp=' + Date.now() + '&hour=' + h + '&dow=' + dow,
307+
"url": url + '/i?events=' + encodeURIComponent(JSON.stringify([eventObject])) + '&app_key=' + app_key + '&device_id=' + device_id + 'sdk_name=' + sdk_name + (sdk_version ? '&sdk_version=' + sdk_version : '') + '&timestamp=' + Date.now() + '&hour=' + h + '&dow=' + dow + '&app_version=' + app_version,
307308
"success": function(response) {
308309
document.getElementsByClassName("success-modal-content")[0].style.display = "block";
309310
document.getElementsByClassName("modal-content")[0].style.display = "none";

0 commit comments

Comments
 (0)